commit 8edbb299514954361213cb71ac373e89d45149f6
author Bo Hu <bohu@google.com> Mon Oct 28 13:51:03 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 28 13:51:03 2019 -0700
tree 44c85511d8e7e8f8563bd90fa287110cc12fc293
parent dfc869fa463b608d3f04625e8004463079185a69
parent 5a6baaed7fc4809a1ad84b596ecbf535167c7e06

Revert "Update D8 and R8 to 1.7.16-dev"
am: 5a6baaed7f

Change-Id: I80daf855ca376292eee504238daca65e3e2c0cd1

compatdx-master.jar

diff --git a/compatdx-master.jar b/compatdx-master.jar
index 00f737f..3f6c8a2 100644
--- a/compatdx-master.jar
+++ b/compatdx-master.jar
Binary files differ

compatdx-master.jar.map

diff --git a/compatdx-master.jar.map b/compatdx-master.jar.map
index 19fb5c4..9b73355 100644
--- a/compatdx-master.jar.map
+++ b/compatdx-master.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 1.7.16-dev
+# compiler_version: 1.7.12-dev
 # compiler_hash: engineering
-# pg_map_id: 4d058a2
+# pg_map_id: b988d72
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
@@ -18,58 +18,58 @@
     java.util.zip.ZipFile zipFile -> b
     java.util.Set descriptors -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:1:void <init>(java.nio.file.Path):51:51 -> <init>
-    2:2:void <init>(java.nio.file.Path,java.util.function.Predicate):60:60 -> <init>
-    3:37:void <init>(java.nio.file.Path,java.util.function.Predicate):43:77 -> <init>
-    38:41:void <init>(java.nio.file.Path,java.util.function.Predicate):66:69 -> <init>
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:1:void <init>(java.nio.file.Path):50:50 -> <init>
+    2:2:void <init>(java.nio.file.Path,java.util.function.Predicate):59:59 -> <init>
+    3:37:void <init>(java.nio.file.Path,java.util.function.Predicate):42:76 -> <init>
+    38:41:void <init>(java.nio.file.Path,java.util.function.Predicate):65:68 -> <init>
     boolean lambda$new$0(java.lang.String) -> a
-    1:1:void close():112:112 -> close
-    1:2:void finalize():106:107 -> finalize
-    1:1:java.util.Set getClassDescriptors():84:84 -> getClassDescriptors
-    1:1:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):89:89 -> getProgramResource
-    2:2:java.util.zip.ZipEntry getZipEntryFromDescriptor(java.lang.String):116:116 -> getProgramResource
-    2:2:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):92 -> getProgramResource
-    3:8:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):93:98 -> getProgramResource
-    9:14:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):94:99 -> getProgramResource
-    15:22:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):93:100 -> getProgramResource
+    1:1:void close():111:111 -> close
+    1:2:void finalize():105:106 -> finalize
+    1:1:java.util.Set getClassDescriptors():83:83 -> getClassDescriptors
+    1:1:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):88:88 -> getProgramResource
+    2:2:java.util.zip.ZipEntry getZipEntryFromDescriptor(java.lang.String):115:115 -> getProgramResource
+    2:2:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):91 -> getProgramResource
+    3:8:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):92:97 -> getProgramResource
+    9:14:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):93:98 -> getProgramResource
+    15:22:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):92:99 -> getProgramResource
     23:23:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> getProgramResource
-    23:23:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):100 -> getProgramResource
-    24:24:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):100:100 -> getProgramResource
+    23:23:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):99 -> getProgramResource
+    24:24:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):99:99 -> getProgramResource
 com.android.tools.r8.ArchiveProgramResourceProvider -> com.android.tools.r8.ArchiveProgramResourceProvider:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.function.Predicate include -> c
     com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier supplier -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier,java.util.function.Predicate):82:88 -> <init>
-    1:1:java.util.zip.ZipFile lambda$fromArchive$0(java.nio.file.Path):66:66 -> a
-    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
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier,java.util.function.Predicate):81:87 -> <init>
+    1:1:java.util.zip.ZipFile lambda$fromArchive$0(java.nio.file.Path):65:65 -> a
+    2:8:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):91:97 -> a
+    9:13:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):95:99 -> a
+    14:23:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):91:100 -> 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 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
-    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
-    2:2:com.android.tools.r8.ArchiveProgramResourceProvider fromSupplier(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier,java.util.function.Predicate):78:78 -> fromSupplier
-    1:23:java.util.Collection getProgramResources():108:130 -> getProgramResources
+    24:24:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):100 -> a
+    25:25:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):100:100 -> a
+    26:26:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):99:99 -> a
+    27:32:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):111:116 -> a
+    33:33:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):115:115 -> a
+    34:44:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):114:124 -> 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
+    46:46:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):119:119 -> a
+    1:1:com.android.tools.r8.ArchiveProgramResourceProvider fromArchive(java.nio.file.Path):58:58 -> fromArchive
+    2:2:com.android.tools.r8.ArchiveProgramResourceProvider fromArchive(java.nio.file.Path,java.util.function.Predicate):63:63 -> fromArchive
+    1:1:com.android.tools.r8.ArchiveProgramResourceProvider fromSupplier(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier):71:71 -> fromSupplier
+    2:2:com.android.tools.r8.ArchiveProgramResourceProvider fromSupplier(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier,java.util.function.Predicate):77:77 -> fromSupplier
+    1:23:java.util.Collection getProgramResources():107:129 -> getProgramResources
     24:24:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> getProgramResources
-    24:24:java.util.Collection getProgramResources():130 -> getProgramResources
-    25:32:java.util.Collection getProgramResources():130:137 -> getProgramResources
-    1:1:boolean includeClassFileEntries(java.lang.String):43:43 -> includeClassFileEntries
-    1:1:boolean includeClassFileOrDexEntries(java.lang.String):51:51 -> includeClassFileOrDexEntries
+    24:24:java.util.Collection getProgramResources():129 -> getProgramResources
+    25:32:java.util.Collection getProgramResources():129:136 -> getProgramResources
+    1:1:boolean includeClassFileEntries(java.lang.String):42:42 -> includeClassFileEntries
+    1:1:boolean includeClassFileOrDexEntries(java.lang.String):50:50 -> includeClassFileOrDexEntries
     2:3:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> includeClassFileOrDexEntries
-    2:3:boolean includeClassFileOrDexEntries(java.lang.String):51 -> includeClassFileOrDexEntries
+    2:3:boolean includeClassFileOrDexEntries(java.lang.String):50 -> includeClassFileOrDexEntries
     1:2:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> includeDexEntries
-    1:2:boolean includeDexEntries(java.lang.String):47 -> includeDexEntries
+    1:2:boolean includeDexEntries(java.lang.String):46 -> includeDexEntries
 com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer -> com.android.tools.r8.ArchiveProgramResourceProvider$a:
     void accept(com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream) -> a
 com.android.tools.r8.BaseCommand -> com.android.tools.r8.BaseCommand:
@@ -95,63 +95,65 @@
     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:com.android.tools.r8.utils.AndroidApp$Builder getAppBuilder():152:152 -> a
-    2:2:void lambda$addClasspathResourceProvider$6(com.android.tools.r8.ClassFileResourceProvider):232 -> a
-    3:3:void lambda$addClasspathResourceProvider$6(com.android.tools.r8.ClassFileResourceProvider):232:232 -> a
-    4:4:void lambda$addClasspathFiles$3(java.nio.file.Path[]):216:216 -> a
-    5:5:void lambda$addClasspathFiles$4(java.util.Collection):222:222 -> a
-    6:6:void addClasspathFile(java.nio.file.Path):227:227 -> a
-    7:7:void lambda$addClassProgramData$7(byte[],com.android.tools.r8.origin.Origin):238:238 -> a
-    8:8:void lambda$addMainDexClasses$11(java.lang.String[]):295:295 -> a
-    9:9:void setIgnoreDexInArchive(boolean):350:350 -> a
-    10:12: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 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
+    2:2:void lambda$addClasspathResourceProvider$8(com.android.tools.r8.ClassFileResourceProvider):234 -> a
+    3:3:void lambda$addClasspathResourceProvider$8(com.android.tools.r8.ClassFileResourceProvider):234:234 -> a
+    4:4:void lambda$addClasspathFiles$5(java.nio.file.Path[]):218:218 -> a
+    5:5:void lambda$addClasspathFiles$6(java.util.Collection):224:224 -> a
+    6:6:void addClasspathFile(java.nio.file.Path):229:229 -> a
+    7:7:void lambda$addClassProgramData$9(byte[],com.android.tools.r8.origin.Origin):240:240 -> a
+    8:8:void lambda$addMainDexClasses$13(java.lang.String[]):297:297 -> a
+    9:9:void setIgnoreDexInArchive(boolean):352:352 -> a
+    10:12:void guard(java.lang.Runnable):366:368 -> a
+    1:2:com.android.tools.r8.BaseCommand$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin):240:241 -> addClassProgramData
+    1:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):218:219 -> addClasspathFiles
+    3:4:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):224:225 -> addClasspathFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):234:235 -> addClasspathResourceProvider
+    1:2:com.android.tools.r8.BaseCommand$Builder addLibraryFiles(java.nio.file.Path[]):196:197 -> addLibraryFiles
+    3:14:com.android.tools.r8.BaseCommand$Builder addLibraryFiles(java.util.Collection):202:213 -> addLibraryFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):190:191 -> addLibraryResourceProvider
+    1:2:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.lang.String[]):297:298 -> addMainDexClasses
+    3:4:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.util.Collection):310:311 -> addMainDexClasses
+    1:9:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.nio.file.Path[]):260:268 -> addMainDexListFiles
+    10:18:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.util.Collection):277:285 -> 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
+    3:15:com.android.tools.r8.BaseCommand$Builder addProgramFiles(java.util.Collection):167:179 -> addProgramFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):184:185 -> addProgramResourceProvider
     1:1:com.android.tools.r8.utils.AndroidApp$Builder getAppBuilder():152:152 -> b
-    1:1:void lambda$addClasspathFile$5(java.nio.file.Path):227 -> b
-    2:2:void lambda$addClasspathFile$5(java.nio.file.Path):227:227 -> b
+    1:1:void lambda$addClasspathFile$7(java.nio.file.Path):229 -> b
+    2:2:void lambda$addClasspathFile$7(java.nio.file.Path):229:229 -> b
     3:3:com.android.tools.r8.utils.AndroidApp$Builder getAppBuilder():152:152 -> b
-    3:3:void lambda$addLibraryResourceProvider$1(com.android.tools.r8.ClassFileResourceProvider):189 -> b
-    4:4:void lambda$addLibraryResourceProvider$1(com.android.tools.r8.ClassFileResourceProvider):189:189 -> b
+    3:3:void lambda$addLibraryResourceProvider$2(com.android.tools.r8.ClassFileResourceProvider):190 -> b
+    4:4:void lambda$addLibraryResourceProvider$2(com.android.tools.r8.ClassFileResourceProvider):190:190 -> b
     5:5:com.android.tools.r8.utils.Reporter getReporter():162:162 -> b
-    6:10:void lambda$addLibraryFiles$2(java.util.Collection):203:207 -> b
-    11:11:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):358:358 -> b
-    11:11:void lambda$addLibraryFiles$2(java.util.Collection):207 -> b
-    12:12:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):260:260 -> b
-    13:13:com.android.tools.r8.utils.AndroidApp$Builder com.android.tools.r8.utils.AndroidApp$Builder.addMainDexListFiles(java.nio.file.Path[]):628:628 -> b
-    13:13:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):260 -> b
-    14:15:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):262:263 -> b
-    16:16:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):262:262 -> b
-    17:17:void lambda$setIgnoreDexInArchive$13(boolean):350:350 -> b
+    6:6:void lambda$addLibraryFiles$4(java.util.Collection):204:204 -> b
+    7:7:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):262:262 -> b
+    8:8:com.android.tools.r8.utils.AndroidApp$Builder com.android.tools.r8.utils.AndroidApp$Builder.addMainDexListFiles(java.nio.file.Path[]):628:628 -> b
+    8:8:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):262 -> b
+    9:10:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):264:265 -> b
+    11:11:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):264:264 -> b
+    12:12:void lambda$setIgnoreDexInArchive$15(boolean):352:352 -> b
     1:6:com.android.tools.r8.BaseCommand build():138:143 -> build
     com.android.tools.r8.BaseCommand makeCommand() -> c
-    1:1:void lambda$addMainDexClasses$12(java.util.Collection):308:308 -> c
+    1:3:void lambda$addLibraryFiles$3(java.nio.file.Path):207:209 -> c
+    4:4:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):360:360 -> c
+    4:4:void lambda$addLibraryFiles$3(java.nio.file.Path):209 -> c
+    5:5:void lambda$addMainDexClasses$14(java.util.Collection):310:310 -> 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$addProgramFiles$0(java.nio.file.Path):172:175 -> d
+    5:5:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):360:360 -> d
+    5:5:void lambda$addProgramFiles$0(java.nio.file.Path):175 -> d
+    6:9:void lambda$addMainDexListFiles$12(java.util.Collection):279:282 -> d
+    10:10:void lambda$addMainDexListFiles$12(java.util.Collection):281:281 -> 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
+    1:1:void lambda$addProgramFiles$1(java.util.Collection):169:169 -> e
+    1:1:void error(com.android.tools.r8.Diagnostic):338:338 -> error
+    1:1:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):347:347 -> fatalError
     2:4:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> 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
+    2:4:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):347 -> fatalError
+    1:1:boolean isPrintHelp():316:316 -> isPrintHelp
+    1:1:boolean isPrintVersion():327:327 -> isPrintVersion
+    1:2:com.android.tools.r8.BaseCommand$Builder setPrintHelp(boolean):321:322 -> setPrintHelp
+    1:2:com.android.tools.r8.BaseCommand$Builder setPrintVersion(boolean):332:333 -> setPrintVersion
 com.android.tools.r8.BaseCommand$InputFileOrigin -> com.android.tools.r8.BaseCommand$a:
     java.lang.String inputType -> g
     1:2:void <init>(java.lang.String,java.nio.file.Path):73:74 -> <init>
@@ -352,7 +354,7 @@
     19:19:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):187:187 -> a
     20:20:void lambda$run$4(java.lang.String):197:197 -> a
     21:23:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):244:246 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):362:362 -> a
+    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):358:358 -> a
     24:24:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):246 -> a
     25:29:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):247:251 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:102 -> b
@@ -361,7 +363,7 @@
     2:2:void com.android.tools.r8.utils.Timing.<init>(java.lang.String):31:31 -> d
     2:2:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150 -> d
     3:26:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):153:176 -> d
-    27:27: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):358:358 -> d
+    27:27: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):354:354 -> d
     27:27:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):176 -> d
     28:38:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):177:187 -> d
     39:43:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:187 -> d
@@ -926,7 +928,6 @@
     java.lang.StringBuilder outline11(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> a
     java.lang.StringBuilder outline12(java.lang.String) -> a
     java.lang.StringBuilder outline13(java.lang.String,int,java.lang.String) -> a
-    java.util.Iterator outline14(com.android.tools.r8.graph.DexProgramClass) -> a
     com.android.tools.r8.ir.code.BasicBlock outline2(com.android.tools.r8.ir.code.BasicBlock) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type outline3(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type) -> a
     java.lang.String outline4(com.android.tools.r8.graph.DexMethod,java.lang.StringBuilder,java.lang.String) -> a
@@ -949,20 +950,20 @@
     12:12:void com.android.tools.r8.utils.Timing.<init>(java.lang.String):31:31 -> a
     12:12:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):106 -> a
     12:12:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    13:23:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):109:119 -> a
-    13:23:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):353:353 -> a
-    24:24:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):119 -> a
-    24:24:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    25:37:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):121:133 -> a
-    25:37:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    38:38:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():347:347 -> a
-    38:38:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):135 -> a
-    38:38:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    39:47:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):135:143 -> a
-    39:47:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    48:53:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):138:143 -> a
-    48:53:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    13:27:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):109:123 -> a
+    13:27:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):349:349 -> a
+    28:28:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):123 -> a
+    28:28:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    29:41:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):125:137 -> a
+    29:41:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():344:344 -> a
+    42:42:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139 -> a
+    42:42:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    43:51:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139:147 -> a
+    43:51:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    52:81:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):118:147 -> a
+    52:81:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     1:5:void run(com.android.tools.r8.L8Command):43:47 -> run
     6:6:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(com.android.tools.r8.utils.InternalOptions):53:53 -> run
     6:6: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):74 -> run
@@ -1102,10 +1103,10 @@
     3:3:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):226 -> a
     4:4:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):179:179 -> a
     5:6:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):193:194 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     7:7:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):195 -> a
     8:8:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):196:196 -> a
-    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():347:347 -> a
+    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():344:344 -> a
     9:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198 -> a
     10:16:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198:204 -> a
     17:17:void com.android.tools.r8.dex.ApplicationWriter.<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.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):151:151 -> a
@@ -1229,7 +1230,7 @@
     65:75:com.android.tools.r8.utils.InternalOptions getInternalOptions():826:836 -> c
     76:86:com.android.tools.r8.utils.InternalOptions getInternalOptions():833:843 -> c
     87:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():840:857 -> c
-    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> c
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
     105:105:com.android.tools.r8.utils.InternalOptions getInternalOptions():858 -> c
     106:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():859:873 -> c
     1:1:boolean getEnableMinification():765:765 -> getEnableMinification
@@ -1399,12 +1400,12 @@
     1:6:void visit():157:162 -> a
     7:10:void processFieldValue(com.android.tools.r8.graph.DexValue):178:181 -> a
     7:10:void visit():164 -> a
-    11:11:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():462:462 -> a
+    11:11:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> a
     11:11:void processFieldValue(com.android.tools.r8.graph.DexValue):181 -> a
     11:11:void visit():164 -> a
     12:17:void processFieldValue(com.android.tools.r8.graph.DexValue):182:187 -> a
     12:17:void visit():164 -> a
-    18:18:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():462:462 -> a
+    18:18:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> a
     18:18:void processFieldValue(com.android.tools.r8.graph.DexValue):187 -> a
     18:18:void visit():164 -> a
     19:19:void processFieldValue(com.android.tools.r8.graph.DexValue):188:188 -> a
@@ -1866,12 +1867,12 @@
 com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.x.d:
     com.android.tools.r8.ir.code.Phi phi -> r
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
-    boolean isConstant() -> E
-    boolean needsRegister() -> R
+    boolean isConstant() -> D
+    boolean needsRegister() -> Q
     1:1:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26:26 -> a
     2:2:int com.android.tools.r8.cf.CfRegisterAllocator.getRegisterForValue(com.android.tools.r8.ir.code.Value,int):128:128 -> a
     2:2:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26 -> a
-    1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> c0
+    1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> b0
     1:1:java.lang.String toString():45:45 -> toString
 com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.x.f:
     com.android.tools.r8.graph.AppView appView -> a
@@ -1884,11 +1885,11 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.cf.TypeVerificationHelper):41:41 -> <init>
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.cf.TypeVerificationHelper):38:44 -> <init>
     1:5:void insertLoadsAndStores():99:103 -> a
-    6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     6:6:void insertLoadsAndStores():104 -> a
     7:12:void insertLoadsAndStores():104:109 -> a
     13:31:void insertPhiMoves(com.android.tools.r8.cf.CfRegisterAllocator):114:132 -> a
-    32:32:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    32:32:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     32:32:void insertPhiMoves(com.android.tools.r8.cf.CfRegisterAllocator):132 -> a
     33:34:void insertPhiMoves(com.android.tools.r8.cf.CfRegisterAllocator):133:134 -> a
     35:38:void movePhis(java.util.List,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):245:248 -> a
@@ -2011,13 +2012,13 @@
     53:53:com.android.tools.r8.graph.DexType join(java.util.Set):196:196 -> a
     54:64:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo join(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):205:215 -> a
     65:70:java.util.Map computeVerificationTypes():223:228 -> a
-    71:71:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
+    71:71:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     71:71:java.util.Map computeVerificationTypes():228 -> a
     72:128:java.util.Map computeVerificationTypes():231:287 -> a
     129:131:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.ir.code.Value):313:315 -> a
     129:131:java.util.Map computeVerificationTypes():288 -> a
     132:151:java.util.Map computeVerificationTypes():290:309 -> a
-    152:152:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
+    152:152:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     152:152:java.util.Map computeVerificationTypes():228 -> a
     153:158:void addUsers(com.android.tools.r8.ir.code.Value,java.util.Set):319:324 -> a
     1:19:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):155:173 -> b
@@ -2446,9 +2447,9 @@
     18:18:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):74:74 -> a
     19:19:void print(com.android.tools.r8.cf.CfPrinter):69:69 -> 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):89:93 -> a
-    25:25: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):1294:1294 -> a
+    25:25: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):1290:1290 -> 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):93 -> a
-    26:28: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):1292:1294 -> a
+    26:28: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):1288:1290 -> a
     26:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):93 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):102 -> a
@@ -2538,7 +2539,7 @@
     1:5:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):47:51 -> a
     6:7:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):60:61 -> a
     6:7:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):51 -> a
-    8:8:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():462:462 -> a
+    8:8:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> a
     8:8:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):61 -> a
     8:8:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):51 -> a
     9:23:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):61:75 -> a
@@ -2579,7 +2580,7 @@
     14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):61:61 -> a
     15:15:void print(com.android.tools.r8.cf.CfPrinter):66:66 -> 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):79:81 -> a
-    19:19:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    19:19:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     19:19:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):81 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():207:207 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):95 -> a
@@ -2801,35 +2802,35 @@
     159:174:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):183:198 -> a
     175:184:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):290:299 -> a
     175:184:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    185:185:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    185:185:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     185:185:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):299 -> a
     185:185:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     186:186:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):301:301 -> a
     186:186:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    187:187:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    187:187:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     187:187:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):301 -> a
     187:187:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     188:188:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):303:303 -> a
     188:188:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    189:189:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    189:189:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     189:189:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):303 -> a
     189:189:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     190:190:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):305:305 -> a
     190:190:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    191:191:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    191:191:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     191:191:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):305 -> a
     191:191:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     192:192:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):307:307 -> 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):203 -> a
-    193:193:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    193:193:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     193:193:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):307 -> a
     193:193:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     194:194:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):309:309 -> a
     194:194:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    195:195:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    195:195:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     195:195:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):309 -> a
     195:195:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    196:196:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    196:196:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     196:196:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):299 -> a
     196:196:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     197:197:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):199:199 -> a
@@ -2848,65 +2849,65 @@
     204:204:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):191:191 -> a
     205:213:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):154:162 -> a
     214:216:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):142:144 -> a
-    217:217:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    217:217:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     217:217:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):144 -> a
     218:219:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):146:147 -> a
-    220:220:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    220:220:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> 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):147 -> 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):148:148 -> a
-    222:222:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    222:222:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> 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):148 -> a
-    223:223:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    223:223:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     223:223:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):147 -> a
     224:232:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):128:136 -> a
     233:237:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):119:123 -> a
     238:240:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112:114 -> a
-    241:241:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    241:241:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     241:241:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):114 -> a
     242:245:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):103:106 -> a
     246:247:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):97:98 -> a
     248:253:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):226:231 -> a
-    254:254:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    254:254:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     254:254:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):231 -> a
     255:255:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):233:233 -> a
-    256:256:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    256:256:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     256:256:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):233 -> a
     257:257:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):235:235 -> a
-    258:258:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    258:258:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     258:258:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):235 -> a
-    259:259:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    259:259:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     259:259:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):231 -> a
     260:266: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):243:249 -> a
-    267:267:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    267:267:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     267:267: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):249 -> a
     268:268: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):251:251 -> a
-    269:269:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    269:269:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     269:269: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):251 -> a
     270:270: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):253:253 -> a
-    271:271:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    271:271:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     271:271: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):253 -> a
     272:272: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):255:255 -> a
-    273:273:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    273:273:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     273:273: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):255 -> a
-    274:274:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    274:274:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     274:274: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):249 -> a
     275:275:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):323:323 -> 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):262:269 -> b
-    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     9:9:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):269 -> b
     10:10: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):271:271 -> b
-    11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     11:11: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):271 -> b
     12:12: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):273:273 -> b
-    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     13:13: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):273 -> b
     14:14: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):275:275 -> b
-    15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     15:15: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):275 -> b
     16:16:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):277:277 -> b
-    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     17:17:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):277 -> b
-    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     18:18:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):269 -> b
     boolean emitsIR() -> f
     1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():89:89 -> q
@@ -2935,7 +2936,7 @@
     14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):61:61 -> a
     15:15:void print(com.android.tools.r8.cf.CfPrinter):66:66 -> 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):79:80 -> a
-    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():259:259 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):94 -> a
@@ -5484,7 +5485,7 @@
     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[]):1428:1444 -> a
+    3:19:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1424:1440 -> 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
@@ -6009,7 +6010,7 @@
     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):1198:1198 -> a
+    4:4:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     4:4: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() -> h
@@ -6022,7 +6023,7 @@
     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):1198:1198 -> a
+    4:4:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     4:4: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() -> h
@@ -6039,7 +6040,7 @@
     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):1198:1198 -> a
+    6:6:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     6:6: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() -> h
@@ -7350,23 +7351,35 @@
     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.z.a.a.a.o:
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.z.a.a.a.u:
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher whitespace():134:134 -> <clinit>
     1:1:void <clinit>():272 -> <clinit>
-    2:2:com.android.tools.r8.com.google.common.base.CharMatcher ascii():154:154 -> <clinit>
-    2:2:void <clinit>():294 -> <clinit>
-    3:3:com.android.tools.r8.com.google.common.base.CharMatcher digit():165:165 -> <clinit>
-    3:3:void <clinit>():306 -> <clinit>
-    4:4:com.android.tools.r8.com.google.common.base.CharMatcher javaIsoControl():227:227 -> <clinit>
-    4:4:void <clinit>():369 -> <clinit>
-    5:5:com.android.tools.r8.com.google.common.base.CharMatcher invisible():238:238 -> <clinit>
-    5:5:void <clinit>():380 -> <clinit>
-    6:6:com.android.tools.r8.com.google.common.base.CharMatcher singleWidth():252:252 -> <clinit>
-    6:6:void <clinit>():394 -> <clinit>
-    7:7:com.android.tools.r8.com.google.common.base.CharMatcher any():108:108 -> <clinit>
-    7:7:void <clinit>():403 -> <clinit>
-    8:8:com.android.tools.r8.com.google.common.base.CharMatcher none():117:117 -> <clinit>
-    8:8:void <clinit>():412 -> <clinit>
+    2:2:com.android.tools.r8.com.google.common.base.CharMatcher breakingWhitespace():145:145 -> <clinit>
+    2:2:void <clinit>():284 -> <clinit>
+    3:3:com.android.tools.r8.com.google.common.base.CharMatcher ascii():154:154 -> <clinit>
+    3:3:void <clinit>():294 -> <clinit>
+    4:4:com.android.tools.r8.com.google.common.base.CharMatcher digit():165:165 -> <clinit>
+    4:4:void <clinit>():306 -> <clinit>
+    5:5:com.android.tools.r8.com.google.common.base.CharMatcher javaDigit():176:176 -> <clinit>
+    5:5:void <clinit>():317 -> <clinit>
+    6:6:com.android.tools.r8.com.google.common.base.CharMatcher javaLetter():187:187 -> <clinit>
+    6:6:void <clinit>():329 -> <clinit>
+    7:7:com.android.tools.r8.com.google.common.base.CharMatcher javaLetterOrDigit():197:197 -> <clinit>
+    7:7:void <clinit>():339 -> <clinit>
+    8:8:com.android.tools.r8.com.google.common.base.CharMatcher javaUpperCase():207:207 -> <clinit>
+    8:8:void <clinit>():349 -> <clinit>
+    9:9:com.android.tools.r8.com.google.common.base.CharMatcher javaLowerCase():217:217 -> <clinit>
+    9:9:void <clinit>():359 -> <clinit>
+    10:10:com.android.tools.r8.com.google.common.base.CharMatcher javaIsoControl():227:227 -> <clinit>
+    10:10:void <clinit>():369 -> <clinit>
+    11:11:com.android.tools.r8.com.google.common.base.CharMatcher invisible():238:238 -> <clinit>
+    11:11:void <clinit>():380 -> <clinit>
+    12:12:com.android.tools.r8.com.google.common.base.CharMatcher singleWidth():252:252 -> <clinit>
+    12:12:void <clinit>():394 -> <clinit>
+    13:13:com.android.tools.r8.com.google.common.base.CharMatcher any():108:108 -> <clinit>
+    13:13:void <clinit>():403 -> <clinit>
+    14:14:com.android.tools.r8.com.google.common.base.CharMatcher none():117:117 -> <clinit>
+    14:14:void <clinit>():412 -> <clinit>
     1:1:void <init>():484:484 -> <init>
     boolean matches(char) -> a
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher ascii():154:154 -> a
@@ -7391,22 +7404,82 @@
     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.z.a.a.a.e:
+com.android.tools.r8.com.google.common.base.CharMatcher$BreakingWhitespace -> com.android.tools.r8.z.a.a.a.e:
+    com.android.tools.r8.com.google.common.base.CharMatcher INSTANCE -> a
+    1:1:void <clinit>():1351:1351 -> <clinit>
+    1:1:void <init>():1349:1349 -> <init>
+    boolean matches(char) -> a
+    1:1:boolean apply(java.lang.Object):1349:1349 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1349 -> apply
+    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():1349 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.z.a.a.a.f:
     com.android.tools.r8.com.google.common.base.CharMatcher$Digit INSTANCE -> d
     1:1:void <clinit>():1455:1455 -> <clinit>
     1:1:void <init>():1458:1458 -> <init>
     1:3:char[] nines():1448:1450 -> c
     1:1:char[] zeroes():1444:1444 -> d
-com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.z.a.a.a.f:
+com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.z.a.a.a.g:
     com.android.tools.r8.com.google.common.base.CharMatcher$Invisible INSTANCE -> d
     1:1:void <clinit>():1567:1567 -> <clinit>
     1:1:void <init>():1570:1570 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.z.a.a.a.g:
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaDigit -> com.android.tools.r8.z.a.a.a.h:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaDigit INSTANCE -> a
+    1:1:void <clinit>():1465:1465 -> <clinit>
+    1:1:void <init>():1463:1463 -> <init>
+    1:1:boolean matches(char):1469:1469 -> a
+    1:1:boolean apply(java.lang.Object):1463:1463 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1463 -> apply
+    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():1463 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.z.a.a.a.i:
     com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl INSTANCE -> b
     1:1:void <clinit>():1545:1545 -> <clinit>
     1:1:void <init>():1548:1548 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.z.a.a.a.h:
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaLetter -> com.android.tools.r8.z.a.a.a.j:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaLetter INSTANCE -> a
+    1:1:void <clinit>():1481:1481 -> <clinit>
+    1:1:void <init>():1479:1479 -> <init>
+    1:1:boolean matches(char):1485:1485 -> a
+    1:1:boolean apply(java.lang.Object):1479:1479 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1479 -> apply
+    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():1479 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaLetterOrDigit -> com.android.tools.r8.z.a.a.a.k:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaLetterOrDigit INSTANCE -> a
+    1:1:void <clinit>():1497:1497 -> <clinit>
+    1:1:void <init>():1495:1495 -> <init>
+    1:1:boolean matches(char):1501:1501 -> a
+    1:1:boolean apply(java.lang.Object):1495:1495 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1495 -> apply
+    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():1495 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaLowerCase -> com.android.tools.r8.z.a.a.a.l:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaLowerCase INSTANCE -> a
+    1:1:void <clinit>():1529:1529 -> <clinit>
+    1:1:void <init>():1527:1527 -> <init>
+    1:1:boolean matches(char):1533:1533 -> a
+    1:1:boolean apply(java.lang.Object):1527:1527 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1527 -> apply
+    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():1527 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaUpperCase -> com.android.tools.r8.z.a.a.a.m:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaUpperCase INSTANCE -> a
+    1:1:void <clinit>():1513:1513 -> <clinit>
+    1:1:void <init>():1511:1511 -> <init>
+    1:1:boolean matches(char):1517:1517 -> a
+    1:1:boolean apply(java.lang.Object):1511:1511 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1511 -> apply
+    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():1511 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.z.a.a.a.n:
     java.lang.String description -> a
     1:1:void com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.<init>():1047:1047 -> <init>
     1:1:void <init>(java.lang.String):1065 -> <init>
@@ -7421,7 +7494,7 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():1056:1056 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():0 -> negate
     1:1:java.lang.String toString():1071:1071 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.z.a.a.a.i:
+com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.z.a.a.a.o:
     com.android.tools.r8.com.google.common.base.CharMatcher original -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1594:1595 -> <init>
     1:1:boolean matches(char):1600:1600 -> a
@@ -7432,9 +7505,9 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1629:1629 -> negate
     2:2:java.util.function.Predicate negate():1590 -> negate
     1:1:java.lang.String toString():1634:1634 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.z.a.a.a.j:
+com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.z.a.a.a.p:
     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.z.a.a.a.k:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.z.a.a.a.q:
     com.android.tools.r8.com.google.common.base.CharMatcher$None INSTANCE -> b
     1:1:void <clinit>():1216:1216 -> <clinit>
     1:1:void <init>():1219:1219 -> <init>
@@ -7444,7 +7517,7 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():108:108 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1312 -> negate
     2:2:java.util.function.Predicate negate():1214 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.z.a.a.a.l:
+com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.z.a.a.a.r:
     char[] rangeStarts -> b
     char[] rangeEnds -> c
     java.lang.String description -> a
@@ -7456,21 +7529,21 @@
     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.z.a.a.a.m:
+com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.z.a.a.a.s:
     com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth INSTANCE -> d
     1:1:void <clinit>():1577:1577 -> <clinit>
     1:2:void <init>():1582:1583 -> <init>
     3:3:void <init>():1580:1580 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.z.a.a.a.n:
+com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.z.a.a.a.t:
     com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace INSTANCE -> c
     int SHIFT -> b
     1:3:void <clinit>():1326:1328 -> <clinit>
     1:1:void <init>():1331:1331 -> <init>
     1:1:boolean matches(char):1336:1336 -> a
-com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.z.a.a.a.p:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.z.a.a.a.v:
     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.z.a.a.a.u:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.z.a.a.a.A:
     1:1:void <init>():41:41 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -7480,20 +7553,20 @@
     3:3:com.android.tools.r8.com.google.common.base.Equivalence identity():336:336 -> b
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(java.lang.Object):162:162 -> c
     1:1:boolean test(java.lang.Object,java.lang.Object):78:78 -> test
-com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.z.a.a.a.q:
-com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.z.a.a.a.r:
+com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.z.a.a.a.w:
+com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.z.a.a.a.x:
     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 -> a
     2:2:int doHash(java.lang.Object):350:350 -> a
-com.android.tools.r8.com.google.common.base.Equivalence$Identity -> com.android.tools.r8.z.a.a.a.s:
+com.android.tools.r8.com.google.common.base.Equivalence$Identity -> com.android.tools.r8.z.a.a.a.y:
     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>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     1:1:int doHash(java.lang.Object):371:371 -> a
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.z.a.a.a.t:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.z.a.a.a.z:
     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>
@@ -7502,20 +7575,20 @@
     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.z.a.a.a.v:
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.z.a.a.a.x:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.z.a.a.a.B:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.z.a.a.a.D:
     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.z.a.a.a.w:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.z.a.a.a.C:
     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.z.a.a.a.B:
+com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.z.a.a.a.H:
     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$ObjectPredicate.withNarrowedType():0:0 -> a
     2:2:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.alwaysFalse():62 -> a
@@ -7581,8 +7654,8 @@
     6:6:java.lang.Object firstNonNull(java.lang.Object,java.lang.Object):56 -> b
     7:7:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1241:1241 -> b
     7:7:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int):1223 -> b
-com.android.tools.r8.com.google.common.base.MoreObjects$1 -> com.android.tools.r8.z.a.a.a.y:
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.z.a.a.a.A:
+com.android.tools.r8.com.google.common.base.MoreObjects$1 -> com.android.tools.r8.z.a.a.a.E:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.z.a.a.a.G:
     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
@@ -7599,18 +7672,18 @@
     5:5:com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper addHolder(java.lang.String,java.lang.Object):372 -> b
     1:20:java.lang.String toString():331:350 -> toString
     21:39:java.lang.String toString():336:354 -> toString
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> com.android.tools.r8.z.a.a.a.z:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> com.android.tools.r8.z.a.a.a.F:
     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.z.a.a.a.C:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.z.a.a.a.I:
     1:1:void <init>():150:150 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional com.android.tools.r8.com.google.common.base.Absent.withType():33:33 -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional absent():93 -> a
-com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.z.a.a.a.F:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.z.a.a.a.L:
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> b
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -7630,21 +7703,21 @@
     2:2:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66 -> a
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     3:3:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):65 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.z.a.a.a.D:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.z.a.a.a.E:
+com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.z.a.a.a.J:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.z.a.a.a.K:
     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.z.a.a.a.G:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.z.a.a.a.M:
     1:1:boolean test(java.lang.Object):80:80 -> test
-com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.z.a.a.a.H:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.z.a.a.a.I:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.z.a.a.a.N:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.z.a.a.a.O:
     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.z.a.a.a.N:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.z.a.a.a.U:
     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
@@ -7652,15 +7725,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.z.a.a.a.J:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.z.a.a.a.P:
     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.z.a.a.a.K:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.z.a.a.a.Q:
     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.z.a.a.a.L:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.z.a.a.a.S:
     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.z.a.a.a.M:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.z.a.a.a.T:
     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.z.a.a.a.O:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.z.a.a.a.V:
     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>
@@ -7671,7 +7744,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.z.a.a.a.Q:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.z.a.a.a.X:
     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
@@ -7684,24 +7757,24 @@
     10:10:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> a
     10:10:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):218 -> a
     10:10:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.z.a.a.a.P:
+com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.z.a.a.a.W:
     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.z.a.a.a.S:
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.z.a.a.a.T:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.z.a.a.a.Y:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.z.a.a.a.Z:
     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.z.a.a.a.U:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.z.a.a.a.a0:
     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.z.a.a.a.V:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.z.a.a.a.b0:
     java.lang.Object jla -> a
     1:3:java.lang.Object getJLA():482:484 -> <clinit>
     1:3:void <clinit>():452 -> <clinit>
@@ -8405,7 +8478,8 @@
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.BiMap inverse() -> i
 com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.z.a.a.b.q:
-    java.util.stream.Collector TO_IMMUTABLE_SET -> a
+    java.util.stream.Collector TO_IMMUTABLE_SET -> b
+    java.util.stream.Collector TO_IMMUTABLE_LIST -> a
     1:25:void <clinit>():44:68 -> <clinit>
     1:1:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):60:60 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
@@ -9256,33 +9330,31 @@
     1:1:void <init>():483:483 -> <init>
     1:1:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):80:80 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):132:132 -> a
-    3:3:com.android.tools.r8.com.google.common.collect.RegularImmutableMap com.android.tools.r8.com.google.common.collect.RegularImmutableMap.fromEntries(java.util.Map$Entry[]):54:54 -> a
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):132 -> a
-    4:4:void checkNoConflict(boolean,java.lang.String,java.util.Map$Entry,java.util.Map$Entry):190:190 -> a
-    5:13:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):392:400 -> a
-    14:18:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOfEnumMap(java.util.EnumMap):436:440 -> a
-    14:18:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):400 -> a
-    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403:403 -> a
-    20:20:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418:418 -> a
-    20:20:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    21:23:java.util.Collection com.android.tools.r8.com.google.common.collect.Iterables.castOrCopyToCollection(java.lang.Iterable):318:320 -> a
-    21:23:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):297 -> a
-    21:23:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418 -> a
-    21:23:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    24:24:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):298:298 -> a
-    24:24:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418 -> a
-    24:24:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    25:37:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418:430 -> a
-    25:37:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    38:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):423:424 -> a
-    38:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    40:40:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):73:73 -> a
-    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object):123 -> a
-    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):424 -> a
+    3:3:void checkNoConflict(boolean,java.lang.String,java.util.Map$Entry,java.util.Map$Entry):190:190 -> a
+    4:12:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):392:400 -> a
+    13:17:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOfEnumMap(java.util.EnumMap):436:440 -> a
+    13:17:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):400 -> a
+    18:18:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403:403 -> a
+    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418:418 -> a
+    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    20:22:java.util.Collection com.android.tools.r8.com.google.common.collect.Iterables.castOrCopyToCollection(java.lang.Iterable):318:320 -> a
+    20:22:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):297 -> a
+    20:22:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418 -> a
+    20:22:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    23:23:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):298:298 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    24:36:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418:430 -> a
+    24:36:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    37:38:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):423:424 -> a
+    37:38:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):73:73 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object):123 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):424 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap of():113:113 -> a
+    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):421 -> a
     40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    41:41:com.android.tools.r8.com.google.common.collect.ImmutableMap of():113:113 -> a
-    41:41:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):421 -> a
-    41:41:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
     1:2:java.util.Map$Entry entryOf(java.lang.Object,java.lang.Object):175:176 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):73:73 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object):123 -> c
@@ -10572,6 +10644,7 @@
     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$StrongValueEntry -> com.android.tools.r8.z.a.a.b.m1:
 com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$ValueIterator -> com.android.tools.r8.z.a.a.b.Y0$f:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2656:2656 -> <init>
     1:1:java.lang.Object next():2660:2660 -> next
@@ -10587,7 +10660,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.z.a.a.b.n1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry -> com.android.tools.r8.z.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>
@@ -10599,7 +10672,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.z.a.a.b.m1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper -> com.android.tools.r8.z.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>
@@ -10619,7 +10692,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.z.a.a.b.o1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment -> com.android.tools.r8.z.a.a.b.p1:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2149:2149 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2142:2142 -> <init>
@@ -10627,7 +10700,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.z.a.a.b.q1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry -> com.android.tools.r8.z.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>
@@ -10638,7 +10711,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.z.a.a.b.p1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper -> com.android.tools.r8.z.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>
@@ -10658,7 +10731,7 @@
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):931:931 -> a
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):906 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper instance():913:913 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.z.a.a.b.r1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.z.a.a.b.s1:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     java.lang.ref.ReferenceQueue queueForValues -> i
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2189:2189 -> <init>
@@ -10668,12 +10741,12 @@
     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.z.a.a.b.s1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueEntry -> com.android.tools.r8.z.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.z.a.a.b.t1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference -> com.android.tools.r8.z.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.z.a.a.b.u1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReferenceImpl -> com.android.tools.r8.z.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
@@ -10688,13 +10761,13 @@
     1:1:java.lang.Object getValue():2684:2684 -> getValue
     1:1:int hashCode():2700:2700 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):2705:2706 -> setValue
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.z.a.a.b.v1:
-com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.z.a.a.b.w1:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.z.a.a.b.w1:
+com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.z.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.z.a.a.b.x1:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.z.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
@@ -10707,23 +10780,23 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1446 -> next
     3:3:java.util.Map$Entry next():1470 -> next
     3:3:java.lang.Object next():1462 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.z.a.a.b.A1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.z.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.z.a.a.b.y1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.z.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.z.a.a.b.z1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.z.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.z.a.a.b.B1:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.z.a.a.b.C1:
     1:1:void <init>():4112:4112 -> <init>
     java.util.Map map() -> a
     1:1:void clear():4122:4122 -> clear
@@ -10743,11 +10816,11 @@
     4:4:boolean retainAll(java.util.Collection):4166 -> retainAll
     5:11:boolean retainAll(java.util.Collection):4167:4173 -> retainAll
     1:1:int size():4117:4117 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.z.a.a.b.D1:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.z.a.a.b.E1:
     1:1:void <init>():3653:3653 -> <init>
     1:1:java.util.Set entrySet():3666:3666 -> entrySet
     java.util.Iterator entryIterator() -> f
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.z.a.a.b.C1:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.z.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 -> a
@@ -10760,7 +10833,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.z.a.a.b.E1:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.z.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
@@ -10800,7 +10873,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.z.a.a.b.F1:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.z.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
@@ -10861,7 +10934,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.z.a.a.b.G1:
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.z.a.a.b.H1:
     java.util.Collection values -> b
     java.util.Set entrySet -> a
     1:1:void <init>():3612:3612 -> <init>
@@ -10873,31 +10946,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.z.a.a.b.H1:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.z.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.z.a.a.b.I1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.z.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.z.a.a.b.J1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.z.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.z.a.a.b.K1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.z.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.z.a.a.b.M1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.z.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.z.a.a.b.L1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.z.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>
@@ -10910,12 +10983,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.z.a.a.b.N1:
+com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.z.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.z.a.a.b.O1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.z.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
@@ -10933,7 +11006,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.z.a.a.b.R1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.z.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
@@ -10960,17 +11033,17 @@
     4:4:java.util.Iterator iterator():1744 -> iterator
     1:1:java.util.Set elementSet():1786:1786 -> k
     1:1:java.util.Spliterator spliterator():1672:1672 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.z.a.a.b.Q1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.z.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.z.a.a.b.P1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.z.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.z.a.a.b.R1$a:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.z.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 -> a
@@ -10983,7 +11056,7 @@
     1:1:int size():1705:1705 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.Multimaps$Keys.distinctElements():1683:1683 -> size
     2:2:int size():1705 -> size
-com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.z.a.a.b.T1:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.z.a.a.b.U1:
     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
@@ -10995,22 +11068,22 @@
     3:3:void forEach(java.util.function.Consumer):490 -> forEach
     java.util.Set elementSet() -> k
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.z.a.a.b.S1:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.z.a.a.b.T1:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.z.a.a.b.U1:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.z.a.a.b.V1:
     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.z.a.a.b.V1:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.z.a.a.b.W1:
     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.z.a.a.b.X1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.z.a.a.b.Y1:
     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
@@ -11040,25 +11113,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.z.a.a.b.W1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.z.a.a.b.X1:
     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.z.a.a.b.Y1:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.z.a.a.b.Z1:
     1:1:void <init>():1021:1021 -> <init>
     com.android.tools.r8.com.google.common.collect.Multiset multiset() -> a
     1:1:void clear():1061:1061 -> clear
     1:11:boolean contains(java.lang.Object):1026:1036 -> contains
     1:9:boolean remove(java.lang.Object):1045:1053 -> remove
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.z.a.a.b.Z1:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.z.a.a.b.a2:
     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.z.a.a.b.a2:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.z.a.a.b.b2:
     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>
@@ -11072,11 +11145,11 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> compare
     4:4:int compare(java.lang.Comparable,java.lang.Comparable):35 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):25 -> compare
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.z.a.a.b.b2:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.z.a.a.b.c2:
     1:1:void <init>():390:390 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering from(java.util.Comparator):181:181 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Ordering reverse():404:404 -> a
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.z.a.a.b.c2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.z.a.a.b.d2:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> c
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList):35:37 -> <init>
@@ -11088,7 +11161,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:java.util.ListIterator listIterator(int):29 -> listIterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.z.a.a.b.f2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.z.a.a.b.g2:
     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
@@ -11117,8 +11190,8 @@
     boolean isHashCodeFast() -> l
     boolean isPartialView() -> m
     1:1:int size():179:179 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.z.a.a.b.d2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.z.a.a.b.f2$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.z.a.a.b.e2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.z.a.a.b.g2$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>
@@ -11141,7 +11214,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> size
     1:1:int size():199 -> size
     2:2:int size():199:199 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.z.a.a.b.f2$a$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.z.a.a.b.g2$a$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):240:240 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():268:268 -> c
@@ -11152,7 +11225,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():258:258 -> iterator
     2:2:java.util.Iterator iterator():239 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():243:243 -> j
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.z.a.a.b.e2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.z.a.a.b.f2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):268:268 -> <init>
     1:2:java.util.Map$Entry get(int):271:272 -> get
@@ -11161,7 +11234,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 -> h
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.z.a.a.b.g2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.z.a.a.b.h2:
     java.lang.Object[] array -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -11174,7 +11247,7 @@
     2:2:java.util.ListIterator listIterator(int):28 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.z.a.a.b.j2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.z.a.a.b.k2:
     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
@@ -11214,7 +11287,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> k
     boolean isPartialView() -> m
     1:1:int size():159:159 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.z.a.a.b.h2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.z.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):181:182 -> <init>
     boolean isPartialView() -> b
@@ -11223,13 +11296,13 @@
     2:2:boolean contains(java.lang.Object):192 -> contains
     1:1:java.lang.Object get(int):187:187 -> get
     1:1:int size():202:202 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.z.a.a.b.i2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.z.a.a.b.j2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):236:237 -> <init>
     boolean isPartialView() -> b
     1:1:java.lang.Object get(int):242:242 -> get
     1:1:int size():247:247 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.z.a.a.b.l2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.z.a.a.b.m2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset EMPTY -> i
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> e
     int size -> f
@@ -11248,8 +11321,8 @@
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():140:141 -> k
     3:4:java.util.Set elementSet():34 -> k
     1:1:int size():135:135 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.z.a.a.b.k2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.z.a.a.b.l2$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.z.a.a.b.l2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.z.a.a.b.m2$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset):145:145 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset,com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1):145:145 -> <init>
@@ -11259,11 +11332,11 @@
     2:2:boolean contains(java.lang.Object):154 -> contains
     1:1:java.lang.Object get(int):149:149 -> get
     1:1:int size():164:164 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.z.a.a.b.m2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.z.a.a.b.n2:
     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.z.a.a.b.n2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.z.a.a.b.o2:
     java.lang.Object[] table -> d
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> g
     java.lang.Object[] elements -> c
@@ -11284,7 +11357,7 @@
     2:2:java.util.Iterator iterator():30 -> iterator
     1:1:int size():69:69 -> size
     1:1:java.util.Spliterator spliterator():79:79 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.z.a.a.b.o2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.z.a.a.b.p2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet NATURAL_EMPTY_SET -> f
     com.android.tools.r8.com.google.common.collect.ImmutableList elements -> e
     1:2:void <clinit>():44:45 -> <clinit>
@@ -11389,7 +11462,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.z.a.a.b.p2:
+com.android.tools.r8.com.google.common.collect.ReverseNaturalOrdering -> com.android.tools.r8.z.a.a.b.q2:
     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>
@@ -11401,7 +11474,7 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> compare
     3:3:int compare(java.lang.Comparable,java.lang.Comparable):33 -> compare
     3:3:int compare(java.lang.Object,java.lang.Object):26 -> compare
-com.android.tools.r8.com.google.common.collect.ReverseOrdering -> com.android.tools.r8.z.a.a.b.q2:
+com.android.tools.r8.com.google.common.collect.ReverseOrdering -> com.android.tools.r8.z.a.a.b.r2:
     com.android.tools.r8.com.google.common.collect.Ordering forwardOrder -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Ordering):31:32 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering reverse():43:43 -> a
@@ -11409,7 +11482,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.z.a.a.b.s2:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.z.a.a.b.t2:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):744:744 -> <init>
@@ -11421,13 +11494,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.z.a.a.b.r2:
+com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.z.a.a.b.s2:
     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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.z.a.a.b.u2:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.z.a.a.b.v2:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):842:842 -> <init>
@@ -11439,12 +11512,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.z.a.a.b.t2:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.z.a.a.b.u2:
     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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.z.a.a.b.w2:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.z.a.a.b.x2:
     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>
@@ -11457,12 +11530,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.z.a.a.b.v2:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.z.a.a.b.w2:
     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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.z.a.a.b.A2:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.z.a.a.b.B2:
     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>
@@ -11470,31 +11543,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.z.a.a.b.z2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.z.a.a.b.A2:
     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 -> f
     1:29:java.lang.Object computeNext():1688 -> f
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.z.a.a.b.y2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.z.a.a.b.z2:
     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.z.a.a.b.x2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.z.a.a.b.y2:
     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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.z.a.a.b.B2:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.z.a.a.b.C2:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean removeAll(java.util.Collection):80:80 -> removeAll
     1:1:boolean retainAll(java.util.Collection):85:85 -> retainAll
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> retainAll
     2:2:boolean retainAll(java.util.Collection):85 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.z.a.a.b.C2:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.z.a.a.b.D2:
     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
@@ -11504,7 +11577,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.z.a.a.b.D2:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.z.a.a.b.E2:
     java.util.SortedSet unmodifiableDelegate -> b
     java.util.NavigableSet delegate -> a
     com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet descendingSet -> c
@@ -11532,7 +11605,7 @@
     1:2:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1911 -> subSet
     3:3:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1910 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):1921:1921 -> tailSet
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.z.a.a.b.E2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.z.a.a.b.F2:
     java.lang.Object singleValue -> f
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> g
     java.lang.Object singleKey -> e
@@ -11553,7 +11626,7 @@
     1:3:com.android.tools.r8.com.google.common.collect.BiMap inverse():34 -> i
     4:6:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():100:102 -> i
     boolean isPartialView() -> m
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.z.a.a.b.F2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.z.a.a.b.G2:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> b
@@ -11568,7 +11641,7 @@
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> subList
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):65 -> subList
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.z.a.a.b.G2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.z.a.a.b.H2:
     java.lang.Object element -> c
     int cachedHashCode -> d
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -11584,22 +11657,22 @@
     3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> iterator
     3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66 -> iterator
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.z.a.a.b.H2:
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.z.a.a.b.I2:
+com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.z.a.a.b.I2:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.z.a.a.b.J2:
     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.z.a.a.b.J2:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.z.a.a.b.K2:
     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.z.a.a.b.K2:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.z.a.a.b.L2:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.z.a.a.b.L2:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.z.a.a.b.M2:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -11613,17 +11686,17 @@
     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.z.a.a.b.M2:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.z.a.a.b.N2:
     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.z.a.a.b.N2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.z.a.a.b.O2:
     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.z.a.a.b.O2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.z.a.a.b.P2:
     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
@@ -11914,12 +11987,10 @@
     1:3:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):55:57 -> a
     4:4:com.android.tools.r8.com.google.gson.JsonElement createJsonElement(java.lang.Object):122:122 -> a
     4:4:void addProperty(java.lang.String,java.lang.Number):90 -> a
-    5:5:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):57:57 -> a
-    5:5:void addProperty(java.lang.String,java.lang.Number):90 -> a
+    5:5:void addProperty(java.lang.String,java.lang.Number):90:90 -> a
     6:6:com.android.tools.r8.com.google.gson.JsonElement createJsonElement(java.lang.Object):122:122 -> a
     6:6:void addProperty(java.lang.String,java.lang.String):79 -> a
-    7:7:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):57:57 -> a
-    7:7:void addProperty(java.lang.String,java.lang.String):79 -> a
+    7:7:void addProperty(java.lang.String,java.lang.String):79:79 -> a
     8:8:com.android.tools.r8.com.google.gson.JsonElement get(java.lang.String):161:161 -> a
     1:1:com.android.tools.r8.com.google.gson.JsonArray getAsJsonArray(java.lang.String):181:181 -> b
     1:1:boolean has(java.lang.String):151:151 -> c
@@ -12561,10 +12632,10 @@
     253:255:void processDirectory(java.io.File,java.util.List):613:615 -> a
     253:255:void processPath(java.io.File,java.util.List):599 -> a
     256:257:void processPath(java.io.File,java.util.List):602:603 -> a
-    258:259:boolean com.android.tools.r8.utils.FileUtils.isJarFile(java.nio.file.Path):56:57 -> a
+    258:259:boolean com.android.tools.r8.utils.FileUtils.isJarFile(java.nio.file.Path):51:52 -> a
     258:259:void processPath(java.io.File,java.util.List):603 -> a
     260:260:void processPath(java.io.File,java.util.List):603:603 -> a
-    261:262:boolean com.android.tools.r8.utils.FileUtils.isApkFile(java.nio.file.Path):66:67 -> a
+    261:262:boolean com.android.tools.r8.utils.FileUtils.isApkFile(java.nio.file.Path):61:62 -> a
     261:262:void processPath(java.io.File,java.util.List):607 -> a
     263:263:void processPath(java.io.File,java.util.List):608:608 -> a
     264:264:void processPath(java.io.File,java.util.List):604:604 -> a
@@ -12774,7 +12845,7 @@
     135:139:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):205:209 -> a
     140:140:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):205:205 -> a
     141:141:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):208:208 -> a
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     142:142:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):208 -> a
     1:1:com.android.tools.r8.utils.AndroidApp access$300(com.android.tools.r8.dex.ApplicationReader):56:56 -> b
 com.android.tools.r8.dex.ApplicationReader$ClassReader -> com.android.tools.r8.A.a:
@@ -12857,10 +12928,10 @@
     172:180:void write(java.util.concurrent.ExecutorService):369:377 -> a
     181:181:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):305:305 -> a
     182:186:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):316:320 -> a
-    187:187:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():343:343 -> a
+    187:187:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():340:340 -> a
     187:187:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):320 -> a
     188:195:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):323:330 -> a
-    196:196:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():339:339 -> a
+    196:196:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():336:336 -> a
     196:196:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):330 -> a
     197:200:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):334:337 -> a
     201:201:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):336:336 -> a
@@ -12930,10 +13001,10 @@
     496:496:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):649:649 -> a
     497:502:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):645:650 -> a
     1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190:190 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():331:331 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():328:328 -> b
     2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190 -> b
     3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):191:191 -> b
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():343:343 -> b
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():340:340 -> b
     4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):192 -> b
     5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):192:202 -> b
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.A.d:
@@ -12992,6 +13063,8 @@
     14:14:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
     14:14:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
     15:15:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):74:74 -> a
+    16:16:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
+    16:16:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
     1:1:void lambda$new$0(java.util.Map$Entry):31:31 -> b
     1:7:java.lang.String toString():54:60 -> toString
 com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.A.k:
@@ -13002,7 +13075,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):24:25 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26 -> a
     4:6:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
 com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.A.i:
@@ -13342,7 +13415,7 @@
     150:150:void ensureCodesInited(int):159 -> a
     150:150:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):640 -> a
     151:165:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):641:655 -> a
-    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     166:166:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):655 -> a
     167:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):656:659 -> a
     171:171:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
@@ -13629,7 +13702,7 @@
     33:33:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():460 -> c
     34:34:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():460:460 -> c
     1:10:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():364:373 -> d
-    11:11:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):56:56 -> d
+    11:11:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> d
     11:11:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():373 -> d
     12:12:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):475:475 -> d
     13:15:java.lang.Object cacheAt(int,java.util.function.Supplier,java.util.function.Supplier):401:403 -> d
@@ -14132,7 +14205,7 @@
     246:249:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):834:837 -> b
     246:249:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
     250:251:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():227:228 -> b
-    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> b
+    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
     252:252:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228 -> b
     253:258:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228:233 -> b
     259:259:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):828:828 -> b
@@ -14841,6 +14914,8 @@
     22:22:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
     22:22:com.android.tools.r8.dex.Marker internalParse(com.android.tools.r8.dex.Marker$Tool,java.lang.String):168 -> a
     23:23:com.android.tools.r8.dex.Marker internalParse(com.android.tools.r8.dex.Marker$Tool,java.lang.String):169:169 -> a
+    24:24:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
+    24:24:com.android.tools.r8.dex.Marker internalParse(com.android.tools.r8.dex.Marker$Tool,java.lang.String):168 -> a
     1:2:com.android.tools.r8.dex.Marker setSha1(java.lang.String):95:96 -> b
     1:2:com.android.tools.r8.dex.Marker setVersion(java.lang.String):75:76 -> c
     1:3:boolean equals(java.lang.Object):133:135 -> equals
@@ -15916,108 +15991,108 @@
     java.util.Map mayHaveFinalizeMethodDirectlyOrIndirectlyCache -> k
     java.util.Set NO_DIRECT_SUBTYPE -> l
     java.util.Map subtypeMap -> h
-    1:8:void <clinit>():28:35 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):134:134 -> <init>
-    2:23:void <init>(com.android.tools.r8.graph.DexApplication):116:137 -> <init>
-    24:24:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):141:141 -> <init>
-    25:54:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):116:145 -> <init>
-    1:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):150:171 -> a
-    23:46:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):221:244 -> a
-    47:55:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):250:258 -> a
-    56:90:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):263:297 -> a
-    56:90:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):258 -> a
-    91:95:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):327:331 -> a
+    1:8:void <clinit>():27:34 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):133:133 -> <init>
+    2:23:void <init>(com.android.tools.r8.graph.DexApplication):115:136 -> <init>
+    24:24:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):140:140 -> <init>
+    25:54:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):115:144 -> <init>
+    1:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):149:170 -> a
+    23:46:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):219:242 -> a
+    47:55:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):248:256 -> a
+    56:90:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):261:295 -> a
+    56:90:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):256 -> a
+    91:95:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:329 -> a
     96:96:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    96:96:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332 -> a
-    97:97:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332:332 -> a
+    96:96:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330 -> a
+    97:97:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330:330 -> a
     98:98:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    98:98:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332 -> a
-    99:99:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332:332 -> a
+    98:98:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330 -> a
+    99:99:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330:330 -> a
     100:119:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfo.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):208:227 -> a
-    100:119:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):334 -> a
-    120:126:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):356:362 -> a
+    100:119:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332 -> a
+    120:126:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):354:360 -> a
     127:127:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):103:103 -> a
-    127:127:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):362 -> a
-    128:134:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):362:368 -> a
-    135:145:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):390:400 -> a
-    146:146:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():103:103 -> a
-    146:146:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):400 -> a
-    147:156:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):411:420 -> a
+    127:127:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):360 -> a
+    128:134:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):360:366 -> a
+    135:145:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):388:398 -> a
+    146:146:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> a
+    146:146:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):398 -> a
+    147:156:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):409:418 -> a
     157:157:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> a
-    157:157:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):420 -> a
-    158:161:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):421:424 -> a
-    162:162:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):393:393 -> a
-    163:166:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):431:434 -> a
-    167:169:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):439:441 -> a
-    170:185:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):503:518 -> a
-    186:195:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):539:548 -> a
-    196:208:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):624:636 -> a
-    209:218:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):720:729 -> a
-    219:241:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):734:756 -> a
-    242:242:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):457:457 -> a
-    242:242:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):761 -> a
-    243:249:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):761:767 -> a
-    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):206:209 -> b
-    5:53:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):662:710 -> b
-    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):716:716 -> c
-    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):486:489 -> d
-    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:178 -> d
-    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):490 -> d
-    8:16:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):563:571 -> d
-    1:4:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):475:478 -> e
-    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:178 -> e
-    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):479 -> e
-    8:12:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):587:591 -> e
-    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):457:457 -> f
-    2:11:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):522:531 -> f
-    1:1:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):516:516 -> g
-    2:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):641:644 -> g
+    157:157:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):418 -> a
+    158:161:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):419:422 -> a
+    162:162:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):391:391 -> a
+    163:166:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):429:432 -> a
+    167:169:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):437:439 -> a
+    170:185:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):501:516 -> a
+    186:195:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):537:546 -> a
+    196:208:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):622:634 -> a
+    209:229:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):723:743 -> a
+    230:230:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):455:455 -> a
+    230:230:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):748 -> a
+    231:237:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):748:754 -> a
+    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):205:208 -> b
+    5:53:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):660:708 -> b
+    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):714:714 -> c
+    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):484:487 -> d
+    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> d
+    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):488 -> d
+    8:16:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):561:569 -> d
+    1:4:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):473:476 -> e
+    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> e
+    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):477 -> e
+    8:12:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):585:589 -> e
+    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):455:455 -> f
+    2:11:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):520:529 -> f
+    1:1:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):514:514 -> g
+    2:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):639:642 -> g
     6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> g
-    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):644 -> g
+    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642 -> g
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> g
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> g
-    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):644 -> g
-    8:8:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):644:644 -> g
-    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):338:338 -> h
-    2:2:boolean hasSubtyping():446:446 -> h
-    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):470:470 -> i
-    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):609:620 -> j
-    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):619:619 -> j
-    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):465:465 -> k
-    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):595:595 -> l
+    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642 -> g
+    8:8:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642:642 -> g
+    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):336:336 -> h
+    2:2:boolean hasSubtyping():444:444 -> h
+    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):468:468 -> i
+    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):607:618 -> j
+    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):617:617 -> j
+    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):463:463 -> k
+    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):593:593 -> l
     2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):697:701 -> l
-    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):596 -> l
-    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):604:604 -> m
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():452:452 -> n
-    2:2:boolean isUnknown(com.android.tools.r8.graph.DexType):461:461 -> n
-    3:3:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():103:103 -> n
-    3:3:boolean isUnknown(com.android.tools.r8.graph.DexType):461 -> n
-    1:2:java.util.Set getMissingClasses():192:193 -> o
-    3:6:java.util.Set subtypes(com.android.tools.r8.graph.DexType):197:200 -> o
-    1:1:java.util.Set access$000():28:28 -> p
-    2:3:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):215:216 -> p
-    1:1:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):566:566 -> q
-    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):569:569 -> r
-    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):589:589 -> s
-    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):206:206 -> t
+    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):594 -> l
+    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):602:602 -> m
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():450:450 -> n
+    2:2:boolean isUnknown(com.android.tools.r8.graph.DexType):459:459 -> n
+    3:3:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> n
+    3:3:boolean isUnknown(com.android.tools.r8.graph.DexType):459 -> n
+    1:2:java.util.Set getMissingClasses():191:192 -> o
+    3:3:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):718:718 -> o
+    1:1:java.util.Set access$000():27:27 -> p
+    2:5:java.util.Set subtypes(com.android.tools.r8.graph.DexType):196:199 -> p
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):214:214 -> q
+    1:1:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):564:564 -> r
+    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):567:567 -> s
+    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):587:587 -> t
+    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):205:205 -> u
 com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo -> com.android.tools.r8.C.e:
     java.util.Set directSubtypes -> c
     java.util.Set implementedInterfaces -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType type -> a
     int hierarchyLevel -> b
-    1:1:void <clinit>():37:37 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType):51:51 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.DexType):41:52 -> <init>
-    1:11:void setLevel(int):67:77 -> a
-    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):82:85 -> a
-    16:18:boolean isInterface():97:99 -> a
-    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):109:111 -> a
-    1:1:com.android.tools.r8.graph.DexType access$100(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):37:37 -> b
-    2:2:void tagAsInterface():93:93 -> b
-    1:1:void tagAsSubtypeRoot():89:89 -> c
-    1:2:void ensureDirectSubTypeSet():61:62 -> d
-    1:1:java.lang.String toString():57:57 -> toString
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType):50:50 -> <init>
+    2:13:void <init>(com.android.tools.r8.graph.DexType):40:51 -> <init>
+    1:11:void setLevel(int):66:76 -> a
+    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):81:84 -> a
+    16:18:boolean isInterface():96:98 -> a
+    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):108:110 -> a
+    1:1:com.android.tools.r8.graph.DexType access$100(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):36:36 -> b
+    2:2:void tagAsInterface():92:92 -> b
+    1:1:void tagAsSubtypeRoot():88:88 -> c
+    1:2:void ensureDirectSubTypeSet():60:61 -> d
+    1:1:java.lang.String toString():56:56 -> toString
 com.android.tools.r8.graph.AppServices -> com.android.tools.r8.C.i:
     java.util.Map services -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -16064,7 +16139,7 @@
     38:47:boolean lambda$readServiceImplementationsForService$2(com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):193:202 -> a
     1:2:java.lang.String prefixUntilCommentChar(java.lang.String):209:210 -> b
     1:6:void visit(com.android.tools.r8.DataEntryResource):157:162 -> visit
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> visit
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> visit
     7:7:void visit(com.android.tools.r8.DataEntryResource):162 -> visit
     8:13:void visit(com.android.tools.r8.DataEntryResource):163:168 -> visit
     14:19:void visit(com.android.tools.r8.DataEntryResource):167:172 -> visit
@@ -16342,7 +16417,8 @@
     2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):68 -> f
     1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):61:63 -> g
     1:1:com.android.tools.r8.graph.ClassAccessFlags copy():77:77 -> z
-com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.C.t:
+com.android.tools.r8.graph.ClassHierarchy -> com.android.tools.r8.C.s:
+com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.C.u:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set visited -> c
@@ -16356,7 +16432,7 @@
     com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
     1:22:void visit(java.lang.Iterable,java.util.function.Consumer):65:86 -> a
     23:36:void visit(java.lang.Iterable,java.util.function.Consumer):69:82 -> a
-com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> com.android.tools.r8.C.s:
+com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> com.android.tools.r8.C.t:
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ALL_CLASSES -> a
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_LIBRARY_CLASSES -> b
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_LIBRARY_AND_CLASSPATH_CLASSES -> c
@@ -16365,7 +16441,7 @@
     1:4:void <clinit>():19:22 -> <clinit>
     5:5:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):18:18 -> <init>
-com.android.tools.r8.graph.ClassKind -> com.android.tools.r8.C.v:
+com.android.tools.r8.graph.ClassKind -> com.android.tools.r8.C.w:
     com.android.tools.r8.graph.ClassKind CLASSPATH -> d
     com.android.tools.r8.graph.ClassKind LIBRARY -> e
     java.util.function.Predicate check -> b
@@ -16381,9 +16457,9 @@
     5:5:boolean isOfKind(com.android.tools.r8.graph.DexClass):87:87 -> a
     5:5:void lambda$bridgeConsumer$0(java.util.function.Consumer,com.android.tools.r8.graph.DexClass):92 -> a
     6:8:void lambda$bridgeConsumer$0(java.util.function.Consumer,com.android.tools.r8.graph.DexClass):92:94 -> a
-com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.C.u:
+com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.C.v:
     com.android.tools.r8.graph.DexClass create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.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) -> a
-com.android.tools.r8.graph.Code -> com.android.tools.r8.C.w:
+com.android.tools.r8.graph.Code -> com.android.tools.r8.C.x:
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin) -> a
     void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry) -> a
@@ -16401,7 +16477,7 @@
     boolean isCfCode() -> m
     boolean isDexCode() -> n
     boolean isOutlineCode() -> o
-com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.C.y:
+com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.C.z:
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexString signature -> c
     com.android.tools.r8.graph.DexType type -> b
@@ -16419,7 +16495,7 @@
     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.C.x:
+com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> com.android.tools.r8.C.y:
     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
@@ -16427,7 +16503,7 @@
     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.DefaultUseRegistry -> com.android.tools.r8.C.z:
+com.android.tools.r8.graph.DefaultUseRegistry -> com.android.tools.r8.C.A:
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):10:10 -> <init>
     boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField) -> a
     boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod) -> a
@@ -16440,10 +16516,10 @@
     boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> d
     boolean registerTypeReference(com.android.tools.r8.graph.DexType) -> d
     boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> e
-com.android.tools.r8.graph.Descriptor -> com.android.tools.r8.C.A:
+com.android.tools.r8.graph.Descriptor -> com.android.tools.r8.C.B:
     1:1:void <init>():6:6 -> <init>
     boolean match(com.android.tools.r8.graph.DexItem) -> a
-com.android.tools.r8.graph.DexAnnotation -> com.android.tools.r8.C.B:
+com.android.tools.r8.graph.DexAnnotation -> com.android.tools.r8.C.C:
     com.android.tools.r8.graph.DexEncodedAnnotation annotation -> b
     com.android.tools.r8.graph.DexAnnotation[] EMPTY_ARRAY -> c
     boolean $assertionsDisabled -> d
@@ -16471,7 +16547,7 @@
     62:66:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):232 -> a
     67:67:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):231:231 -> a
     68:69:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):236:237 -> a
-    70:70:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():952:952 -> a
+    70:70:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> a
     70:70:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):238 -> a
     71:74:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):238:241 -> a
     75:75:com.android.tools.r8.graph.DexAnnotation createThrowsAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):246:246 -> a
@@ -16481,7 +16557,7 @@
     93:93:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
     93:93:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):351 -> a
     94:103:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):351:360 -> a
-    104:104:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():952:952 -> a
+    104:104:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> a
     104:104:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):361 -> a
     105:110:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):361:366 -> a
     111:112:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):363:364 -> a
@@ -16508,25 +16584,24 @@
     152:152:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):378 -> a
     153:154:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):378:379 -> a
     155:161:com.android.tools.r8.graph.DexAnnotation createAnnotationSynthesizedClassMap(java.util.TreeSet,com.android.tools.r8.graph.DexItemFactory):385:391 -> a
-    162:169:com.android.tools.r8.graph.DexAnnotation rewrite(java.util.function.Function):403:410 -> a
     1:4:com.android.tools.r8.graph.DexMethod getEnclosingMethodFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):115:118 -> b
     5:5:com.android.tools.r8.graph.DexValue$DexValueType[] lambda$createAnnotationSynthesizedClassMap$0(int):387:387 -> b
     1:3:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):157:159 -> c
     4:4:void com.android.tools.r8.utils.Pair.<init>():20:20 -> c
     4:4:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):159 -> c
     5:8:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):160:163 -> c
-    9:9:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():699:699 -> c
+    9:9:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():683:683 -> c
     9:9:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$DexValueString.getValue():0 -> c
     9:9:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):163 -> c
     10:14:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):163:167 -> c
-    15:15:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():462:462 -> c
+    15:15:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> c
     15:15:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):167 -> c
     16:16:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):167:167 -> c
     1:6:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):185:190 -> d
-    7:7:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():952:952 -> d
+    7:7:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> d
     7:7:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):190 -> d
     8:8:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):190:190 -> d
-    9:9:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():952:952 -> d
+    9:9:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> d
     9:9:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):191 -> d
     10:11:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):191:192 -> d
     1:1:boolean isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):123:123 -> e
@@ -16538,7 +16613,7 @@
     1:1:int hashCode():45:45 -> hashCode
     1:1:boolean isSignatureAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):273:273 -> i
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.graph.DexAnnotationDirectory -> com.android.tools.r8.C.C:
+com.android.tools.r8.graph.DexAnnotationDirectory -> com.android.tools.r8.C.D:
     java.util.List methodAnnotations -> b
     java.util.List fieldAnnotations -> d
     com.android.tools.r8.graph.DexProgramClass clazz -> a
@@ -16558,7 +16633,7 @@
     1:1:java.util.List getFieldAnnotations():66:66 -> i
     1:1:java.util.List getMethodAnnotations():58:58 -> j
     1:1:java.util.List getParameterAnnotations():62:62 -> k
-com.android.tools.r8.graph.DexAnnotationElement -> com.android.tools.r8.C.D:
+com.android.tools.r8.graph.DexAnnotationElement -> com.android.tools.r8.C.E:
     com.android.tools.r8.graph.DexAnnotationElement[] EMPTY_ARRAY -> c
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexValue value -> b
@@ -16575,7 +16650,7 @@
     1:3:boolean equals(java.lang.Object):30:32 -> equals
     1:1:int hashCode():22:22 -> hashCode
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.graph.DexAnnotationSet -> com.android.tools.r8.C.E:
+com.android.tools.r8.graph.DexAnnotationSet -> com.android.tools.r8.C.F:
     boolean $assertionsDisabled -> g
     int sorted -> d
     com.android.tools.r8.graph.DexAnnotationSet[] EMPTY_ARRAY -> e
@@ -16585,29 +16660,29 @@
     1:1:void <init>(com.android.tools.r8.graph.DexAnnotation[]):27:27 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DexAnnotation[]):25:28 -> <init>
     1:1:com.android.tools.r8.graph.DexType findDuplicateEntryType(com.android.tools.r8.graph.DexAnnotation[]):32:32 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):70:70 -> a
-    3:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):75:76 -> a
-    5:5:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):88:88 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> a
+    3:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):71:72 -> a
+    5:5:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):84:84 -> a
     6:6:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
-    6:6:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):88 -> a
-    7:8:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):96:97 -> a
-    9:9:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):146:146 -> a
-    10:10:com.android.tools.r8.graph.DexAnnotation lambda$keepIf$1(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):146:146 -> a
-    11:18:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):150:157 -> a
+    6:6:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):84 -> a
+    7:8:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):92:93 -> a
+    9:9:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):142:142 -> a
+    10:10:com.android.tools.r8.graph.DexAnnotation lambda$keepIf$1(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):142:142 -> a
+    11:18:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):146:153 -> a
     19:19:com.android.tools.r8.graph.DexAnnotationSet empty():46:46 -> a
-    19:19:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):158 -> a
-    20:20:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):160:160 -> a
+    19:19:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):154 -> a
+    20:20:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):156:156 -> a
     1:4:com.android.tools.r8.graph.DexType findDuplicateEntryType(java.util.List):36:39 -> b
-    5:7:boolean computeEquals(java.lang.Object):60:62 -> b
-    1:1:int computeHashCode():55:55 -> h
-    1:1:boolean isEmpty():80:80 -> i
-    1:2:void sort():84:85 -> j
-    3:3:int sortedHashCode():121:121 -> j
-    3:3:void sort():85 -> j
-    4:11:void sort():85:92 -> j
+    5:7:boolean computeEquals(java.lang.Object):56:58 -> b
+    1:1:int computeHashCode():51:51 -> h
+    1:1:boolean isEmpty():76:76 -> i
+    1:2:void sort():80:81 -> j
+    3:3:int sortedHashCode():117:117 -> j
+    3:3:void sort():81 -> j
+    4:11:void sort():81:88 -> j
     1:1:com.android.tools.r8.graph.DexAnnotationSet empty():46:46 -> k
-    1:1:java.lang.String toString():165:165 -> toString
-com.android.tools.r8.graph.DexApplication -> com.android.tools.r8.C.F:
+    1:1:java.lang.String toString():161:161 -> toString
+com.android.tools.r8.graph.DexApplication -> com.android.tools.r8.C.G:
     com.android.tools.r8.dex.ClassesChecksum checksums -> g
     com.android.tools.r8.naming.ClassNameMapper proguardMap -> c
     boolean $assertionsDisabled -> i
@@ -16633,7 +16708,7 @@
     1:1:com.android.tools.r8.naming.ClassNameMapper getProguardMap():123:123 -> e
     java.util.List programClasses() -> f
     com.android.tools.r8.graph.DirectMappedDexApplication toDirect() -> g
-com.android.tools.r8.graph.DexApplication$Builder -> com.android.tools.r8.C.F$a:
+com.android.tools.r8.graph.DexApplication$Builder -> com.android.tools.r8.C.G$a:
     java.util.List dataResourceProviders -> b
     com.android.tools.r8.utils.Timing timing -> g
     java.util.List programClasses -> a
@@ -16668,12 +16743,12 @@
     1:1:java.util.Collection getProgramClasses():211:211 -> c
     1:1:java.util.Collection getSynthesizedClasses():215:215 -> d
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.DexApplication$ReorderBox -> com.android.tools.r8.C.G:
+com.android.tools.r8.graph.DexApplication$ReorderBox -> com.android.tools.r8.C.H:
     java.util.List classes -> a
     1:2:void <init>(java.util.List):74:75 -> <init>
     1:1:java.util.List getClasses():88:88 -> a
     1:3:boolean reorderClasses():80:82 -> b
-com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.C.I:
+com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.C.J:
     com.android.tools.r8.graph.DexString methodName -> e
     com.android.tools.r8.graph.DexMethod method -> j
     int instructionOffset -> k
@@ -16716,8 +16791,8 @@
     8:8:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     8:8:java.lang.String toString():107 -> toString
     9:16:java.lang.String toString():107:114 -> toString
-com.android.tools.r8.graph.DexCallSite$1 -> com.android.tools.r8.C.H:
-com.android.tools.r8.graph.DexCallSite$HashBuilder -> com.android.tools.r8.C.I$a:
+com.android.tools.r8.graph.DexCallSite$1 -> com.android.tools.r8.C.I:
+com.android.tools.r8.graph.DexCallSite$HashBuilder -> com.android.tools.r8.C.J$a:
     java.io.ByteArrayOutputStream bytes -> a
     com.android.tools.r8.graph.DexCallSite this$0 -> c
     java.io.ObjectOutputStream out -> b
@@ -16761,7 +16836,7 @@
     35:35:void write(java.util.List):225 -> a
     36:68:void write(java.util.List):229:261 -> a
     69:85:java.lang.String build():267:283 -> a
-com.android.tools.r8.graph.DexClass -> com.android.tools.r8.C.L:
+com.android.tools.r8.graph.DexClass -> com.android.tools.r8.C.M:
     com.android.tools.r8.graph.DexEncodedField[] instanceFields -> j
     com.android.tools.r8.graph.DexEncodedField[] staticFields -> i
     com.android.tools.r8.graph.DexTypeList interfaces -> f
@@ -16785,48 +16860,41 @@
     2:81:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):40:119 -> <init>
     82:82:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):109:109 -> <init>
     1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():654:663 -> A
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():814:814 -> B
-    1:1:java.util.List getInnerClasses():810:810 -> C
-    1:1:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():836 -> C
-    2:3:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():836:837 -> C
-    1:1:java.util.List getInnerClasses():810:810 -> D
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():810:810 -> B
+    1:1:java.util.List getInnerClasses():806:806 -> C
+    1:1:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():832 -> C
+    2:3:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():832:833 -> C
+    1:1:java.util.List getInnerClasses():806:806 -> D
     com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> E
-    1:5:com.android.tools.r8.graph.DexType getNestHost():898:902 -> F
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():908:908 -> G
-    1:1:java.util.List getNestMembersClassAttributes():912:912 -> H
+    1:5:com.android.tools.r8.graph.DexType getNestHost():894:898 -> F
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():904:904 -> G
+    1:1:java.util.List getNestMembersClassAttributes():908:908 -> H
     1:1:com.android.tools.r8.graph.DexType getType():671:671 -> I
     1:1:boolean hasClassInitializer():675:675 -> J
     1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():693:693 -> K
     1:1:boolean hasDefaultInitializer():679 -> K
-    1:1:boolean hasKotlinInfo():919:919 -> L
-    1:2:boolean hasStaticSynchronizedMethods():933:934 -> M
-    3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> M
-    3:3:boolean hasStaticSynchronizedMethods():934 -> M
-    4:4:boolean hasStaticSynchronizedMethods():934:934 -> M
-    5:5:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> M
-    5:5:boolean hasStaticSynchronizedMethods():934 -> M
-    1:5:java.util.List instanceFields():454:458 -> N
-    1:1:boolean isAbstract():589:589 -> O
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isAbstract():137:137 -> O
-    2:2:boolean isAbstract():589 -> O
-    1:4:boolean isAnonymousClass():870:873 -> P
-    boolean isClasspathClass() -> Q
-    1:1:boolean isEnum():597:597 -> R
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isEnum():161:161 -> R
-    2:2:boolean isEnum():597 -> R
-    1:1:boolean isInANest():877:877 -> S
-    1:1:boolean isInterface():593:593 -> T
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> T
-    2:2:boolean isInterface():593 -> T
-    boolean isLibraryClass() -> U
-    1:3:boolean isLocalClass():857:859 -> V
-    1:3:boolean isMemberClass():863:865 -> W
-    4:4:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():814:814 -> W
-    4:4:boolean isMemberClass():865 -> W
-    5:5:boolean isMemberClass():865:865 -> W
-    1:1:boolean isNestHost():890:890 -> X
-    1:1:boolean isNestMember():894:894 -> Y
-    boolean isNotProgramClass() -> Z
+    1:1:boolean hasKotlinInfo():915:915 -> L
+    1:5:java.util.List instanceFields():454:458 -> M
+    1:1:boolean isAbstract():589:589 -> N
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isAbstract():137:137 -> N
+    2:2:boolean isAbstract():589 -> N
+    1:4:boolean isAnonymousClass():866:869 -> O
+    boolean isClasspathClass() -> P
+    1:1:boolean isInANest():873:873 -> Q
+    1:1:boolean isInterface():593:593 -> R
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> R
+    2:2:boolean isInterface():593 -> R
+    boolean isLibraryClass() -> S
+    1:3:boolean isLocalClass():853:855 -> T
+    1:3:boolean isMemberClass():859:861 -> U
+    4:4:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():810:810 -> U
+    4:4:boolean isMemberClass():861 -> U
+    5:5:boolean isMemberClass():861:861 -> U
+    1:1:boolean isNestHost():886:886 -> V
+    1:1:boolean isNestMember():890:890 -> W
+    boolean isNotProgramClass() -> X
+    boolean isProgramClass() -> Y
+    1:1:java.lang.Iterable methods():135:135 -> Z
     java.util.Iterator lambda$allImmediateSupertypes$3(java.util.Iterator) -> a
     1:3:java.lang.Iterable fields(java.util.function.Predicate):129:131 -> a
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
@@ -16858,12 +16926,12 @@
     94:102:boolean hasClassInitializerThatCannotBePostponed():763:771 -> a
     94:102:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):753 -> a
     103:106:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):756:759 -> a
-    107:107:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$4(com.android.tools.r8.graph.DexEncodedField):806:806 -> a
-    108:108:java.util.List getInnerClasses():810:810 -> a
-    108:108:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):845 -> a
-    109:117:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):845:853 -> a
-    118:119:void setNestHost(com.android.tools.r8.graph.DexType):885:886 -> a
-    boolean isProgramClass() -> a0
+    107:107:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$4(com.android.tools.r8.graph.DexEncodedField):802:802 -> a
+    108:108:java.util.List getInnerClasses():806:806 -> a
+    108:108:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):841 -> a
+    109:117:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):841:849 -> a
+    118:119:void setNestHost(com.android.tools.r8.graph.DexType):881:882 -> a
+    1:5:java.util.List staticFields():396:400 -> a0
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> b
     1:5:void removeDirectMethod(int):182:186 -> b
     6:11:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):212:217 -> b
@@ -16886,17 +16954,17 @@
     51:52:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):570 -> b
     53:53:boolean isSerializable(com.android.tools.r8.graph.AppView):729:729 -> b
     54:59:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):789:794 -> b
-    60:60:boolean isValid(com.android.tools.r8.utils.InternalOptions):923:923 -> b
+    60:60:boolean isValid(com.android.tools.r8.utils.InternalOptions):919:919 -> b
     61:65:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):272:276 -> b
-    61:65:boolean isValid(com.android.tools.r8.utils.InternalOptions):923 -> b
-    66:67:boolean isValid(com.android.tools.r8.utils.InternalOptions):924:925 -> b
+    61:65:boolean isValid(com.android.tools.r8.utils.InternalOptions):919 -> b
+    66:67:boolean isValid(com.android.tools.r8.utils.InternalOptions):920:921 -> b
     68:68:java.lang.Iterable fields():125:125 -> b
-    68:68:boolean isValid(com.android.tools.r8.utils.InternalOptions):925 -> b
-    69:71:boolean isValid(com.android.tools.r8.utils.InternalOptions):925:927 -> b
+    68:68:boolean isValid(com.android.tools.r8.utils.InternalOptions):921 -> b
+    69:71:boolean isValid(com.android.tools.r8.utils.InternalOptions):921:923 -> b
     72:72:java.lang.Iterable methods():135:135 -> b
-    72:72:boolean isValid(com.android.tools.r8.utils.InternalOptions):927 -> b
-    73:74:boolean isValid(com.android.tools.r8.utils.InternalOptions):927:928 -> b
-    1:1:java.lang.Iterable methods():135:135 -> b0
+    72:72:boolean isValid(com.android.tools.r8.utils.InternalOptions):923 -> b
+    73:74:boolean isValid(com.android.tools.r8.utils.InternalOptions):923:924 -> b
+    1:5:java.util.List virtualMethods():204:208 -> b0
     1:3:java.lang.Iterable methods(java.util.function.Predicate):139:141 -> c
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
     4:4:java.lang.Iterable methods(java.util.function.Predicate):139 -> c
@@ -16905,19 +16973,17 @@
     15:15:int lambda$virtualMethodsSorted$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):324:324 -> c
     16:16:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):531:531 -> c
     17:17:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):565:565 -> c
-    1:5:java.util.List staticFields():396:400 -> c0
-    1:2:void removeEnclosingMethod(java.util.function.Predicate):822:823 -> d
-    1:5:java.util.List virtualMethods():204:208 -> d0
-    1:1:void removeInnerClasses(java.util.function.Predicate):832:832 -> e
-    1:3:com.android.tools.r8.graph.DexEncodedMethod[] virtualMethodsSorted():321:323 -> e0
-    1:1:boolean verifyNoDuplicateFields():521:521 -> f0
-    2:2:java.lang.Iterable fields():125:125 -> f0
-    2:2:boolean verifyNoDuplicateFields():522 -> f0
-    3:5:boolean verifyNoDuplicateFields():522:524 -> f0
-    1:1:boolean verifyNoDuplicateMethods():284:284 -> g0
-    2:2:java.lang.Iterable methods():135:135 -> g0
-    2:2:boolean verifyNoDuplicateMethods():285 -> g0
-    3:5:boolean verifyNoDuplicateMethods():285:287 -> g0
+    1:3:com.android.tools.r8.graph.DexEncodedMethod[] virtualMethodsSorted():321:323 -> c0
+    1:2:void removeEnclosingMethod(java.util.function.Predicate):818:819 -> d
+    1:1:boolean verifyNoDuplicateFields():521:521 -> d0
+    2:2:java.lang.Iterable fields():125:125 -> d0
+    2:2:boolean verifyNoDuplicateFields():522 -> d0
+    3:5:boolean verifyNoDuplicateFields():522:524 -> d0
+    1:1:void removeInnerClasses(java.util.function.Predicate):828:828 -> e
+    1:1:boolean verifyNoDuplicateMethods():284:284 -> e0
+    2:2:java.lang.Iterable methods():135:135 -> e0
+    2:2:boolean verifyNoDuplicateMethods():285 -> e0
+    3:5:boolean verifyNoDuplicateMethods():285:287 -> e0
     com.android.tools.r8.graph.DexClass asDexClass() -> h
     boolean isDexClass() -> k
     boolean isStaticMember() -> n
@@ -16928,30 +16994,30 @@
     1:6:com.android.tools.r8.graph.DexEncodedMethod[] allMethodsSorted():302:307 -> q
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> r
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> s
-    1:1:void clearEnclosingMethod():818:818 -> t
-    1:1:void clearInnerClasses():828:828 -> u
-    1:1:void clearNestHost():881:881 -> v
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():805:806 -> w
+    1:1:void clearEnclosingMethod():814:814 -> t
+    1:1:void clearInnerClasses():824:824 -> u
+    1:1:void clearNestHost():877:877 -> v
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():801:802 -> w
     1:5:java.util.List directMethods():150:154 -> x
     1:3:com.android.tools.r8.graph.DexEncodedMethod[] directMethodsSorted():313:315 -> y
     1:1:java.lang.Iterable fields():125:125 -> z
-com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.C.J:
+com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.C.K:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.graph.DexClass$MethodSetter -> com.android.tools.r8.C.K:
+com.android.tools.r8.graph.DexClass$MethodSetter -> com.android.tools.r8.C.L:
     void setMethod(int,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.C.M:
+com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.C.N:
     boolean $assertionsDisabled -> s
     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>
     1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():90:90 -> E
-    boolean isClasspathClass() -> Q
-    boolean isNotProgramClass() -> Z
+    boolean isClasspathClass() -> P
+    boolean isNotProgramClass() -> X
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):59:59 -> a
     1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):70:70 -> b
     1:1:java.lang.String toString():64:64 -> toString
     2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():64 -> toString
-com.android.tools.r8.graph.DexCode -> com.android.tools.r8.C.Q:
+com.android.tools.r8.graph.DexCode -> com.android.tools.r8.C.S:
     com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> k
     boolean $assertionsDisabled -> l
     com.android.tools.r8.code.Instruction[] instructions -> h
@@ -17017,7 +17083,7 @@
     2:11:com.android.tools.r8.graph.DexCode withoutThisParameter():81 -> r
     12:12:com.android.tools.r8.graph.DexCode withoutThisParameter():81:81 -> r
     1:1:java.lang.String toString():262:262 -> toString
-com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.C.N:
+com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.C.O:
     boolean $assertionsDisabled -> e
     int handlerIndex -> d
     int startAddress -> b
@@ -17036,7 +17102,7 @@
     4:4:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(int,int):215:215 -> toString
     4:4:java.lang.String toString():495 -> toString
     5:5:java.lang.String toString():495:495 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.C.P:
+com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.C.Q:
     com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] pairs -> a
     int catchAllAddr -> b
     boolean $assertionsDisabled -> c
@@ -17053,7 +17119,7 @@
     15:15:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(int,int):215:215 -> toString
     15:15:java.lang.String toString():571 -> toString
     16:20:java.lang.String toString():571:575 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.C.O:
+com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.C.P:
     com.android.tools.r8.graph.DexType type -> a
     int addr -> b
     boolean $assertionsDisabled -> c
@@ -17063,7 +17129,7 @@
     2:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):597:597 -> a
     1:3:boolean equals(java.lang.Object):610:612 -> equals
     1:1:int hashCode():602:602 -> hashCode
-com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.C.S:
+com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.C.T:
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexString sourceFile -> d
     boolean $assertionsDisabled -> j
@@ -17081,7 +17147,7 @@
     6:6:java.lang.String toString(boolean):57 -> a
     7:40:java.lang.String toString(boolean):57:90 -> a
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.graph.DexDebugEntryBuilder -> com.android.tools.r8.C.V:
+com.android.tools.r8.graph.DexDebugEntryBuilder -> com.android.tools.r8.C.W:
     com.android.tools.r8.graph.DexDebugPositionState positionState -> h
     java.util.Map locals -> c
     boolean $assertionsDisabled -> i
@@ -17126,13 +17192,13 @@
     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.C.T:
-com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> com.android.tools.r8.C.U:
+com.android.tools.r8.graph.DexDebugEntryBuilder$1 -> com.android.tools.r8.C.U:
+com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> com.android.tools.r8.C.V:
     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.C.g0:
+com.android.tools.r8.graph.DexDebugEvent -> com.android.tools.r8.C.h0:
     com.android.tools.r8.graph.DexDebugEvent[] EMPTY_ARRAY -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -17140,7 +17206,7 @@
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> 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.C.W:
+com.android.tools.r8.graph.DexDebugEvent$AdvanceLine -> com.android.tools.r8.C.X:
     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
@@ -17148,7 +17214,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.C.X:
+com.android.tools.r8.graph.DexDebugEvent$AdvancePC -> com.android.tools.r8.C.Y:
     int delta -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():41:41 -> <clinit>
@@ -17158,7 +17224,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.C.Y:
+com.android.tools.r8.graph.DexDebugEvent$Default -> com.android.tools.r8.C.Z:
     int value -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():426:426 -> <clinit>
@@ -17170,7 +17236,7 @@
     1:1:int hashCode():462:462 -> hashCode
     1:2:int getPCDelta():446:447 -> i
     1:1:java.lang.String toString():457:457 -> toString
-com.android.tools.r8.graph.DexDebugEvent$EndLocal -> com.android.tools.r8.C.Z:
+com.android.tools.r8.graph.DexDebugEvent$EndLocal -> com.android.tools.r8.C.a0:
     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
@@ -17178,7 +17244,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.C.a0:
+com.android.tools.r8.graph.DexDebugEvent$RestartLocal -> com.android.tools.r8.C.b0:
     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
@@ -17186,12 +17252,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.C.b0:
+com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin -> com.android.tools.r8.C.c0:
     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.C.c0:
+com.android.tools.r8.graph.DexDebugEvent$SetFile -> com.android.tools.r8.C.d0:
     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
@@ -17202,7 +17268,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.C.d0:
+com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame -> com.android.tools.r8.C.e0:
     com.android.tools.r8.graph.DexMethod callee -> b
     com.android.tools.r8.ir.code.Position caller -> c
     boolean $assertionsDisabled -> d
@@ -17213,12 +17279,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.C.e0:
+com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd -> com.android.tools.r8.C.f0:
     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.C.f0:
+com.android.tools.r8.graph.DexDebugEvent$StartLocal -> com.android.tools.r8.C.g0:
     com.android.tools.r8.graph.DexString name -> c
     com.android.tools.r8.graph.DexString signature -> e
     com.android.tools.r8.graph.DexType type -> d
@@ -17235,7 +17301,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.C.h0:
+com.android.tools.r8.graph.DexDebugEventBuilder -> com.android.tools.r8.C.i0:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexItemFactory factory -> b
     int startLine -> l
@@ -17302,7 +17368,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.C.i0:
+com.android.tools.r8.graph.DexDebugEventVisitor -> com.android.tools.r8.C.j0:
     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
@@ -17313,7 +17379,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.C.j0:
+com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.C.k0:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexDebugEvent[] events -> e
     int startLine -> c
@@ -17326,12 +17392,12 @@
     1:9:boolean computeEquals(java.lang.Object):44:52 -> b
     1:3:int computeHashCode():37:39 -> h
     1:8:java.lang.String toString():71:78 -> toString
-com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.C.k0:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.C.l0:
     1:4:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:20 -> <init>
     5: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.C.l0:
+com.android.tools.r8.graph.DexDebugPositionState -> com.android.tools.r8.C.m0:
     com.android.tools.r8.graph.DexString currentFile -> c
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod currentMethod -> d
@@ -17356,7 +17422,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.C.m0:
+com.android.tools.r8.graph.DexDefinition -> com.android.tools.r8.C.n0:
     1:1:void <init>():13:13 -> <init>
     1:1:java.util.stream.Stream filterDexEncodedField(java.util.stream.Stream):71:71 -> a
     2:2:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):63:63 -> a
@@ -17372,10 +17438,10 @@
     boolean isDexEncodedMethod() -> m
     boolean isStaticMember() -> n
     com.android.tools.r8.graph.DexReference toReference() -> o
-com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.C.n0:
+com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.C.o0:
     com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexItemFactory dexItemFactory() -> a
-com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.C.o0:
+com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.C.p0:
     com.android.tools.r8.graph.DexAnnotationElement[] elements -> b
     com.android.tools.r8.graph.DexType type -> a
     int sorted -> c
@@ -17388,7 +17454,6 @@
     4:4:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):66:66 -> a
     5:5:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
     5:5:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):66 -> a
-    6:12:com.android.tools.r8.graph.DexEncodedAnnotation rewrite(java.util.function.Function,java.util.function.Function):81:87 -> a
     1:3:boolean equals(java.lang.Object):54:56 -> equals
     1:2:void sort():62:63 -> h
     3:3:int sortedHashCode():74:74 -> h
@@ -17399,7 +17464,7 @@
     11:11:void sort():70:70 -> h
     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.C.p0:
+com.android.tools.r8.graph.DexEncodedArray -> com.android.tools.r8.C.q0:
     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 -> a
@@ -17407,7 +17472,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.C.q0:
+com.android.tools.r8.graph.DexEncodedField -> com.android.tools.r8.C.r0:
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
     com.android.tools.r8.graph.DexEncodedField[] EMPTY_ARRAY -> f
     com.android.tools.r8.graph.DexField field -> a
@@ -17421,7 +17486,7 @@
     1:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):37:39 -> a
     4:4:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):59:59 -> a
     5:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):65:66 -> a
-    7:7:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):70:70 -> a
+    7:7:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> a
     7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66 -> a
     8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67:67 -> a
     9:9:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
@@ -17436,10 +17501,10 @@
     27:27:boolean com.android.tools.r8.graph.AccessFlags.isFinal():175:175 -> a
     27:27:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):162 -> a
     28:34:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):162:168 -> a
-    35:35:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):166:166 -> a
+    35:35:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> a
     35:35:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):168 -> a
     36:36:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):169:169 -> a
-    37:37:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):166:166 -> a
+    37:37:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> a
     37:37:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):168 -> a
     38:54:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):179:195 -> a
     55:55:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):194:194 -> a
@@ -17470,7 +17535,7 @@
     1:1:boolean isStatic():114:114 -> v
     2:2:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> v
     2:2:boolean isStatic():114 -> v
-com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.C.y0:
+com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.C.z0:
     com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo callSiteOptimizationInfo -> h
     boolean obsolete -> m
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
@@ -17563,8 +17628,8 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):80:80 -> a
     2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):80:80 -> a
     3:5:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):235:237 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1055 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
     6:6:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317 -> a
     7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318:1318 -> a
     8:8:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
@@ -17681,14 +17746,14 @@
     304:306:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
     307:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):729:733 -> a
     307:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
-    312:312:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    312:312:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     312:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):736 -> a
     312:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
     313:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):736:736 -> a
     313:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
     314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):735:735 -> a
     314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
-    315:315:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    315:315:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     315:315:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):737 -> a
     315:315:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
     316:319:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):738:741 -> a
@@ -17710,7 +17775,7 @@
     342:344:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
     345:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):763:765 -> a
     345:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
-    348:348:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    348:348:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     348:348:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):766 -> a
     348:348:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
     349:353:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):767:771 -> a
@@ -17719,7 +17784,7 @@
     354:362:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
     363:363:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):773:773 -> a
     363:363:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
-    364:364:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    364:364:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     364:364:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):777 -> a
     364:364:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
     365:368:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):778:781 -> a
@@ -17741,7 +17806,7 @@
     401:401:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
     402:406:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):714:718 -> a
     407:411:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):717:721 -> a
-    412:412:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    412:412:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     412:412:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):721 -> a
     413:413:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):721:721 -> a
     414:415:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):816:817 -> a
@@ -17924,12 +17989,12 @@
     1:9:com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo getMutableCallSiteOptimizationInfo(com.android.tools.r8.graph.AppView):1177:1185 -> x
     1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1158:1162 -> y
     1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1153:1154 -> z
-com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.C.r0:
+com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.C.s0:
     int[] $SwitchMap$com$android$tools$r8$ir$optimize$Inliner$Constraint -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexEncodedMethod$CompilationState -> a
     1:1:void <clinit>():427:427 -> <clinit>
     2:2:void <clinit>():379:379 -> <clinit>
-com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.C.s0:
+com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.C.t0:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
     com.android.tools.r8.graph.Code code -> e
@@ -17961,10 +18026,10 @@
     2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():216:216 -> c
     2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1273 -> c
     1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1278:1282 -> d
-com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> com.android.tools.r8.C.t0:
+com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> com.android.tools.r8.C.u0:
     boolean returnsReceiver -> a
     1:2:void <init>(boolean):1102:1103 -> <init>
-com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.C.u0:
+com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.C.v0:
     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
@@ -17977,21 +18042,21 @@
     25:25:void <clinit>():90:90 -> <clinit>
     1:1:void <init>(java.lang.String,int):90:90 -> <init>
     1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():90:90 -> a
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> com.android.tools.r8.C.x0:
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> com.android.tools.r8.C.y0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):1107:1107 -> <init>
     2:2:void <init>():1109:1109 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
     boolean isTrivialInstanceInitializer() -> b
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> com.android.tools.r8.C.v0:
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> com.android.tools.r8.C.w0:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):1141:1142 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.C.w0:
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.C.x0:
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer INSTANCE -> a
     1:1:void <clinit>():1124:1124 -> <clinit>
     1:1:void <init>():1127:1127 -> <init>
     boolean isTrivialInstanceInitializer() -> b
-com.android.tools.r8.graph.DexField -> com.android.tools.r8.C.z0:
+com.android.tools.r8.graph.DexField -> com.android.tools.r8.C.A0:
     com.android.tools.r8.graph.DexString name -> g
     com.android.tools.r8.graph.DexType type -> f
     com.android.tools.r8.graph.DexType holder -> e
@@ -18041,7 +18106,7 @@
     com.android.tools.r8.graph.DexField asDexField() -> k
     boolean isDexField() -> o
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.graph.DexItem -> com.android.tools.r8.C.A0:
+com.android.tools.r8.graph.DexItem -> com.android.tools.r8.C.B0:
     1:1:void <init>():12:12 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
@@ -18057,48 +18122,48 @@
     1:1:void lambda$collectAll$2(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem):24:24 -> b
     1:1:java.lang.String toSmaliString():60:60 -> f
     1:1:java.lang.String toSourceString():64:64 -> g
-com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.C.T0:
+com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.C.U0:
     com.android.tools.r8.graph.DexString getDeclaredFieldName -> A0
     com.android.tools.r8.graph.DexString unboxLongMethodName -> Q
     com.android.tools.r8.graph.DexString mathDescriptor -> b1
-    com.android.tools.r8.graph.DexType methodHandleType -> F2
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> j3
+    com.android.tools.r8.graph.DexType invocationHandlerType -> F2
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
     java.util.concurrent.ConcurrentHashMap classTypeLatticeInterfaces -> q
     com.android.tools.r8.graph.DexString assertionErrorDescriptor -> I0
     com.android.tools.r8.graph.DexString proxyDescriptor -> j1
     com.android.tools.r8.graph.DexString nameMethodName -> r0
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> k3
     com.android.tools.r8.graph.DexString shortDescriptor -> A
-    java.util.Map fields -> c
-    com.android.tools.r8.graph.DexType comparableType -> W3
     com.android.tools.r8.graph.DexType intType -> V1
     com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> w2
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> Z3
+    java.util.concurrent.ConcurrentHashMap strings -> a
     com.android.tools.r8.graph.DexString getFieldName -> z0
-    com.android.tools.r8.graph.DexType metafactoryType -> O3
+    java.util.Set libraryTypesAssumedToBePresent -> g4
+    com.android.tools.r8.graph.DexType lookupType -> O3
     com.android.tools.r8.graph.DexType classArrayType -> o2
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> c3
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> a0
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> G3
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> G3
     com.android.tools.r8.graph.DexString unboxFloatMethodName -> R
     com.android.tools.r8.graph.DexType boxedShortType -> g2
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> Y3
+    com.android.tools.r8.graph.DexString unknownTypeName -> k4
     com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> I1
     com.android.tools.r8.graph.DexString valueOfMethodName -> i0
     com.android.tools.r8.graph.DexString classLoaderDescriptor -> Q0
     com.android.tools.r8.graph.DexString comparatorDescriptor -> r1
     com.android.tools.r8.graph.DexString voidDescriptor -> B
-    java.util.Map protos -> d
-    com.android.tools.r8.graph.DexType throwableType -> W2
+    com.android.tools.r8.graph.DexType icceType -> W2
+    com.android.tools.r8.graph.DexType annotationDefault -> x3
     java.util.concurrent.ConcurrentHashMap referenceTypeLatticeElements -> p
     com.android.tools.r8.graph.DexString objectsDescriptor -> Y0
     com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> z1
-    com.android.tools.r8.graph.DexType mapEntryType -> O2
+    com.android.tools.r8.graph.DexType callableType -> O2
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> b4
     com.android.tools.r8.graph.DexString icceDescriptor -> A1
+    com.android.tools.r8.kotlin.Kotlin kotlin -> q3
     com.android.tools.r8.graph.DexString unboxDoubleMethodName -> S
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
     com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> i1
-    com.android.tools.r8.graph.DexType varHandleType -> E2
+    com.android.tools.r8.graph.DexType methodTypeType -> E2
     com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> H0
     com.android.tools.r8.graph.DexString classDescriptor -> P0
     com.android.tools.r8.graph.DexString collectionDescriptor -> q1
@@ -18106,203 +18171,200 @@
     com.android.tools.r8.graph.DexType floatType -> U1
     com.android.tools.r8.graph.DexType strictMathType -> v2
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> C
-    com.android.tools.r8.graph.DexType externalizableType -> V3
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> Y3
     com.android.tools.r8.graph.DexString getDeclaredConstructorName -> y0
-    java.util.Set libraryMethodsReturningNonNull -> f4
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> f4
     com.android.tools.r8.graph.DexType objectArrayType -> n2
-    java.util.Map methods -> e
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> N3
+    com.android.tools.r8.graph.DexType callSiteType -> N3
     com.android.tools.r8.graph.DexString iterableDescriptor -> a1
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> d3
     com.android.tools.r8.graph.DexType boxedLongType -> f2
     com.android.tools.r8.graph.DexString isEmptyMethodName -> T
     com.android.tools.r8.graph.DexString byteDescriptor -> u
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> q3
     com.android.tools.r8.graph.DexString trimName -> h0
     com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> H1
-    com.android.tools.r8.graph.DexType annotationSignature -> F3
+    com.android.tools.r8.graph.DexType annotationThrows -> F3
     com.android.tools.r8.graph.DexString finalizeMethodName -> p0
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> g3
     com.android.tools.r8.graph.DexString throwableArrayDescriptor -> P1
-    com.android.tools.r8.graph.DexType runtimeExceptionType -> V2
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> V2
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> D
     com.android.tools.r8.graph.DexString annotationDescriptor -> X0
     com.android.tools.r8.graph.DexString throwableDescriptor -> y1
-    com.android.tools.r8.graph.DexType mapType -> N2
-    java.util.Map methodHandles -> f
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> a4
+    com.android.tools.r8.graph.DexType comparatorType -> N2
+    java.util.IdentityHashMap internalSentinels -> l4
+    boolean $assertionsDisabled -> m4
+    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> a4
+    java.util.Map libraryMethodsWithoutSideEffects -> e4
     com.android.tools.r8.graph.DexString getDeclaredMethodName -> C0
     com.android.tools.r8.graph.DexString stringBuilderDescriptor -> d1
     java.util.Map setInlineFrames -> o
-    com.android.tools.r8.graph.DexType stringBufferType -> D2
+    com.android.tools.r8.graph.DexType methodHandleType -> D2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap defaults -> i
     com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> K0
     com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> l1
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
     com.android.tools.r8.graph.DexString forNameMethodName -> t0
-    com.android.tools.r8.graph.DexType serializableType -> U3
+    java.util.concurrent.ConcurrentHashMap methods -> e
+    com.android.tools.r8.graph.DexType comparableType -> U3
     com.android.tools.r8.graph.DexType doubleType -> T1
     com.android.tools.r8.graph.DexType mathType -> u2
-    java.util.Set libraryTypesAssumedToBePresent -> i4
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> M3
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> i3
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> h3
+    com.android.tools.r8.graph.DexType metafactoryType -> M3
     com.android.tools.r8.graph.DexString unboxByteMethodName -> M
     com.android.tools.r8.graph.DexType objectType -> m2
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> m3
     com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> C1
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> W3
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> c0
     com.android.tools.r8.graph.DexType boxedIntType -> e2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advancePCs -> h
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> e3
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> E3
-    com.android.tools.r8.graph.DexString unknownTypeName -> m4
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> E3
     com.android.tools.r8.graph.DexString constructorMethodName -> K1
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> r3
     com.android.tools.r8.graph.DexString internMethodName -> k0
     com.android.tools.r8.graph.DexString classArrayDescriptor -> S0
     com.android.tools.r8.graph.DexString supplierDescriptor -> t1
-    com.android.tools.r8.graph.DexType optionalType -> U2
-    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> o3
-    com.android.tools.r8.graph.DexType setType -> M2
+    java.util.concurrent.ConcurrentHashMap protos -> d
+    com.android.tools.r8.graph.DexType throwableType -> U2
+    com.android.tools.r8.graph.DexType mapEntryType -> M2
     com.android.tools.r8.graph.DexString unboxCharMethodName -> N
-    com.android.tools.r8.graph.DexMethod stringConcatMethod -> d4
     com.android.tools.r8.graph.DexString strictMathDescriptor -> c1
     com.android.tools.r8.graph.DexString getMethodName -> B0
-    com.android.tools.r8.graph.DexType stringBuilderType -> C2
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> y3
-    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> d3
+    com.android.tools.r8.graph.DexType varHandleType -> C2
     com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> k1
     com.android.tools.r8.graph.DexString charSequenceDescriptor -> J0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap restartLocals -> k
-    java.util.Map strings -> a
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> l3
     com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> s0
     com.android.tools.r8.graph.DexType charType -> S1
     com.android.tools.r8.graph.DexType iterableType -> t2
-    com.android.tools.r8.graph.DexType enumerationType -> T3
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> h4
+    java.util.concurrent.ConcurrentHashMap fields -> c
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> r3
+    com.android.tools.r8.graph.DexType externalizableType -> T3
+    java.util.Set libraryClassesWithoutStaticInitialization -> h4
     com.android.tools.r8.graph.DexType stringArrayType -> l2
     com.android.tools.r8.graph.DexString unboxShortMethodName -> O
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> L3
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> L3
     com.android.tools.r8.graph.DexString unboxIntMethodName -> P
     com.android.tools.r8.graph.DexString indexOfMethodName -> b0
     com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> B1
     com.android.tools.r8.graph.DexType boxedFloatType -> d2
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> D3
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> f3
+    com.android.tools.r8.graph.DexType annotationSignature -> D3
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> o3
     com.android.tools.r8.graph.DexString toStringMethodName -> j0
     com.android.tools.r8.graph.DexString newUpdaterName -> J1
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap endLocals -> j
     com.android.tools.r8.graph.DexString autoCloseableDescriptor -> R0
     com.android.tools.r8.graph.DexString callableDescriptor -> s1
-    java.util.Map types -> b
-    com.android.tools.r8.graph.DexType runnableType -> T2
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> t3
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> T2
+    java.util.concurrent.ConcurrentHashMap types -> b
     com.android.tools.r8.graph.DexString collectionsDescriptor -> Z0
-    com.android.tools.r8.graph.DexType listType -> L2
-    boolean $assertionsDisabled -> o4
-    java.util.IdentityHashMap internalSentinels -> n4
-    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> c4
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> g3
-    java.util.Map libraryMethodsWithoutSideEffects -> g4
+    com.android.tools.r8.graph.DexType mapType -> L2
     com.android.tools.r8.graph.DexString assertionsDisabled -> E0
     com.android.tools.r8.graph.DexString varHandleDescriptor -> f1
-    com.android.tools.r8.graph.DexType autoCloseableType -> B2
-    com.android.tools.r8.graph.DexType npeType -> c3
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> p3
+    com.android.tools.r8.graph.DexType stringBufferType -> B2
     com.android.tools.r8.graph.DexString equalsMethodName -> Y
     com.android.tools.r8.graph.DexString longDescriptor -> z
     com.android.tools.r8.graph.DexString stringArrayDescriptor -> M0
     com.android.tools.r8.graph.DexString setDescriptor -> n1
     com.android.tools.r8.graph.DexType boxedBooleanType -> Z1
     com.android.tools.r8.graph.DexString getCanonicalNameName -> v0
-    com.android.tools.r8.graph.DexType listIteratorType -> S3
+    com.android.tools.r8.graph.DexType serializableType -> S3
     com.android.tools.r8.graph.DexType byteType -> R1
     com.android.tools.r8.graph.DexType collectionsType -> s2
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> I
-    com.android.tools.r8.graph.DexType nullValueType -> l4
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> K3
+    java.util.Set libraryMethodsReturningReceiver -> c4
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> K3
     com.android.tools.r8.graph.DexType stringType -> k2
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> k3
     com.android.tools.r8.graph.DexString npeDescriptor -> E1
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> r
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> e0
-    com.android.tools.r8.graph.DexType annotationInnerClass -> C3
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> C3
     com.android.tools.r8.graph.DexType boxedDoubleType -> c2
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
     com.android.tools.r8.graph.DexString thisName -> M1
     com.android.tools.r8.graph.DexString wrapperFieldName -> m0
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> p3
     com.android.tools.r8.graph.DexString fieldDescriptor -> U0
     com.android.tools.r8.graph.DexString runnableDescriptor -> v1
-    com.android.tools.r8.graph.DexType consumerType -> S2
+    com.android.tools.r8.graph.DexType optionalType -> S2
+    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> m3
     com.android.tools.r8.graph.DexString boxedShortDescriptor -> J
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> K2
+    com.android.tools.r8.graph.DexType setType -> K2
+    boolean skipNameValidationForTesting -> i4
     com.android.tools.r8.graph.DexString stringBufferDescriptor -> e1
-    com.android.tools.r8.graph.DexType proxyType -> I2
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> I2
     com.android.tools.r8.graph.DexString newInstanceName -> D0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advanceLines -> g
-    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> b3
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> n3
+    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> b3
     com.android.tools.r8.graph.DexString stringDescriptor -> L0
     com.android.tools.r8.graph.DexString listDescriptor -> m1
-    com.android.tools.r8.graph.DexType methodType -> A2
+    com.android.tools.r8.graph.DexType stringBuilderType -> A2
     com.android.tools.r8.graph.DexType voidType -> Y1
-    com.android.tools.r8.graph.DexType fieldType -> z2
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> u3
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> X3
+    com.android.tools.r8.graph.DexType autoCloseableType -> z2
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> Z3
     com.android.tools.r8.graph.DexString getNameName -> u0
-    java.util.Set libraryClassesWithoutStaticInitialization -> j4
     com.android.tools.r8.graph.DexType booleanType -> Q1
     com.android.tools.r8.graph.DexType objectsType -> r2
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> t3
-    com.android.tools.r8.graph.DexType iteratorType -> R3
+    com.android.tools.r8.graph.DexType enumerationType -> R3
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> K
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> j3
     com.android.tools.r8.graph.DexType charSequenceArrayType -> j2
     com.android.tools.r8.graph.DexString compareToMethodName -> d0
     com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> D1
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> J3
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> J3
     java.util.Map setFiles -> n
     com.android.tools.r8.graph.DexType boxedCharType -> b2
     com.android.tools.r8.graph.DexString convertMethodName -> l0
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> B3
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> B3
     com.android.tools.r8.graph.DexString classConstructorMethodName -> L1
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> Z2
+    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> Z2
+    java.util.concurrent.ConcurrentHashMap methodHandles -> f
     com.android.tools.r8.graph.DexString constructorDescriptor -> T0
     com.android.tools.r8.graph.DexString consumerDescriptor -> u1
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> v3
-    com.android.tools.r8.graph.DexType supplierType -> R2
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> w3
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> v3
+    com.android.tools.r8.graph.DexType runnableType -> R2
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> f3
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> w3
     com.android.tools.r8.graph.DexString unboxBooleanMethodName -> L
-    com.android.tools.r8.graph.DexType serviceLoaderType -> J2
-    com.android.tools.r8.graph.DexType invocationHandlerType -> H2
+    com.android.tools.r8.graph.DexType listType -> J2
+    com.android.tools.r8.graph.DexType serviceLoaderType -> H2
     com.android.tools.r8.graph.DexString lengthMethodName -> U
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> n3
     com.android.tools.r8.graph.DexString charDescriptor -> v
     com.android.tools.r8.graph.DexString invokeExactMethodName -> G0
     com.android.tools.r8.graph.DexString methodTypeDescriptor -> h1
-    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> a3
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> e3
+    com.android.tools.r8.graph.DexType npeType -> a3
     com.android.tools.r8.graph.DexString objectArrayDescriptor -> O0
     com.android.tools.r8.graph.DexString mapEntryDescriptor -> p1
     com.android.tools.r8.graph.DexType shortType -> X1
     com.android.tools.r8.graph.DexType classLoaderType -> y2
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> E
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> X3
     com.android.tools.r8.graph.DexString getTypeNameName -> x0
-    com.android.tools.r8.graph.DexType lookupType -> Q3
+    com.android.tools.r8.graph.DexType listIteratorType -> Q3
     com.android.tools.r8.graph.DexType annotationType -> q2
-    java.util.Set libraryMethodsReturningReceiver -> e4
+    com.android.tools.r8.graph.DexType nullValueType -> j4
     com.android.tools.r8.graph.DexType charSequenceType -> i2
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> I3
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> I3
     com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> G1
     com.android.tools.r8.graph.DexString containsMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
     com.android.tools.r8.graph.DexString substringName -> g0
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> b4
     com.android.tools.r8.graph.DexType boxedByteType -> a2
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> A3
+    com.android.tools.r8.graph.DexType annotationInnerClass -> A3
     com.android.tools.r8.graph.DexString getClassMethodName -> o0
-    com.android.tools.r8.graph.DexType icceType -> Y2
-    com.android.tools.r8.graph.DexType annotationDefault -> z3
+    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> Y2
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> z3
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> F
     com.android.tools.r8.graph.DexString enumDescriptor -> W0
     com.android.tools.r8.graph.DexString arraysDescriptor -> x1
-    com.android.tools.r8.graph.DexType callableType -> Q2
-    com.android.tools.r8.graph.DexType methodTypeType -> G2
-    boolean skipNameValidationForTesting -> k4
+    com.android.tools.r8.graph.DexType consumerType -> Q2
+    com.android.tools.r8.graph.DexType proxyType -> G2
     com.android.tools.r8.graph.DexString methodHandleDescriptor -> g1
-    com.android.tools.r8.kotlin.Kotlin kotlin -> s3
     com.android.tools.r8.graph.DexString invokeMethodName -> F0
     com.android.tools.r8.graph.DexString startsWithMethodName -> W
     com.android.tools.r8.graph.DexString floatDescriptor -> x
@@ -18311,206 +18373,202 @@
     boolean sorted -> s
     com.android.tools.r8.graph.DexType longType -> W1
     com.android.tools.r8.graph.DexType classType -> x2
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> V3
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> G
     com.android.tools.r8.graph.DexString getSimpleNameName -> w0
     com.android.tools.r8.graph.DexType charArrayType -> O1
     com.android.tools.r8.graph.DexType enumType -> p2
-    com.android.tools.r8.graph.DexType callSiteType -> P3
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> l3
+    com.android.tools.r8.graph.DexType iteratorType -> P3
+    java.util.Set libraryMethodsReturningNonNull -> d4
     com.android.tools.r8.graph.DexType boxedNumberType -> h2
-    com.android.tools.r8.graph.DexType annotationThrows -> H3
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> H3
     com.android.tools.r8.graph.DexString cloneMethodName -> f0
     com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> F1
     com.android.tools.r8.graph.DexString endsWithMethodName -> X
-    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> i3
     com.android.tools.r8.graph.DexString intDescriptor -> y
     com.android.tools.r8.graph.DexString initMethodName -> n0
     com.android.tools.r8.graph.DexString charArrayDescriptor -> N1
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> X2
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> h3
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> s3
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> X2
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> y3
     com.android.tools.r8.graph.DexString methodDescriptor -> V0
     com.android.tools.r8.graph.DexString optionalDescriptor -> w1
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> x3
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> H
-    com.android.tools.r8.graph.DexType comparatorType -> P2
+    com.android.tools.r8.graph.DexType supplierType -> P2
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> u3
     1:41:void <clinit>():61:101 -> <clinit>
     1:1:void <init>():105:105 -> <init>
-    2:366:void <init>():65:429 -> <init>
-    367:415:void <init>():419:467 -> <init>
-    416:432:void <init>():457:473 -> <init>
-    433:451:void <init>():470:488 -> <init>
-    452:472:void <init>():479:499 -> <init>
-    473:505:void <init>():492:524 -> <init>
-    506:510:void <init>():523:527 -> <init>
-    511:514:void <init>():526:529 -> <init>
-    515:552:void <init>():520:557 -> <init>
-    553:555:void <init>():106:108 -> <init>
-    556:556:void <init>():107:107 -> <init>
+    2:364:void <init>():65:427 -> <init>
+    365:413:void <init>():417:465 -> <init>
+    414:430:void <init>():455:471 -> <init>
+    431:449:void <init>():468:486 -> <init>
+    450:470:void <init>():477:497 -> <init>
+    471:503:void <init>():490:522 -> <init>
+    504:508:void <init>():521:525 -> <init>
+    509:512:void <init>():524:527 -> <init>
+    513:550:void <init>():518:555 -> <init>
+    551:553:void <init>():106:108 -> <init>
+    554:554:void <init>():107:107 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$4(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:com.android.tools.r8.graph.DexType access$1900(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):432:433 -> a
-    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):445:447 -> a
-    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):534:534 -> a
-    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):534:534 -> a
-    10:11:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1176:1177 -> a
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):430:431 -> a
+    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):443:445 -> a
+    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):532:532 -> a
+    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):532:532 -> a
+    10:11:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1156:1157 -> a
     12:12:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    12:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1177 -> a
-    13:14:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1177:1178 -> a
-    15:16:com.android.tools.r8.graph.DexString createString(int,byte[]):1183:1184 -> a
-    17:18:com.android.tools.r8.graph.DexString createString(java.lang.String):1188:1189 -> a
-    19:19:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1225:1225 -> a
-    20:21:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1251:1252 -> a
+    12:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1157 -> a
+    13:14:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1157:1158 -> a
+    15:16:com.android.tools.r8.graph.DexString createString(int,byte[]):1163:1164 -> a
+    17:18:com.android.tools.r8.graph.DexString createString(java.lang.String):1168:1169 -> a
+    19:19:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1205:1205 -> a
+    20:21:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1231:1232 -> a
     22:22:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    22:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1252 -> a
-    23:23:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1252:1252 -> a
-    24:24:com.android.tools.r8.graph.DexType createType(java.lang.String):1243:1243 -> a
-    24:24:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1252 -> a
-    25:27: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):1256:1258 -> a
-    28:28:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1262:1262 -> a
-    29:31: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):1266:1268 -> a
-    32:35:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1272:1275 -> a
-    36:41:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1341:1346 -> a
-    36:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1276 -> a
-    42:42:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1273:1273 -> a
-    43:43:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1280:1280 -> a
-    44:44:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1290:1290 -> a
+    22:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1232 -> a
+    23:23:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1232:1232 -> a
+    24:24:com.android.tools.r8.graph.DexType createType(java.lang.String):1223:1223 -> a
+    24:24:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1232 -> a
+    25:27: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):1236:1238 -> a
+    28:28:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
+    29:31: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):1246:1248 -> a
+    32:35:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1252:1255 -> a
+    36:41:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1321:1326 -> a
+    36:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1256 -> a
+    42:42:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1253:1253 -> a
+    43:43:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1260:1260 -> a
+    44:44:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270:1270 -> a
     45:45:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    45:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1290 -> a
-    46:47:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1290:1291 -> a
+    45:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270 -> a
+    46:47:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270:1271 -> a
     48:48:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    48:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1293 -> a
-    49:51:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1292:1294 -> a
-    52:56:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1307:1311 -> a
-    57:64:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1328:1335 -> a
-    57:64:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1311 -> a
+    48:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1273 -> a
+    49:51:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1272:1274 -> a
+    52:56:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1287:1291 -> a
+    57:64:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1308:1315 -> a
+    57:64:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
     65:74:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.copyWithSparseChanges(java.lang.Class,java.lang.Object[],java.util.Map):25:34 -> a
-    65:74:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1337 -> a
-    65:74:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1311 -> a
-    75:75:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1337:1337 -> a
-    75:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1311 -> a
-    76:82:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1312:1318 -> a
-    83:87:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1317:1321 -> a
-    88:90: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):1350:1352 -> a
-    91:91:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> a
-    92:94:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1363:1365 -> a
-    95:96: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):1374:1375 -> a
-    97:106: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[]):1383:1392 -> a
-    107:109:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1396:1398 -> a
-    110:112:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1434:1436 -> a
-    113:115:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1441:1443 -> a
-    116:116:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1451:1451 -> a
-    117:119:void clearTypeLatticeElementsCache():1455:1457 -> a
-    120:127:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1484:1491 -> a
-    128:156:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1490:1518 -> a
-    157:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1498:1506 -> a
-    166:177:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1505:1516 -> a
-    178:179:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1523:1524 -> a
-    180:181:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1527:1528 -> a
-    182:186:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1535:1539 -> a
-    187:187:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1536:1536 -> a
-    188:194:void sort(com.android.tools.r8.naming.NamingLens):1544:1550 -> a
-    195:195:void forAllTypes(java.util.function.Consumer):1567:1567 -> a
-    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1229:1235 -> b
-    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1234:1236 -> b
+    65:74:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1317 -> a
+    65:74:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
+    75:75:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1317:1317 -> a
+    75:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
+    76:82:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1292:1298 -> a
+    83:87:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1297:1301 -> a
+    88:90: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):1330:1332 -> a
+    91:91:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    92:94:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1343:1345 -> a
+    95:96: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):1354:1355 -> a
+    97:106: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[]):1363:1372 -> a
+    107:109:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1376:1378 -> a
+    110:112:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1414:1416 -> a
+    113:115:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1421:1423 -> a
+    116:116:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1431:1431 -> a
+    117:119:void clearTypeLatticeElementsCache():1435:1437 -> a
+    120:127:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1464:1471 -> a
+    128:156:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1470:1498 -> a
+    157:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1478:1486 -> a
+    166:177:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1485:1496 -> a
+    178:179:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1503:1504 -> a
+    180:181:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1507:1508 -> a
+    182:186:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1515:1519 -> a
+    187:187:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1516:1516 -> a
+    188:194:void sort(com.android.tools.r8.naming.NamingLens):1524:1530 -> a
+    195:195:void forAllTypes(java.util.function.Consumer):1547:1547 -> a
+    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1209:1215 -> b
+    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1214:1216 -> b
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> b
-    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1236 -> b
-    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1236:1237 -> b
-    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1243:1243 -> b
-    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1402:1404 -> b
-    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1426:1426 -> b
-    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1447:1447 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):568:568 -> c
-    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1193:1193 -> c
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1247:1247 -> c
-    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1408:1410 -> c
-    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1430:1430 -> c
-    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1224:1225 -> d
-    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1224:1224 -> d
-    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1414:1416 -> d
-    1:5:java.util.Collection extractMarker():1199:1203 -> e
-    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1420:1422 -> e
-    1:5:java.util.List extractMarkers():1213:1217 -> f
-    1:1:boolean getSkipNameValidationForTesting():564:564 -> g
-    1:10:void resetSortedIndices():1554:1563 -> h
-    1:3:boolean verifyNoCachedTypeLatticeElements():1461:1463 -> i
-    1:12:java.util.Set boxedValueOfMethods():442:453 -> j
-com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.C.B0:
-com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.C.C0:
+    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1216 -> b
+    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1216:1217 -> b
+    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1223:1223 -> b
+    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1382:1384 -> b
+    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1406:1406 -> b
+    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1427:1427 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):566:566 -> c
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1173:1173 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1227:1227 -> c
+    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1388:1390 -> c
+    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1410:1410 -> c
+    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1204:1205 -> d
+    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1204:1204 -> d
+    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1394:1396 -> d
+    1:5:java.util.Collection extractMarker():1179:1183 -> e
+    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1400:1402 -> e
+    1:5:java.util.List extractMarkers():1193:1197 -> f
+    1:1:boolean getSkipNameValidationForTesting():562:562 -> g
+    1:10:void resetSortedIndices():1534:1543 -> h
+    1:3:boolean verifyNoCachedTypeLatticeElements():1441:1443 -> i
+    1:12:java.util.Set boxedValueOfMethods():440:451 -> j
+com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.C.C0:
+com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.C.D0:
     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):618:618 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):622:627 -> <init>
-com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.C.D0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):616:616 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):620:625 -> <init>
+com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.C.E0:
     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):850:850 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):856:875 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):879:879 -> a
-com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.C.E0:
-    com.android.tools.r8.graph.DexMethod newInstance -> m
-    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> l
-    com.android.tools.r8.graph.DexMethod getMethod -> k
-    com.android.tools.r8.graph.DexMethod getDeclaredField -> j
-    com.android.tools.r8.graph.DexMethod getField -> i
-    com.android.tools.r8.graph.DexMethod getDeclaredConstructor -> h
-    com.android.tools.r8.graph.DexMethod getTypeName -> g
-    com.android.tools.r8.graph.DexMethod getSimpleName -> f
-    com.android.tools.r8.graph.DexMethod getCanonicalName -> e
-    com.android.tools.r8.graph.DexMethod getName -> d
-    com.android.tools.r8.graph.DexMethod forName3 -> c
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):830:830 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):836:855 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):859:859 -> a
+com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.C.F0:
+    com.android.tools.r8.graph.DexMethod newInstance -> l
+    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> k
+    com.android.tools.r8.graph.DexMethod getMethod -> j
+    com.android.tools.r8.graph.DexMethod getDeclaredField -> i
+    com.android.tools.r8.graph.DexMethod getField -> h
+    com.android.tools.r8.graph.DexMethod getDeclaredConstructor -> g
+    com.android.tools.r8.graph.DexMethod getTypeName -> f
+    com.android.tools.r8.graph.DexMethod getSimpleName -> e
+    com.android.tools.r8.graph.DexMethod getCanonicalName -> d
+    com.android.tools.r8.graph.DexMethod getName -> c
     com.android.tools.r8.graph.DexMethod forName -> b
     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):661:661 -> <init>
-    2:41:void <init>(com.android.tools.r8.graph.DexItemFactory):679:718 -> <init>
-    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):661:661 -> a
-    2:2:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):722:722 -> a
-    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):726:726 -> b
-    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):730:730 -> c
-com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.C.F0:
+    java.util.Set getMembers -> m
+    java.util.Set getNames -> n
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):659:659 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.DexItemFactory):676:705 -> <init>
+    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):659:659 -> a
+    2:2:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):709:709 -> a
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):713:713 -> b
+com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.C.G0:
     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):734:734 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):738:740 -> <init>
-com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.C.G0:
-    com.android.tools.r8.graph.DexItemFactory this$0 -> f
-    com.android.tools.r8.graph.DexMethod finalize -> e
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):717:717 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):721:723 -> <init>
+com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.C.H0:
     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 <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):748:748 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):758:758 -> <init>
-    3:26:void <init>(com.android.tools.r8.graph.DexItemFactory):755:778 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.C.H0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):731:731 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):738:758 -> <init>
+com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.C.I0:
     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):581:581 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):585:589 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):587:587 -> <init>
-com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.C.I0:
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):571:571 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):575:577 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):576:576 -> <init>
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.C.J0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):579:579 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):583:587 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):585:585 -> <init>
+com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.C.J0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):569:569 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):573:575 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):574:574 -> <init>
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.C.K0:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):786:786 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):790:792 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.C.K0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):766:766 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):770:772 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.C.L0:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):632:632 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):639:646 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.C.L0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):630:630 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):637:644 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.C.M0:
     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):651:651 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):655:657 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):656:656 -> <init>
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.C.M0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):649:649 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):653:655 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):654:654 -> <init>
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.C.N0:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -18518,10 +18576,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):1064:1099 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1107:1117 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):1124:1129 -> a
-com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.C.N0:
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1044:1079 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1087:1097 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1104:1109 -> a
+com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.C.O0:
     com.android.tools.r8.graph.DexField longTYPE -> f
     com.android.tools.r8.graph.DexField intTYPE -> e
     com.android.tools.r8.graph.DexField doubleTYPE -> h
@@ -18531,25 +18589,25 @@
     com.android.tools.r8.graph.DexField booleanTYPE -> a
     com.android.tools.r8.graph.DexField shortTYPE -> d
     com.android.tools.r8.graph.DexField charTYPE -> c
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):806:806 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):818:838 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):842:842 -> a
-com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.C.O0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):786:786 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):798:818 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):822:822 -> a
+com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.C.P0:
     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):1133:1133 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1137:1142 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1139:1139 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.C.P0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1113:1113 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1117:1122 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1119:1119 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.C.Q0:
     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):1146:1146 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1153:1159 -> <init>
-    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1157:1165 -> <init>
-    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1162:1167 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1171:1171 -> a
-com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.C.Q0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1126:1126 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1133:1139 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1137:1145 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1142:1147 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1151:1151 -> a
+com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.C.R0:
     com.android.tools.r8.graph.DexMethod defaultConstructor -> o
     com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
     com.android.tools.r8.graph.DexMethod appendStringBuffer -> m
@@ -18571,20 +18629,20 @@
     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>():956:956 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):956:956 -> <init>
-    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):980:1024 -> <init>
-    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):956:956 -> a
-    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1029:1029 -> a
-    3:7:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1033:1037 -> a
+    1:1:void <clinit>():936:936 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):936:936 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):960:1004 -> <init>
+    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):936:936 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1009:1009 -> a
+    3:7:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1013:1017 -> a
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    8:8:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1037 -> a
-    9:25:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1040:1056 -> a
+    8:8:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1017 -> a
+    9:25:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1020:1036 -> a
     26:26:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    26:26:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1056 -> a
-    27:27:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1059:1059 -> a
-    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):956:956 -> b
-com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.C.R0:
+    26:26:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1036 -> a
+    27:27:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1039:1039 -> a
+    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):936:936 -> b
+com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.C.S0:
     com.android.tools.r8.graph.DexMethod hashCode -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
     com.android.tools.r8.graph.DexMethod compareTo -> m
@@ -18605,26 +18663,26 @@
     com.android.tools.r8.graph.DexMethod intern -> r
     com.android.tools.r8.graph.DexMethod toString -> q
     com.android.tools.r8.graph.DexMethod valueOf -> p
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):883:883 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):908:908 -> <init>
-    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):906:951 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.C.S0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):863:863 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):888:888 -> <init>
+    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):886:931 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.C.T0:
     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):595:595 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):602:604 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):603:606 -> <init>
-    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):605:612 -> <init>
-    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):610:610 -> <init>
-com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.C.U0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):593:593 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):600:602 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):601:604 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):603:610 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):608:608 -> <init>
+com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.C.V0:
     boolean $assertionsDisabled -> s
     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>
     com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> E
-    boolean isLibraryClass() -> U
-    boolean isNotProgramClass() -> Z
+    boolean isLibraryClass() -> S
+    boolean isNotProgramClass() -> X
     1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74:74 -> a
     2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():118:118 -> a
     2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74 -> a
@@ -18640,7 +18698,7 @@
     1:1:java.lang.String toString():87:87 -> toString
     2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():87 -> toString
-com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.C.Y0:
+com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.C.Z0:
     com.android.tools.r8.graph.Descriptor item -> a
     com.android.tools.r8.graph.DexItem annotations -> b
     1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexItem):14:16 -> <init>
@@ -18648,13 +18706,13 @@
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):28:28 -> a
     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.C.V0:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.C.W0:
     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.C.W0:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.C.X0:
     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.C.X0:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.C.Y0:
     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.C.Z0:
+com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.C.a1:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexProto proto -> f
     com.android.tools.r8.graph.DexString name -> g
@@ -18725,7 +18783,7 @@
     2:2:int getArity():39 -> r
     1:1:java.lang.String qualifiedName():161:161 -> s
     1:1:java.lang.String toString():35:35 -> toString
-com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.C.b1:
+com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.C.c1:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> e
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.Descriptor fieldOrMethod -> f
@@ -18751,52 +18809,46 @@
     11:14:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):228:231 -> a
     15:15:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(java.lang.String,java.lang.String,java.lang.String):84:84 -> a
     15:15:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):231 -> a
-    16:16:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):88:88 -> a
-    16:16:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(java.lang.String,java.lang.String,java.lang.String):84 -> a
-    16:16:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):231 -> a
-    17:17:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):232:232 -> a
-    18:18: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
-    18:18:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):232 -> a
-    19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):96:96 -> a
-    19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):92 -> a
-    19:19:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):232 -> a
-    20:20:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):233:233 -> a
-    21:21:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.JarApplicationReader.getMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):109:109 -> a
-    21:21:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):233 -> a
-    22:27:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):266:271 -> a
-    28:30:boolean com.android.tools.r8.graph.DexMethod.collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:54 -> a
-    28:30:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):271 -> a
-    31:31:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273:273 -> a
+    16:16:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):232:232 -> a
+    17:17: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
+    17:17:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):232 -> a
+    18:18:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):233:233 -> a
+    19:19:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.JarApplicationReader.getMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):109:109 -> a
+    19:19:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):233 -> a
+    20:25:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):266:271 -> a
+    26:28:boolean com.android.tools.r8.graph.DexMethod.collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:54 -> a
+    26:28:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):271 -> a
+    29:29:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273:273 -> a
+    30:30:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62:62 -> a
+    30:30:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> a
+    31:31:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> a
+    31:31:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62 -> a
+    31:31:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> a
     32:32:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62:62 -> a
     32:32:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> a
-    33:33:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> a
-    33:33:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62 -> a
-    33:33:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> a
-    34:34:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62:62 -> a
-    34:34:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> a
-    35:35:boolean com.android.tools.r8.graph.DexMethod.collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:52 -> a
-    35:35:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):271 -> a
-    36:36:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):276:276 -> a
-    37:37:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):283:283 -> a
-    38:38:boolean isMethodHandle():297:297 -> a
-    38:38:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):366 -> a
-    39:46:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):367:374 -> a
-    47:47:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    47:47:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):374 -> a
-    48:55:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):374:381 -> a
-    56:56:boolean isFieldHandle():293:293 -> a
-    56:56:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):381 -> a
-    57:64:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):381:388 -> a
-    65:86:int getAsmTag():392:413 -> a
-    65:86:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):388 -> a
-    87:87:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):388:388 -> a
-    88:88:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):316:316 -> a
-    89:89:boolean isFieldHandle():293:293 -> a
-    89:89:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):318 -> a
-    90:92:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):319:321 -> a
-    93:93:boolean isMethodHandle():297:297 -> a
-    93:93:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):321 -> a
-    94:95:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):321:322 -> a
+    33:33:boolean com.android.tools.r8.graph.DexMethod.collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:52 -> a
+    33:33:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):271 -> a
+    34:34:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):276:276 -> a
+    35:35:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):283:283 -> a
+    36:36:boolean isMethodHandle():297:297 -> a
+    36:36:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):366 -> a
+    37:44:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):367:374 -> a
+    45:45:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    45:45:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):374 -> a
+    46:53:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):374:381 -> a
+    54:54:boolean isFieldHandle():293:293 -> a
+    54:54:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):381 -> a
+    55:62:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):381:388 -> a
+    63:84:int getAsmTag():392:413 -> a
+    63:84:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):388 -> a
+    85:85:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):388:388 -> a
+    86:86:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):316:316 -> a
+    87:87:boolean isFieldHandle():293:293 -> a
+    87:87:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):318 -> a
+    88:90:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):319:321 -> a
+    91:91:boolean isMethodHandle():297:297 -> a
+    91:91:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):321 -> a
+    92:93:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):321:322 -> a
     1:6:boolean computeEquals(java.lang.Object):243:248 -> b
     1:1:int compareTo(java.lang.Object):15:15 -> compareTo
     2:2:int compareTo(com.android.tools.r8.graph.DexMethodHandle):358:358 -> compareTo
@@ -18823,7 +18875,7 @@
     7:7:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticPut():126:126 -> m
     7:7:boolean isStaticHandle():301 -> m
     1:6:java.lang.String toString():255:260 -> toString
-com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.C.a1:
+com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.C.b1:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_CONSTRUCTOR -> h
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_INSTANCE -> g
@@ -18888,7 +18940,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.C.d1:
+com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.C.e1:
     java.util.Collection synthesizedFrom -> u
     com.android.tools.r8.kotlin.KotlinInfo kotlinInfo -> w
     com.android.tools.r8.graph.DexEncodedArray staticValues -> t
@@ -18903,7 +18955,8 @@
     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,java.util.Collection):92:92 -> <init>
     4:87: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,java.util.Collection):29:112 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():234:234 -> E
-    boolean isNotProgramClass() -> Z
+    boolean isNotProgramClass() -> X
+    boolean isProgramClass() -> Y
     1:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):126:131 -> a
     7:7:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):131 -> a
@@ -18911,7 +18964,7 @@
     11:11:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> a
     11:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):134 -> a
     12:12:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):136:136 -> a
-    13:13:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):70:70 -> a
+    13:13:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> a
     13:13:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):137 -> a
     14:26:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):139:151 -> a
     27:30:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):168:171 -> a
@@ -18921,7 +18974,6 @@
     42:42:com.android.tools.r8.graph.DexField lambda$sortEncodedFields$0(com.android.tools.r8.graph.DexEncodedField):372:372 -> a
     43:66:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):410:433 -> a
     67:67:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):443:443 -> a
-    boolean isProgramClass() -> a0
     1:3:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):157:159 -> b
     4:8:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):177:181 -> b
     9:12:void sortMembers():364:367 -> b
@@ -18974,31 +19026,31 @@
     18:18:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342:342 -> d
     19:21:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):371:373 -> d
     22:24:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):377:379 -> d
+    1:12:void computeStaticValues():291:302 -> d0
+    13:13:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> d0
+    13:13:void computeStaticValues():302 -> d0
+    14:16:void computeStaticValues():308:310 -> d0
     1:1:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):378:378 -> e
-    1:12:void computeStaticValues():291:302 -> f0
-    13:13:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):166:166 -> f0
-    13:13:void computeStaticValues():302 -> f0
-    14:16:void computeStaticValues():308:310 -> f0
+    1:2:int getInitialClassFileVersion():397:398 -> e0
+    1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():331:332 -> f0
     1:1:java.lang.String toSourceString():214:214 -> g
-    1:2:int getInitialClassFileVersion():397:398 -> g0
-    1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():331:332 -> h0
-    1:1:java.util.Collection getSynthesizedFrom():163:163 -> i0
-    1:5:boolean hasAnnotations():255:259 -> j0
-    1:1:boolean hasClassFileVersion():393:393 -> k0
-    1:1:boolean hasMethods():247:247 -> l0
-    1:1:boolean hasMethods():247:247 -> m0
-    1:1:boolean hasMethodsOrFields():251 -> m0
-    2:2:boolean hasFields():243:243 -> m0
-    2:2:boolean hasMethodsOrFields():251 -> m0
-    1:4:boolean hasOnlyInternalizableAnnotations():263:266 -> n0
-    1:4:boolean isSorted():315:318 -> o0
-    1:1:boolean originatesFromClassResource():120:120 -> p0
-    1:1:boolean originatesFromDexResource():116:116 -> q0
+    1:1:java.util.Collection getSynthesizedFrom():163:163 -> g0
+    1:5:boolean hasAnnotations():255:259 -> h0
+    1:1:boolean hasClassFileVersion():393:393 -> i0
+    1:1:boolean hasMethods():247:247 -> j0
+    1:1:boolean hasMethods():247:247 -> k0
+    1:1:boolean hasMethodsOrFields():251 -> k0
+    2:2:boolean hasFields():243:243 -> k0
+    2:2:boolean hasMethodsOrFields():251 -> k0
+    1:4:boolean hasOnlyInternalizableAnnotations():263:266 -> l0
+    1:4:boolean isSorted():315:318 -> m0
+    1:1:boolean originatesFromClassResource():120:120 -> n0
+    1:1:boolean originatesFromDexResource():116:116 -> o0
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> s
     1:1:java.lang.String toString():209:209 -> toString
     2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():209 -> toString
-com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.C.c1:
+com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.C.d1:
     java.util.Iterator iterator -> b
     com.android.tools.r8.graph.DexProgramClass next -> a
     java.lang.Iterable val$types -> c
@@ -19008,7 +19060,7 @@
     1:1:boolean hasNext():452:452 -> hasNext
     1:2:com.android.tools.r8.graph.DexProgramClass next():457:458 -> next
     1:2:java.lang.Object next():444 -> next
-com.android.tools.r8.graph.DexProto -> com.android.tools.r8.C.e1:
+com.android.tools.r8.graph.DexProto -> com.android.tools.r8.C.f1:
     com.android.tools.r8.graph.DexProto SENTINEL -> h
     com.android.tools.r8.graph.DexString shorty -> e
     com.android.tools.r8.graph.DexTypeList parameters -> g
@@ -19048,7 +19100,7 @@
     3:3:int com.android.tools.r8.graph.DexTypeList.hashCode():33:33 -> h
     3:3:int computeHashCode():27 -> h
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.graph.DexReference -> com.android.tools.r8.C.f1:
+com.android.tools.r8.graph.DexReference -> com.android.tools.r8.C.g1:
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:java.util.stream.Stream filterDexReference(java.util.stream.Stream):59:59 -> a
@@ -19062,7 +19114,7 @@
     boolean isDexField() -> o
     boolean isDexMethod() -> p
     boolean isDexType() -> q
-com.android.tools.r8.graph.DexString -> com.android.tools.r8.C.h1:
+com.android.tools.r8.graph.DexString -> com.android.tools.r8.C.i1:
     com.android.tools.r8.graph.DexString[] EMPTY_ARRAY -> g
     boolean $assertionsDisabled -> h
     int size -> e
@@ -19114,7 +19166,7 @@
     16:25:java.lang.String decode():130:139 -> p
     26:30:java.lang.String decode():137:141 -> p
     1:3:java.lang.String toString():92:94 -> toString
-com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.C.g1:
+com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.C.h1:
     com.android.tools.r8.graph.DexString this$0 -> b
     boolean $assertionsDisabled -> c
     int i -> a
@@ -19123,7 +19175,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.C.i1:
+com.android.tools.r8.graph.DexType -> com.android.tools.r8.C.j1:
     java.lang.String toStringCache -> f
     com.android.tools.r8.graph.DexString descriptor -> e
     com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> g
@@ -19204,7 +19256,7 @@
     1:1:boolean isArrayType():228:228 -> x
     1:1:boolean isBooleanType():196:196 -> y
     1:1:boolean isClassType():233:233 -> z
-com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.C.j1:
+com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.C.k1:
     com.android.tools.r8.graph.DexType[] values -> a
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> b
     boolean $assertionsDisabled -> c
@@ -19224,426 +19276,418 @@
     1:1:int size():63:63 -> i
     1:1:com.android.tools.r8.graph.DexTypeList empty():19:19 -> j
     1:8:java.lang.String toString():68:75 -> toString
-com.android.tools.r8.graph.DexValue -> com.android.tools.r8.C.H1:
+com.android.tools.r8.graph.DexValue -> com.android.tools.r8.C.I1:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> b
     com.android.tools.r8.graph.DexValue[] EMPTY_ARRAY -> a
     1:3:void <clinit>():28:30 -> <clinit>
     1:1:void <init>():27:27 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo) -> a
     void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
-    1:22:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):77:98 -> a
-    23:36:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):92:105 -> a
-    37:37:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):116:116 -> a
-    38:58:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):133:153 -> a
-    59:75:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):135:151 -> a
-    76:76:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):145:145 -> a
-    77:83:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):143:149 -> a
-    84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):139:139 -> a
-    85:85:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):137:137 -> a
+    1:22:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):61:82 -> a
+    23:36:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):76:89 -> a
+    37:37:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):100:100 -> a
+    38:58:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):117:137 -> a
+    59:75:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):119:135 -> a
+    76:76:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):129:129 -> a
+    77:83:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):127:133 -> a
+    84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):123:123 -> a
+    85:85:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):121:121 -> a
     java.lang.Object asAsmEncodedObject() -> h
-    com.android.tools.r8.graph.DexValue$DexValueArray asDexValueArray() -> i
-    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> j
-    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> k
-    com.android.tools.r8.graph.DexValue$DexValueType asDexValueType() -> l
-    java.lang.Object getBoxedValue() -> m
-    boolean isDexValueArray() -> n
-    boolean isDexValueType() -> o
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-com.android.tools.r8.graph.DexValue$1 -> com.android.tools.r8.C.k1:
-com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.C.l1:
+    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> i
+    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> j
+    java.lang.Object getBoxedValue() -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+com.android.tools.r8.graph.DexValue$1 -> com.android.tools.r8.C.l1:
+com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.C.m1:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
-    1:1:void <clinit>():792:792 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):797:798 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):725:725 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):792 -> a
-    2:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):818:825 -> a
-    10:10:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):833:833 -> a
-    1:1:boolean equals(java.lang.Object):792:792 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():807:807 -> h
-    1:1:int hashCode():792:792 -> hashCode
-    1:1:java.lang.Object getBoxedValue():792:792 -> m
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():802:802 -> s
-    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():699:699 -> t
-    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> t
-    1:1:java.lang.String toString():792:792 -> toString
-com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.C.m1:
+    1:1:void <clinit>():776:776 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):781:782 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):709:709 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):776 -> a
+    2:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):802:809 -> a
+    10:10:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):817:817 -> a
+    1:1:boolean equals(java.lang.Object):776:776 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():791:791 -> h
+    1:1:int hashCode():776:776 -> hashCode
+    1:1:java.lang.Object getBoxedValue():776:776 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():786:786 -> o
+    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():683:683 -> p
+    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> p
+    1:1:java.lang.String toString():776:776 -> toString
+com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.C.n1:
     com.android.tools.r8.graph.DexEncodedAnnotation value -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):1024:1025 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):988:989 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1036 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1037:1037 -> a
-    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1031:1031 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1000 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1001:1001 -> a
+    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):995:995 -> a
     4:5:void com.android.tools.r8.graph.DexEncodedAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):29:30 -> a
-    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1031 -> a
-    1:3:boolean equals(java.lang.Object):1065:1067 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1047:1047 -> h
-    1:1:int hashCode():1057:1057 -> hashCode
-    1:1:java.lang.Object getBoxedValue():1042:1042 -> m
-    1:1:void sort():1052:1052 -> q
-    1:1:java.lang.String toString():1074:1074 -> toString
-com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.C.n1:
+    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):995 -> a
+    1:3:boolean equals(java.lang.Object):1029:1031 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1011:1011 -> h
+    1:1:int hashCode():1021:1021 -> hashCode
+    1:1:java.lang.Object getBoxedValue():1006:1006 -> k
+    1:1:void sort():1016:1016 -> m
+    1:1:java.lang.String toString():1038:1038 -> toString
+com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.C.o1:
     com.android.tools.r8.graph.DexValue[] values -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):947:948 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):921:922 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):963 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):964:964 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):937 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):938:938 -> a
     3:3:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):964 -> a
-    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):965:966 -> a
-    6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):958:958 -> a
-    1:3:boolean equals(java.lang.Object):997:999 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():977:977 -> h
-    1:1:int hashCode():989:989 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueArray asDexValueArray() -> i
-    1:1:java.lang.Object getBoxedValue():972:972 -> m
-    boolean isDexValueArray() -> n
-    1:2:void sort():982:983 -> q
-    1:1:com.android.tools.r8.graph.DexValue[] getValues():952:952 -> r
-    1:1:java.lang.String toString():1006:1006 -> toString
-com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.C.o1:
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):938 -> a
+    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):939:940 -> a
+    6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):932:932 -> a
+    1:3:boolean equals(java.lang.Object):971:973 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():951:951 -> h
+    1:1:int hashCode():963:963 -> hashCode
+    1:1:java.lang.Object getBoxedValue():946:946 -> k
+    1:2:void sort():956:957 -> m
+    1:1:com.android.tools.r8.graph.DexValue[] getValues():926:926 -> n
+    1:1:java.lang.String toString():980:980 -> toString
+com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.C.p1:
     com.android.tools.r8.graph.DexValue$DexValueBoolean TRUE -> d
     com.android.tools.r8.graph.DexValue$DexValueBoolean FALSE -> e
     com.android.tools.r8.graph.DexValue$DexValueBoolean DEFAULT -> f
     boolean value -> c
-    1:4:void <clinit>():1132:1135 -> <clinit>
-    1:2:void <init>(boolean):1139:1140 -> <init>
+    1:4:void <clinit>():1096:1099 -> <clinit>
+    1:2:void <init>(boolean):1103:1104 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1144:1144 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1158:1158 -> a
-    3:3:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1108:1108 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1122:1122 -> a
+    3:3:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     3:3:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1158 -> a
-    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1187:1187 -> a
-    1:1:boolean equals(java.lang.Object):1176:1176 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1163:1163 -> h
-    1:1:int hashCode():1168:1168 -> hashCode
-    1:1:boolean getValue():1148:1148 -> m
-    1:1:java.lang.Object getBoxedValue():1153 -> m
-    2:2:java.lang.Object getBoxedValue():1153:1153 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1130:1130 -> r
-    1:1:java.lang.String toString():1181:1181 -> toString
-com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.C.p1:
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1122 -> a
+    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1151:1151 -> a
+    1:1:boolean equals(java.lang.Object):1140:1140 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1127:1127 -> h
+    1:1:int hashCode():1132:1132 -> hashCode
+    1:1:boolean getValue():1112:1112 -> k
+    1:1:java.lang.Object getBoxedValue():1117 -> k
+    2:2:java.lang.Object getBoxedValue():1117:1117 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1094:1094 -> n
+    1:1:java.lang.String toString():1145:1145 -> toString
+com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.C.q1:
     byte value -> c
     com.android.tools.r8.graph.DexValue$DexValueByte DEFAULT -> d
-    1:1:void <clinit>():273:273 -> <clinit>
-    1:2:void <init>(byte):277:278 -> <init>
+    1:1:void <clinit>():257:257 -> <clinit>
+    1:2:void <init>(byte):261:262 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):296 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):297:297 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):280 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):281:281 -> a
     3:3:int com.android.tools.r8.dex.DexOutputBuffer.putSignedEncodedValue(long,int):88:88 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):297 -> a
-    4:4:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):282:282 -> a
-    5:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):326:326 -> a
-    1:1:boolean equals(java.lang.Object):315:315 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():302:302 -> h
-    1:1:int hashCode():307:307 -> hashCode
-    1:1:byte getValue():286:286 -> m
-    1:1:java.lang.Object getBoxedValue():291 -> m
-    2:2:java.lang.Object getBoxedValue():291:291 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:java.lang.String toString():320:320 -> toString
-com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.C.q1:
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):281 -> a
+    4:4:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):266:266 -> a
+    5:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):310:310 -> a
+    1:1:boolean equals(java.lang.Object):299:299 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():286:286 -> h
+    1:1:int hashCode():291:291 -> hashCode
+    1:1:byte getValue():270:270 -> k
+    1:1:java.lang.Object getBoxedValue():275 -> k
+    2:2:java.lang.Object getBoxedValue():275:275 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:java.lang.String toString():304:304 -> toString
+com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.C.r1:
     com.android.tools.r8.graph.DexValue$DexValueChar DEFAULT -> d
     char value -> c
-    1:1:void <clinit>():389:389 -> <clinit>
-    1:2:void <init>(char):392:393 -> <init>
+    1:1:void <clinit>():373:373 -> <clinit>
+    1:2:void <init>(char):376:377 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueChar create(char):397:397 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):411:412 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueChar create(char):381:381 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):395:396 -> a
     4:4:int com.android.tools.r8.dex.DexOutputBuffer.putUnsignedEncodedValue(long,int):92:92 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):412 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):396 -> a
     5:5:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):413 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):397 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):414 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):415:415 -> a
-    8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):444:444 -> a
-    1:1:boolean equals(java.lang.Object):433:433 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():420:420 -> h
-    1:1:int hashCode():425:425 -> hashCode
-    1:1:char getValue():401:401 -> m
-    1:1:java.lang.Object getBoxedValue():406 -> m
-    2:2:java.lang.Object getBoxedValue():406:406 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:java.lang.String toString():438:438 -> toString
-com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.C.r1:
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):398 -> a
+    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):399:399 -> a
+    8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):428:428 -> a
+    1:1:boolean equals(java.lang.Object):417:417 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():404:404 -> h
+    1:1:int hashCode():409:409 -> hashCode
+    1:1:char getValue():385:385 -> k
+    1:1:java.lang.Object getBoxedValue():390 -> k
+    2:2:java.lang.Object getBoxedValue():390:390 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:java.lang.String toString():422:422 -> toString
+com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.C.s1:
     com.android.tools.r8.graph.DexValue$DexValueDouble DEFAULT -> d
     double value -> c
-    1:1:void <clinit>():627:627 -> <clinit>
-    1:2:void <init>(double):631:632 -> <init>
+    1:1:void <clinit>():611:611 -> <clinit>
+    1:2:void <init>(double):615:616 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueDouble create(double):636:636 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):650:651 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueDouble create(double):620:620 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):634:635 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):652 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):636 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):653 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):654:654 -> a
-    7:7: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):665:665 -> a
-    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1016:1017 -> a
-    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):665 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1016:1016 -> a
-    10: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):665 -> a
-    1:2:boolean equals(java.lang.Object):678:679 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():659:659 -> h
-    1:1:int hashCode():670:670 -> hashCode
-    1:1:double getValue():640:640 -> m
-    1:1:java.lang.Object getBoxedValue():645 -> m
-    2:2:java.lang.Object getBoxedValue():645:645 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:double getValue():640:640 -> r
-    1:1:java.lang.String toString():684:684 -> toString
-com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.C.s1:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):905:905 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):902:902 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):916:916 -> a
-    1:1:boolean equals(java.lang.Object):902:902 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():902:902 -> h
-    1:1:int hashCode():902:902 -> hashCode
-    1:1:java.lang.Object getBoxedValue():902:902 -> m
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():902:902 -> toString
-com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.C.t1:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):869:869 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):866:866 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):880:880 -> a
-    1:1:boolean equals(java.lang.Object):866:866 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():866:866 -> h
-    1:1:int hashCode():866:866 -> hashCode
-    1:1:java.lang.Object getBoxedValue():866:866 -> m
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():866:866 -> toString
-com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.C.u1:
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):637 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):638:638 -> a
+    7:7: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):649:649 -> a
+    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1012:1013 -> a
+    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):649 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1012:1012 -> a
+    10: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):649 -> a
+    1:2:boolean equals(java.lang.Object):662:663 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():643:643 -> h
+    1:1:int hashCode():654:654 -> hashCode
+    1:1:double getValue():624:624 -> k
+    1:1:java.lang.Object getBoxedValue():629 -> k
+    2:2:java.lang.Object getBoxedValue():629:629 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:double getValue():624:624 -> n
+    1:1:java.lang.String toString():668:668 -> toString
+com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.C.t1:
+    1:1:void <init>(com.android.tools.r8.graph.DexField):879:879 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):876:876 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):890:890 -> a
+    1:1:boolean equals(java.lang.Object):876:876 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():876:876 -> h
+    1:1:int hashCode():876:876 -> hashCode
+    1:1:java.lang.Object getBoxedValue():876:876 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():876:876 -> toString
+com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.C.u1:
+    1:1:void <init>(com.android.tools.r8.graph.DexField):843:843 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):840:840 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):854:854 -> a
+    1:1:boolean equals(java.lang.Object):840:840 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():840:840 -> h
+    1:1:int hashCode():840:840 -> hashCode
+    1:1:java.lang.Object getBoxedValue():840:840 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():840:840 -> toString
+com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.C.v1:
     float value -> c
     com.android.tools.r8.graph.DexValue$DexValueFloat DEFAULT -> d
-    1:1:void <clinit>():564:564 -> <clinit>
-    1:2:void <init>(float):567:568 -> <init>
+    1:1:void <clinit>():548:548 -> <clinit>
+    1:2:void <init>(float):551:552 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueFloat create(float):572:572 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):586:587 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueFloat create(float):556:556 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):570:571 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):588 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):572 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):589 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):590:590 -> a
-    7:7: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):601:601 -> a
-    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1021:1022 -> a
-    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):601 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1021:1021 -> a
-    10: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):601 -> a
-    1:2:boolean equals(java.lang.Object):614:615 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():595:595 -> h
-    1:1:int hashCode():606:606 -> hashCode
-    1:1:float getValue():576:576 -> m
-    1:1:java.lang.Object getBoxedValue():581 -> m
-    2:2:java.lang.Object getBoxedValue():581:581 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:float getValue():576:576 -> r
-    1:1:java.lang.String toString():620:620 -> toString
-com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.C.v1:
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):573 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):574:574 -> a
+    7:7: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):585:585 -> a
+    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1017:1018 -> a
+    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):585 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1017:1017 -> a
+    10: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):585 -> a
+    1:2:boolean equals(java.lang.Object):598:599 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():579:579 -> h
+    1:1:int hashCode():590:590 -> hashCode
+    1:1:float getValue():560:560 -> k
+    1:1:java.lang.Object getBoxedValue():565 -> k
+    2:2:java.lang.Object getBoxedValue():565:565 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:float getValue():560:560 -> n
+    1:1:java.lang.String toString():604:604 -> toString
+com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.C.w1:
     int value -> c
     com.android.tools.r8.graph.DexValue$DexValueInt DEFAULT -> d
-    1:1:void <clinit>():450:450 -> <clinit>
-    1:2:void <init>(int):453:454 -> <init>
+    1:1:void <clinit>():434:434 -> <clinit>
+    1:2:void <init>(int):437:438 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):472:472 -> a
-    2:2: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):501:501 -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):458:458 -> b
-    1:1:boolean equals(java.lang.Object):490:490 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():477:477 -> h
-    1:1:int hashCode():482:482 -> hashCode
-    1:1:int getValue():462:462 -> m
-    1:1:java.lang.Object getBoxedValue():467 -> m
-    2:2:java.lang.Object getBoxedValue():467:467 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:java.lang.String toString():495:495 -> toString
-com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.C.w1:
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):456:456 -> a
+    2:2: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):485:485 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):442:442 -> b
+    1:1:boolean equals(java.lang.Object):474:474 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():461:461 -> h
+    1:1:int hashCode():466:466 -> hashCode
+    1:1:int getValue():446:446 -> k
+    1:1:java.lang.Object getBoxedValue():451 -> k
+    2:2:java.lang.Object getBoxedValue():451:451 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:java.lang.String toString():479:479 -> toString
+com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.C.x1:
     com.android.tools.r8.graph.DexValue$DexValueLong DEFAULT -> d
     long value -> c
-    1:1:void <clinit>():507:507 -> <clinit>
-    1:2:void <init>(long):510:511 -> <init>
+    1:1:void <clinit>():491:491 -> <clinit>
+    1:2:void <init>(long):494:495 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):515:515 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):529:529 -> a
-    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):558:558 -> a
-    4:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1035:1036 -> a
-    4:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):558 -> a
-    6:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1035:1035 -> a
-    6:6:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):558 -> a
-    1:1:boolean equals(java.lang.Object):547:547 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():534:534 -> h
-    1:1:int hashCode():539:539 -> hashCode
-    1:1:long getValue():519:519 -> m
-    1:1:java.lang.Object getBoxedValue():524 -> m
-    2:2:java.lang.Object getBoxedValue():524:524 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:long getValue():519:519 -> r
-    1:1:java.lang.String toString():552:552 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.C.x1:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod):887:887 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):884:884 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):898:898 -> a
-    1:1:boolean equals(java.lang.Object):884:884 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():884:884 -> h
-    1:1:int hashCode():884:884 -> hashCode
-    1:1:java.lang.Object getBoxedValue():884:884 -> m
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():884:884 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.C.y1:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1194:1194 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1191:1191 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1210:1210 -> a
-    1:1:boolean equals(java.lang.Object):1191:1191 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1191:1191 -> h
-    1:1:int hashCode():1191:1191 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> j
-    1:1:java.lang.Object getBoxedValue():1191:1191 -> m
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():1191:1191 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.C.z1:
-    1:1:void <init>(com.android.tools.r8.graph.DexProto):923:923 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):920:920 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):939:939 -> a
-    1:1:boolean equals(java.lang.Object):920:920 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():920:920 -> h
-    1:1:int hashCode():920:920 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> k
-    1:1:java.lang.Object getBoxedValue():920:920 -> m
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():920:920 -> toString
-com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.C.A1:
+    1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):499:499 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):513:513 -> a
+    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542:542 -> a
+    4:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1031:1032 -> a
+    4:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542 -> a
+    6:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1031:1031 -> a
+    6:6:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542 -> a
+    1:1:boolean equals(java.lang.Object):531:531 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():518:518 -> h
+    1:1:int hashCode():523:523 -> hashCode
+    1:1:long getValue():503:503 -> k
+    1:1:java.lang.Object getBoxedValue():508 -> k
+    2:2:java.lang.Object getBoxedValue():508:508 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:long getValue():503:503 -> n
+    1:1:java.lang.String toString():536:536 -> toString
+com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.C.y1:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod):861:861 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):858:858 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):872:872 -> a
+    1:1:boolean equals(java.lang.Object):858:858 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():858:858 -> h
+    1:1:int hashCode():858:858 -> hashCode
+    1:1:java.lang.Object getBoxedValue():858:858 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():858:858 -> toString
+com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.C.z1:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1158:1158 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1155:1155 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1174:1174 -> a
+    1:1:boolean equals(java.lang.Object):1155:1155 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1155:1155 -> h
+    1:1:int hashCode():1155:1155 -> hashCode
+    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> i
+    1:1:java.lang.Object getBoxedValue():1155:1155 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():1155:1155 -> toString
+com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.C.A1:
+    1:1:void <init>(com.android.tools.r8.graph.DexProto):897:897 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):894:894 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):913:913 -> a
+    1:1:boolean equals(java.lang.Object):894:894 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():894:894 -> h
+    1:1:int hashCode():894:894 -> hashCode
+    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> j
+    1:1:java.lang.Object getBoxedValue():894:894 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():894:894 -> toString
+com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.C.B1:
     com.android.tools.r8.graph.DexValue NULL -> c
-    1:1:void <clinit>():1080:1080 -> <clinit>
-    1:1:void <init>():1083:1083 -> <init>
+    1:1:void <clinit>():1044:1044 -> <clinit>
+    1:1:void <init>():1047:1047 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1092 -> a
-    2:3:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1059:1060 -> a
-    2:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1126 -> a
-    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1059:1059 -> a
-    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1126 -> a
-    1:1:boolean equals(java.lang.Object):1115:1115 -> equals
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1056 -> a
+    2:3:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1056 -> a
+    2:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
+    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1055 -> a
+    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
+    1:1:boolean equals(java.lang.Object):1079:1079 -> equals
     java.lang.Object asAsmEncodedObject() -> h
-    java.lang.Object getBoxedValue() -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.C.B1:
+    java.lang.Object getBoxedValue() -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.C.C1:
     com.android.tools.r8.graph.DexValue$DexValueShort DEFAULT -> d
     short value -> c
-    1:1:void <clinit>():332:332 -> <clinit>
-    1:2:void <init>(short):335:336 -> <init>
+    1:1:void <clinit>():316:316 -> <clinit>
+    1:2:void <init>(short):319:320 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):340:340 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):354:354 -> a
-    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):383:383 -> a
-    1:1:boolean equals(java.lang.Object):372:372 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():359:359 -> h
-    1:1:int hashCode():364:364 -> hashCode
-    1:1:short getValue():344:344 -> m
-    1:1:java.lang.Object getBoxedValue():349 -> m
-    2:2:java.lang.Object getBoxedValue():349:349 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:java.lang.String toString():377:377 -> toString
-com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.C.C1:
-    1:1:void <init>(com.android.tools.r8.graph.DexString):759:759 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):725:725 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):756 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):756:756 -> a
-    3:7: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):775:779 -> a
-    1:1:boolean equals(java.lang.Object):756:756 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():764:764 -> h
-    1:1:int hashCode():756:756 -> hashCode
-    1:1:java.lang.Object getBoxedValue():756:756 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():699:699 -> s
-    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> s
-    1:1:java.lang.String toString():756:756 -> toString
-com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.C.D1:
-    1:1:void <init>(com.android.tools.r8.graph.DexType):841:841 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):838:838 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):852:852 -> a
-    1:1:boolean equals(java.lang.Object):838:838 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():838:838 -> h
-    1:1:int hashCode():838:838 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueType asDexValueType() -> l
-    1:1:java.lang.Object getBoxedValue():838:838 -> m
-    boolean isDexValueType() -> o
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():838:838 -> toString
-com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.C.E1:
+    1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):324:324 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):338:338 -> a
+    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):367:367 -> a
+    1:1:boolean equals(java.lang.Object):356:356 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():343:343 -> h
+    1:1:int hashCode():348:348 -> hashCode
+    1:1:short getValue():328:328 -> k
+    1:1:java.lang.Object getBoxedValue():333 -> k
+    2:2:java.lang.Object getBoxedValue():333:333 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:java.lang.String toString():361:361 -> toString
+com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.C.D1:
+    1:1:void <init>(com.android.tools.r8.graph.DexString):743:743 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):709:709 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):740 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):740:740 -> a
+    3:7: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):759:763 -> a
+    1:1:boolean equals(java.lang.Object):740:740 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():748:748 -> h
+    1:1:int hashCode():740:740 -> hashCode
+    1:1:java.lang.Object getBoxedValue():740:740 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():683:683 -> o
+    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> o
+    1:1:java.lang.String toString():740:740 -> toString
+com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.C.E1:
+    1:1:void <init>(com.android.tools.r8.graph.DexType):825:825 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):822:822 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):836:836 -> a
+    1:1:boolean equals(java.lang.Object):822:822 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():822:822 -> h
+    1:1:int hashCode():822:822 -> hashCode
+    1:1:java.lang.Object getBoxedValue():822:822 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():822:822 -> toString
+com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.C.F1:
     com.android.tools.r8.graph.IndexedDexItem value -> c
-    1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):688:688 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):692:693 -> <init>
-    1:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):704:705 -> a
+    1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):672:672 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):676:677 -> <init>
+    1:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):688:689 -> a
     3:3:int com.android.tools.r8.dex.DexOutputBuffer.putUnsignedEncodedValue(long,int):92:92 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):706 -> a
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):690 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):707 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):708:708 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):691 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):692:692 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):708 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):709:709 -> a
-    1:3:boolean equals(java.lang.Object):743:745 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():719:719 -> h
-    1:1:int hashCode():735:735 -> hashCode
-    1:1:java.lang.Object getBoxedValue():714:714 -> m
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():752:752 -> toString
-com.android.tools.r8.graph.DexValue$SimpleDexValue -> com.android.tools.r8.C.F1:
-    1:1:void <init>():242:242 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexValue$1):242:242 -> <init>
-    1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):263:263 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):692 -> a
+    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):693:693 -> a
+    1:3:boolean equals(java.lang.Object):727:729 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():703:703 -> h
+    1:1:int hashCode():719:719 -> hashCode
+    1:1:java.lang.Object getBoxedValue():698:698 -> k
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():736:736 -> toString
+com.android.tools.r8.graph.DexValue$SimpleDexValue -> com.android.tools.r8.C.G1:
+    1:1:void <init>():226:226 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexValue$1):226:226 -> <init>
+    1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):247:247 -> a
     2:2:int com.android.tools.r8.dex.DexOutputBuffer.putSignedEncodedValue(long,int):88:88 -> a
-    2:2:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):264 -> a
+    2:2:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):248 -> a
     3:3:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    3:3:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):265 -> a
-    4:4:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    3:3:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):249 -> a
+    4:4:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     4:4:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):266 -> a
-    5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):267:267 -> a
-com.android.tools.r8.graph.DexValue$UnknownDexValue -> com.android.tools.r8.C.G1:
+    4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):250 -> a
+    5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):251:251 -> a
+com.android.tools.r8.graph.DexValue$UnknownDexValue -> com.android.tools.r8.C.H1:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> c
-    1:1:void <clinit>():184:184 -> <clinit>
-    1:1:void <init>():186:186 -> <init>
+    1:1:void <clinit>():168:168 -> <clinit>
+    1:1:void <init>():170:170 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):192:192 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):207:207 -> a
-    1:1:java.lang.Object asAsmEncodedObject():217:217 -> h
-    1:1:int hashCode():222:222 -> hashCode
-    1:1:java.lang.Object getBoxedValue():212:212 -> m
-    boolean mayHaveSideEffects() -> p
-    1:1:void sort():197:197 -> q
-com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.C.K1:
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):176:176 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):191:191 -> a
+    1:1:java.lang.Object asAsmEncodedObject():201:201 -> h
+    1:1:int hashCode():206:206 -> hashCode
+    1:1:java.lang.Object getBoxedValue():196:196 -> k
+    boolean mayHaveSideEffects() -> l
+    1:1:void sort():181:181 -> m
+com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.C.L1:
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> n
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> m
     boolean $assertionsDisabled -> o
@@ -19674,8 +19718,8 @@
     1:1:java.util.Collection allClasses():63:63 -> h
     1:1:java.util.Collection libraryClasses():72:72 -> i
     1:12:boolean verifyCodeObjectsOwners():144:155 -> j
-com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.C.I1:
-com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.C.J1:
+com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.C.J1:
+com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.C.K1:
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> m
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> l
     1:1:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DirectMappedDexApplication$1):161:161 -> <init>
@@ -19683,7 +19727,7 @@
     8:10:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication):176:178 -> <init>
     1:16:com.android.tools.r8.graph.DexApplication build():190:205 -> a
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.C.L1:
+com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.C.M1:
     com.android.tools.r8.graph.DexType enclosingClass -> a
     com.android.tools.r8.graph.DexMethod enclosingMethod -> b
     boolean $assertionsDisabled -> c
@@ -19706,7 +19750,7 @@
     3:3:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> toString
     3:3:java.lang.String toString():79 -> toString
     4:6:java.lang.String toString():79:81 -> toString
-com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.C.M1:
+com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.C.N1:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):44:44 -> <init>
@@ -19728,9 +19772,9 @@
     3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):59 -> g
     1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> z
     1:1:int getAsCfAccessFlags():72 -> z
-com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.C.N1:
-com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.C.O1:
-com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.C.P1:
+com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.C.O1:
+com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.C.P1:
+com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.C.Q1:
     java.util.Map infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -19745,7 +19789,7 @@
     9:10:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl rewrittenWithLens(com.android.tools.r8.graph.GraphLense):40:41 -> a
     11:11:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):43:43 -> a
     12:12:boolean verifyMappingIsOneToOne():50:50 -> a
-com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.C.Q1:
+com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.C.R1:
     java.util.Map readsWithContexts -> b
     java.util.Map writesWithContexts -> c
     com.android.tools.r8.graph.FieldAccessInfoImpl MISSING_FIELD_ACCESS_INFO -> d
@@ -19779,7 +19823,7 @@
     2:2:java.util.Set lambda$recordWrite$8(com.android.tools.r8.graph.DexField):180:180 -> e
     1:1:java.util.Set lambda$rewrittenWithLens$11(com.android.tools.r8.graph.DexField):209:209 -> f
     1:1:java.util.Set lambda$rewrittenWithLens$9(com.android.tools.r8.graph.DexField):200:200 -> g
-com.android.tools.r8.graph.GraphLense -> com.android.tools.r8.C.a2:
+com.android.tools.r8.graph.GraphLense -> com.android.tools.r8.C.b2:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():50:50 -> <clinit>
     1:1:void <init>():50:50 -> <init>
@@ -19836,8 +19880,8 @@
     3:3:com.android.tools.r8.graph.GraphLense getIdentityLense():497:497 -> d
     1:6:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):451:456 -> e
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.graph.GraphLense$1 -> com.android.tools.r8.C.R1:
-com.android.tools.r8.graph.GraphLense$Builder -> com.android.tools.r8.C.S1:
+com.android.tools.r8.graph.GraphLense$1 -> com.android.tools.r8.C.S1:
+com.android.tools.r8.graph.GraphLense$Builder -> com.android.tools.r8.C.T1:
     java.util.Map typeMap -> a
     java.util.Map methodMap -> b
     java.util.Map fieldMap -> c
@@ -19850,13 +19894,13 @@
     1:1:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):362:362 -> b
     1:1:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):376 -> b
     2:2:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):377:377 -> b
-com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> com.android.tools.r8.C.T1:
+com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> com.android.tools.r8.C.U1:
     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):62:64 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getMethod():68:68 -> a
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():72:72 -> b
-com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> com.android.tools.r8.C.U1:
+com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> com.android.tools.r8.C.V1:
     com.android.tools.r8.graph.GraphLense$IdentityGraphLense INSTANCE -> b
     1:1:void <clinit>():772:772 -> <clinit>
     1:1:void <init>():774:774 -> <init>
@@ -19872,7 +19916,7 @@
     1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense getInstance():777:777 -> e
     1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense access$100():770 -> e
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):817:817 -> f
-com.android.tools.r8.graph.GraphLense$NestedGraphLense -> com.android.tools.r8.C.V1:
+com.android.tools.r8.graph.GraphLense$NestedGraphLense -> com.android.tools.r8.C.W1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     java.util.Map typeMap -> d
     boolean $assertionsDisabled -> j
@@ -19910,7 +19954,7 @@
     1:3:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):1015:1017 -> e
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):962:962 -> f
     1:17:java.lang.String toString():1040:1056 -> toString
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription -> com.android.tools.r8.C.Z1:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription -> com.android.tools.r8.C.a2:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none -> d
     boolean hasBeenChangedToReturnVoid -> a
@@ -19933,7 +19977,7 @@
     1:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription withConstantReturn():322:323 -> e
     1:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription withExtraNullParameter():333:334 -> f
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none():257:257 -> g
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.C.X1:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.C.Y1:
     com.android.tools.r8.graph.DexType type -> c
     boolean isAlwaysNull -> b
     int argumentIndex -> a
@@ -19944,7 +19988,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():127:127 -> b
     1:1:boolean isAlwaysNull():131:131 -> c
     1:1:boolean isNeverUsed():135:135 -> d
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.C.W1:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.C.X1:
     com.android.tools.r8.graph.DexType type -> c
     boolean isAlwaysNull -> b
     boolean $assertionsDisabled -> d
@@ -19955,7 +19999,7 @@
     2:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):97:97 -> a
     3:5:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo build():102:104 -> a
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setIsAlwaysNull():92:92 -> b
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo -> com.android.tools.r8.C.Y1:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo -> com.android.tools.r8.C.Z1:
     java.util.List removedArguments -> a
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty -> b
     boolean $assertionsDisabled -> c
@@ -19971,7 +20015,7 @@
     1:3:java.util.ListIterator iterator():174:176 -> b
     1:1:int numberOfRemovedArguments():195:195 -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty():170:170 -> d
-com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.C.b2:
+com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.C.c2:
     int sortedIndex -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
@@ -19983,7 +20027,7 @@
     1:4:int sortedCompareTo(int):45:48 -> c
     1:1:int getSortedIndex():40:40 -> i
     1:1:void resetSortedIndex():58:58 -> j
-com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.C.c2:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.C.d2:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType outer -> c
@@ -20022,7 +20066,7 @@
     5:5:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> toString
     5:5:java.lang.String toString():110 -> toString
     6:7:java.lang.String toString():110:111 -> toString
-com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.C.d2:
+com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.C.e2:
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
     java.util.concurrent.ConcurrentHashMap asmTypeCache -> c
@@ -20070,7 +20114,7 @@
     1:4:java.lang.String getShortyDescriptor(java.lang.String):130:133 -> h
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmObjectType$0(java.lang.String):32:32 -> i
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmType$1(java.lang.String):36:36 -> j
-com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.C.j2:
+com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.C.k2:
     com.android.tools.r8.dex.ClassesChecksum checksums -> c
     java.util.function.Consumer classConsumer -> b
     boolean $assertionsDisabled -> e
@@ -20121,7 +20165,7 @@
     7:8:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):184:185 -> b
     9:15:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):184:190 -> b
     1:1:com.android.tools.r8.graph.FieldAccessFlags createFieldAccessFlags(int):149:149 -> c
-com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.C.e2:
+com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.C.f2:
     java.util.List values -> d
     java.util.List names -> c
     boolean $assertionsDisabled -> e
@@ -20131,26 +20175,23 @@
     1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):883:883 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):878:885 -> <init>
     1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):895:896 -> a
-    3:3:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):88:88 -> a
-    3:3:void visitEnum(java.lang.String,java.lang.String,java.lang.String):896 -> a
-    4:4:void visitEnum(java.lang.String,java.lang.String,java.lang.String):896:896 -> a
-    5:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):901:901 -> a
-    6:7:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):902:903 -> a
-    8:8:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):902:902 -> a
-    9:9:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):908:908 -> a
-    10:11:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):909:910 -> a
-    12:12:void visitEnd():916:916 -> a
-    13:18:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):921:926 -> a
-    19:40:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):992:1013 -> a
-    19:40:void visit(java.lang.String,java.lang.Object):890 -> a
-    41:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):930:985 -> a
-    41:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1015 -> a
-    41:96:void visit(java.lang.String,java.lang.Object):890 -> a
-    97:97:void visit(java.lang.String,java.lang.Object):890:890 -> a
-    98:98:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):987:987 -> a
-    98:98:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1015 -> a
-    98:98:void visit(java.lang.String,java.lang.Object):890 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.C.f2:
+    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):901:901 -> a
+    4:5:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):902:903 -> a
+    6:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):902:902 -> a
+    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):908:908 -> a
+    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):909:910 -> a
+    10:10:void visitEnd():916:916 -> a
+    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):921:926 -> a
+    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):992:1013 -> a
+    17:38:void visit(java.lang.String,java.lang.Object):890 -> a
+    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):930:985 -> a
+    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1015 -> a
+    39:94:void visit(java.lang.String,java.lang.Object):890 -> a
+    95:95:void visit(java.lang.String,java.lang.Object):890:890 -> a
+    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):987:987 -> a
+    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1015 -> a
+    96:96:void visit(java.lang.String,java.lang.Object):890 -> a
+com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.C.g2:
     com.android.tools.r8.graph.ClassKind classKind -> d
     java.util.List annotations -> r
     java.util.Set methodSignatures -> y
@@ -20188,107 +20229,104 @@
     8:22:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):244:258 -> a
     23:23:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):253:253 -> a
     24:29:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):264:269 -> a
-    30:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):96:96 -> a
-    30:30:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):269 -> a
-    31:31:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):269:269 -> a
-    32:34:void visitNestHost(java.lang.String):274:276 -> a
-    35:35:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299:299 -> a
-    36:36:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):287:287 -> a
+    30:32:void visitNestHost(java.lang.String):274:276 -> a
+    33:33:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299:299 -> a
+    34:34:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):287:287 -> a
+    34:34:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299 -> a
+    35:35:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> a
+    35:35:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):288 -> a
+    35:35:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299 -> a
+    36:36:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):288:288 -> a
     36:36:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299 -> a
-    37:37:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> a
-    37:37:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):288 -> a
-    37:37:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299 -> a
-    38:38:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):288:288 -> a
-    38:38:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299 -> a
-    39:39:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299:299 -> a
-    40:40:java.lang.String illegalClassFilePostfix(int):294:294 -> a
-    40:40:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):301 -> a
-    41:41:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):301:301 -> a
-    42:57:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):307:322 -> a
-    58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    58:58:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):322 -> a
-    59:62:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):322:325 -> a
-    63:63:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> a
-    63:63:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):325 -> a
-    64:67:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):326:329 -> a
-    68:68:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328:328 -> a
-    69:69:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    69:69:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    69:69:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328 -> a
-    70:77:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328:335 -> a
-    78:85:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.JarApplicationReader.getTypeListFromNames(java.lang.String[]):62:69 -> a
-    78:85:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335 -> a
-    86:88:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335:337 -> a
-    89:89:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
+    37:37:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299:299 -> a
+    38:38:java.lang.String illegalClassFilePostfix(int):294:294 -> a
+    38:38:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):301 -> a
+    39:39:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):301:301 -> a
+    40:55:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):307:322 -> a
+    56:56:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    56:56:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    56:56:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):322 -> a
+    57:60:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):322:325 -> a
+    61:61:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> a
+    61:61:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):325 -> a
+    62:65:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):326:329 -> a
+    66:66:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328:328 -> a
+    67:67:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    67:67:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    67:67:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328 -> a
+    68:75:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328:335 -> a
+    76:83:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.JarApplicationReader.getTypeListFromNames(java.lang.String[]):62:69 -> a
+    76:83:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335 -> a
+    84:86:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335:337 -> a
+    87:87:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
+    87:87:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):337 -> a
+    88:88:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):337:337 -> a
+    89:89:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):521:521 -> a
     89:89:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):337 -> a
-    90:90:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):337:337 -> a
-    91:91:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):521:521 -> a
-    91:91:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):337 -> a
-    92:92:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.JarApplicationReader.getTypeListFromNames(java.lang.String[]):62:62 -> a
-    92:92:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335 -> a
-    93:95:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):316:318 -> a
+    90:90:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.JarApplicationReader.getTypeListFromNames(java.lang.String[]):62:62 -> a
+    90:90:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335 -> a
+    91:93:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):316:318 -> a
+    94:94:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):317:317 -> a
+    95:95:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    95:95:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    95:95:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):317 -> a
     96:96:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):317:317 -> a
-    97:97:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    97:97:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    97:97:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):317 -> a
-    98:98:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):317:317 -> a
+    97:97:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309:309 -> a
+    98:98:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    98:98:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    98:98:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309 -> a
     99:99:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309:309 -> a
-    100:100:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    100:100:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    100:100:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309 -> a
-    101:101:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309:309 -> a
-    102:107:void visitSource(java.lang.String,java.lang.String):344:349 -> a
-    108:108:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    108:108:void visitSource(java.lang.String,java.lang.String):349 -> a
-    109:112: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):199:202 -> a
-    109:112:void visitSource(java.lang.String,java.lang.String):348 -> a
-    113:113:void visitSource(java.lang.String,java.lang.String):347:347 -> a
-    114:115:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):356:357 -> a
-    116:116:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
-    116:116:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):358 -> a
-    117:119:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):362:364 -> a
-    120:121:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):370:371 -> a
-    122:122:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    100:105:void visitSource(java.lang.String,java.lang.String):344:349 -> a
+    106:106:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
+    106:106:void visitSource(java.lang.String,java.lang.String):349 -> a
+    107:110: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):199:202 -> a
+    107:110:void visitSource(java.lang.String,java.lang.String):348 -> a
+    111:111:void visitSource(java.lang.String,java.lang.String):347:347 -> a
+    112:113:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):356:357 -> a
+    114:114:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
+    114:114:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):358 -> a
+    115:117:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):362:364 -> a
+    118:119:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):370:371 -> a
+    120:120:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    120:120:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):372 -> a
+    121:121:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> a
+    121:121:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):372 -> a
+    122:122:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
     122:122:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):372 -> a
-    123:123:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> a
-    123:123:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):372 -> a
-    124:124:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
-    124:124:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):372 -> a
-    125:126:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:377 -> a
-    127:127:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):382:382 -> a
-    128:129:void visitEnd():399:400 -> a
-    130:130:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    130:130:void visitEnd():401 -> a
-    131:131:void visitEnd():400:400 -> a
-    132:132:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):521:521 -> a
-    132:132:void visitEnd():400 -> a
-    133:133:void checkReachabilitySensitivity():478:478 -> a
+    123:124:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:377 -> a
+    125:125:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):382:382 -> a
+    126:127:void visitEnd():399:400 -> a
+    128:128:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
+    128:128:void visitEnd():401 -> a
+    129:129:void visitEnd():400:400 -> a
+    130:130:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):521:521 -> a
+    130:130:void visitEnd():400 -> a
+    131:131:void checkReachabilitySensitivity():478:478 -> a
+    131:131:void visitEnd():403 -> a
+    132:132:boolean hasReachabilitySensitiveField():495:495 -> a
+    132:132:void checkReachabilitySensitivity():478 -> a
+    132:132:void visitEnd():403 -> a
+    133:133:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
+    133:133:boolean hasReachabilitySensitiveField():495 -> a
+    133:133:void checkReachabilitySensitivity():478 -> a
     133:133:void visitEnd():403 -> a
-    134:134:boolean hasReachabilitySensitiveField():495:495 -> a
-    134:134:void checkReachabilitySensitivity():478 -> a
-    134:134:void visitEnd():403 -> a
-    135:135:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    135:135:boolean hasReachabilitySensitiveField():495 -> a
-    135:135:void checkReachabilitySensitivity():478 -> a
-    135:135:void visitEnd():403 -> a
-    136:146:boolean hasReachabilitySensitiveField():495:505 -> a
-    136:146:void checkReachabilitySensitivity():478 -> a
-    136:146:void visitEnd():403 -> a
-    147:156:void checkReachabilitySensitivity():479:488 -> a
-    147:156:void visitEnd():403 -> a
-    157:174:void visitEnd():404:421 -> a
-    175:175:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    175:175:void visitEnd():422 -> a
-    176:176:void visitEnd():422:422 -> a
-    177:215:void visitEnd():405:443 -> a
-    216:216:void visitEnd():439:439 -> a
-    217:217:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    217:217:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    217:217:void visitEnd():439 -> a
-    218:242:void visitEnd():439:463 -> a
-    243:246:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):514:517 -> a
-    243:246:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):193 -> a
+    134:144:boolean hasReachabilitySensitiveField():495:505 -> a
+    134:144:void checkReachabilitySensitivity():478 -> a
+    134:144:void visitEnd():403 -> a
+    145:154:void checkReachabilitySensitivity():479:488 -> a
+    145:154:void visitEnd():403 -> a
+    155:172:void visitEnd():404:421 -> a
+    173:173:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
+    173:173:void visitEnd():422 -> a
+    174:174:void visitEnd():422:422 -> a
+    175:213:void visitEnd():405:443 -> a
+    214:214:void visitEnd():439:439 -> a
+    215:215:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    215:215:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    215:215:void visitEnd():439 -> a
+    216:240:void visitEnd():439:463 -> a
+    241:244:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):514:517 -> a
+    241:244:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):193 -> a
     1:1:int access$1100(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> b
     2:4:void visitNestMember(java.lang.String):281:283 -> b
     5:5:boolean isInANest():540:540 -> b
@@ -20311,7 +20349,7 @@
     1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> j
     1:1:com.android.tools.r8.graph.ClassKind access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> k
     1:1:com.android.tools.r8.origin.Origin access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> l
-com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.C.g2:
+com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.C.h2:
     com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> b
     java.lang.Object value -> f
     boolean $assertionsDisabled -> h
@@ -20346,7 +20384,7 @@
     57:60:java.util.List getAnnotations():658:661 -> a
     57:60:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):584 -> a
     61:61:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):584:584 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.C.h2:
+com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.C.i2:
     java.util.List parameterFlags -> r
     int annotableParameterCount -> o
     java.util.List parameterNames -> q
@@ -20389,14 +20427,14 @@
     5:5:void visitEnd():798 -> c
     6:8:boolean classRequiresCode():788:790 -> c
     6:8:void visitEnd():798 -> c
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> c
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1055 -> c
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> c
     9:9:boolean classRequiresCode():790 -> c
     9:9:void visitEnd():798 -> c
     10:12:boolean classRequiresCode():790:792 -> c
     10:12:void visitEnd():798 -> c
     13:23:void visitEnd():799:809 -> c
-    24:24:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):56:56 -> c
+    24:24:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> c
     24:24:void visitEnd():809 -> c
     25:29:void visitEnd():811:815 -> c
     30:36:void visitEnd():814:820 -> c
@@ -20426,17 +20464,17 @@
     87:87:void visitEnd():841:841 -> c
     88:96:void visitEnd():839:847 -> c
     1:4:java.util.List getAnnotations():863:866 -> d
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.C.i2:
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.C.j2:
     com.android.tools.r8.graph.DexClass owner -> b
     byte[] classCache -> a
     java.util.List codeList -> c
     1:8:void <init>():1019:1026 -> <init>
-com.android.tools.r8.graph.KeyedDexItem -> com.android.tools.r8.C.k2:
+com.android.tools.r8.graph.KeyedDexItem -> com.android.tools.r8.C.l2:
     1:1:void <init>():6:6 -> <init>
     1:1:boolean equals(java.lang.Object):15:15 -> equals
     1:1:int hashCode():20:20 -> hashCode
     com.android.tools.r8.graph.PresortedComparable getKey() -> p
-com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.C.q2:
+com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.C.r2:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> e
     com.android.tools.r8.graph.JarApplicationReader application -> c
     com.android.tools.r8.graph.CfCode code -> d
@@ -20478,8 +20516,8 @@
     boolean isCfCode() -> m
     1:2:void markReachabilitySensitive():106:107 -> p
     1:1:java.lang.String toString():214:214 -> toString
-com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.C.l2:
-com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.C.m2:
+com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.C.m2:
+com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.C.n2:
     java.util.function.BiFunction codeLocator -> d
     com.android.tools.r8.graph.JarApplicationReader application -> e
     boolean usrJsrInliner -> f
@@ -20491,7 +20529,7 @@
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isNative():142:142 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):265 -> a
     4:11:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):266:273 -> a
-com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.C.n2:
+com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.C.o2:
     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):226:226 -> <init>
@@ -20500,9 +20538,9 @@
     1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):226:226 -> apply
     2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):238:238 -> apply
     2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):226 -> apply
-com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.C.o2:
+com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.C.p2:
     1:1:void <init>(java.lang.String):87:87 -> <init>
-com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.C.p2:
+com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.C.q2:
     java.util.Map canonicalDebugLocalInfo -> q
     java.util.Map labelMap -> r
     int maxStack -> l
@@ -20526,7 +20564,7 @@
     9:11:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):324 -> a
     12:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):325:325 -> a
     13:14:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):386:387 -> a
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     15:15:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):387 -> a
     16:16:void visitInsn(int):553:553 -> a
     17:19:void visitInsn(int):421:423 -> a
@@ -20562,56 +20600,53 @@
     277:277:void visitInsn(int):544:544 -> a
     278:278:void visitInsn(int):541:541 -> a
     279:279:void visitTypeInsn(int,java.lang.String):665:665 -> a
-    280:280:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    280:280:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     280:280:void visitTypeInsn(int,java.lang.String):665 -> a
     281:284:void visitTypeInsn(int,java.lang.String):677:680 -> a
     285:285:void visitTypeInsn(int,java.lang.String):674:674 -> a
     286:286:void visitTypeInsn(int,java.lang.String):671:671 -> a
     287:287:void visitTypeInsn(int,java.lang.String):668:668 -> a
     288:289:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):686:687 -> a
-    290:290:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    290:290:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     290:290:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):687 -> a
-    291:291:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1262:1262 -> a
+    291:291:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
     291:291:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):687 -> a
     292:292:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):690:690 -> a
     293:293:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):695:695 -> a
     294:294: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
     294:294:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):695 -> a
-    295:295:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):96:96 -> a
-    295:295:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):92 -> a
-    295:295:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):695 -> a
-    296:296:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):696:696 -> a
-    297:299:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):701:703 -> a
-    300:330:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):708:738 -> a
-    331:335:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):732:736 -> a
-    336:336:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):728:728 -> a
-    337:337:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):772:772 -> a
-    338:344:void visitLdcInsn(java.lang.Object):777:783 -> a
-    345:345:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    345:345:void visitLdcInsn(java.lang.Object):783 -> a
-    346:363:void visitLdcInsn(java.lang.Object):783:800 -> a
-    364:368:void visitLdcInsn(java.lang.Object):798:802 -> a
-    369:369:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    369:369:void visitLdcInsn(java.lang.Object):802 -> a
-    370:370:void visitLdcInsn(java.lang.Object):802:802 -> a
-    371:371:void visitIincInsn(int,int):808:808 -> a
-    372:377:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):813:818 -> a
-    378:382:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):823:827 -> a
-    383:384:void visitMultiANewArrayInsn(java.lang.String,int):832:833 -> a
-    385:385:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    385:385:void visitMultiANewArrayInsn(java.lang.String,int):833 -> a
-    386:424:void visitMultiANewArrayInsn(java.lang.String,int):833:871 -> a
-    425:425: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):879:879 -> a
-    426:429: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):878:881 -> a
-    430:433: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):887:890 -> a
-    434:434:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    434:434: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):891 -> a
-    435:435: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):892:892 -> a
-    436:442: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):888:894 -> a
-    443:444:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):55:56 -> a
-    443:444:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):894 -> a
-    445:445: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):893:893 -> a
-    446:446:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):898:898 -> a
+    295:295:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):696:696 -> a
+    296:298:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):701:703 -> a
+    299:329:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):708:738 -> a
+    330:334:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):732:736 -> a
+    335:335:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):728:728 -> a
+    336:336:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):772:772 -> a
+    337:343:void visitLdcInsn(java.lang.Object):777:783 -> a
+    344:344:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    344:344:void visitLdcInsn(java.lang.Object):783 -> a
+    345:362:void visitLdcInsn(java.lang.Object):783:800 -> a
+    363:367:void visitLdcInsn(java.lang.Object):798:802 -> a
+    368:368:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    368:368:void visitLdcInsn(java.lang.Object):802 -> a
+    369:369:void visitLdcInsn(java.lang.Object):802:802 -> a
+    370:370:void visitIincInsn(int,int):808:808 -> a
+    371:376:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):813:818 -> a
+    377:381:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):823:827 -> a
+    382:383:void visitMultiANewArrayInsn(java.lang.String,int):832:833 -> a
+    384:384:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    384:384:void visitMultiANewArrayInsn(java.lang.String,int):833 -> a
+    385:423:void visitMultiANewArrayInsn(java.lang.String,int):833:871 -> a
+    424:424: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):879:879 -> a
+    425:428: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):878:881 -> a
+    429:432: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):887:890 -> a
+    433:433:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    433:433: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):891 -> a
+    434:434: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):892:892 -> a
+    435:441: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):888:894 -> a
+    442:443:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):55:56 -> a
+    442:443:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):894 -> a
+    444:444: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):893:893 -> a
+    445:445:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):898:898 -> a
     1:6:void visitCode():304:309 -> b
     7:11:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):351:355 -> b
     12:24:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):367:379 -> b
@@ -20668,7 +20703,7 @@
     4:8:void visitVarInsn(int,int):637:641 -> d
     9:35:void visitVarInsn(int,int):633:659 -> d
     36:36:void visitVarInsn(int,int):652:652 -> d
-com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.C.t2:
+com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.C.u2:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> l
     com.android.tools.r8.utils.ProgramClassCollection programClasses -> j
@@ -20690,8 +20725,8 @@
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication toDirect():253:253 -> g
     1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses loadAllClasses():191:191 -> h
     1:1:java.lang.String toString():258:258 -> toString
-com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.C.r2:
-com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.C.s2:
+com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.C.s2:
+com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.C.t2:
     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
@@ -20705,7 +20740,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getLibraryClasses():166:166 -> b
     boolean lambda$new$2(com.android.tools.r8.graph.DexType) -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getProgramClasses():158:158 -> c
-com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.C.t2$a:
+com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.C.u2$a:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver resolver -> n
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> m
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> l
@@ -20717,7 +20752,7 @@
     3:3:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setLibraryClassCollection(com.android.tools.r8.utils.LibraryClassCollection):226:226 -> a
     4:10:com.android.tools.r8.graph.LazyLoadedDexApplication build():232:238 -> a
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.C.u2:
+com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.C.v2:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):61:61 -> <init>
@@ -20766,21 +20801,21 @@
     5:5:void unsetDeclaredSynchronized():192:192 -> e
     5:5:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):89 -> e
     1:1:com.android.tools.r8.graph.MethodAccessFlags copy():66:66 -> z
-com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.C.v2:
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.C.w2:
     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.C.w2:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.C.x2:
     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.ObjectToOffsetMapping -> com.android.tools.r8.C.y2:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.C.z2:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap types -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap methods -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap fields -> e
@@ -20826,13 +20861,13 @@
     1:1:java.util.Collection getStrings():179:179 -> i
     1:1:java.util.Collection getTypes():167:167 -> j
     1:1:boolean hasJumboStrings():191:191 -> k
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.C.x2:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.C.y2:
     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):103:103 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexApplication):101:105 -> <init>
     1:22:int getDepth(com.android.tools.r8.graph.DexProgramClass):109:130 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.C.z2:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.C.A2:
     com.android.tools.r8.graph.DexProto[] protos -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
@@ -20872,38 +20907,37 @@
     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.C.A2:
+com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.C.B2:
     com.android.tools.r8.graph.ParameterAnnotationsList EMPTY_PARAMETER_ANNOTATIONS_LIST -> c
     com.android.tools.r8.graph.DexAnnotationSet[] values -> a
     int missingParameterAnnotations -> b
     boolean $assertionsDisabled -> d
-    1:3:void <clinit>():38:40 -> <clinit>
-    1:3:void <init>():50:52 -> <init>
-    4:7:void <init>(com.android.tools.r8.graph.DexAnnotationSet[],int):59:62 -> <init>
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):88:88 -> a
-    2:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):94:95 -> a
-    4:12:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):178:186 -> a
-    13:13:com.android.tools.r8.graph.ParameterAnnotationsList empty():47:47 -> a
-    13:13:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):194 -> a
-    14:14:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):196:196 -> a
-    15:17:com.android.tools.r8.graph.ParameterAnnotationsList rewrite(java.util.function.Function):200:202 -> a
-    1:3:void forEachAnnotation(java.util.function.Consumer):104:106 -> b
-    4:8:com.android.tools.r8.graph.DexAnnotationSet get(int):147:151 -> b
-    1:2:boolean isMissing(int):134:135 -> c
-    1:13:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):156:168 -> d
-    1:2:boolean equals(java.lang.Object):79:80 -> equals
-    1:1:int countNonMissing():124:124 -> h
-    1:1:int hashCode():71:71 -> hashCode
-    1:1:boolean isEmpty():99:99 -> i
-    1:1:int size():116:116 -> j
-    1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():47:47 -> k
-com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.C.B2:
+    1:3:void <clinit>():36:38 -> <clinit>
+    1:3:void <init>():48:50 -> <init>
+    4:7:void <init>(com.android.tools.r8.graph.DexAnnotationSet[],int):57:60 -> <init>
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):86:86 -> a
+    2:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):92:93 -> a
+    4:12:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):176:184 -> a
+    13:13:com.android.tools.r8.graph.ParameterAnnotationsList empty():45:45 -> a
+    13:13:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):192 -> a
+    14:14:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):194:194 -> a
+    1:3:void forEachAnnotation(java.util.function.Consumer):102:104 -> b
+    4:8:com.android.tools.r8.graph.DexAnnotationSet get(int):145:149 -> b
+    1:2:boolean isMissing(int):132:133 -> c
+    1:13:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):154:166 -> d
+    1:2:boolean equals(java.lang.Object):77:78 -> equals
+    1:1:int countNonMissing():122:122 -> h
+    1:1:int hashCode():69:69 -> hashCode
+    1:1:boolean isEmpty():97:97 -> i
+    1:1:int size():114:114 -> j
+    1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():45:45 -> k
+com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.C.C2:
     int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens) -> a
     int slowCompareTo(java.lang.Object) -> a
     1:1:boolean isSorted(java.util.List):15:15 -> a
     2:4:boolean isSorted(java.util.List,java.util.function.Function):25:27 -> a
     5:5:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):44:44 -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.C.C2:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.C.D2:
     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>
@@ -20916,76 +20950,76 @@
     16:17:void accept(com.android.tools.r8.graph.DexTypeList):50:51 -> b
     16:17:void accept(com.android.tools.r8.graph.DexClass):60 -> b
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> b
-com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.C.L2:
+com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.C.M2:
     1:1:void <clinit>():14:14 -> <clinit>
     void forEachTarget(java.util.function.Consumer) -> a
     boolean hasSingleTarget() -> a
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
-    1:2:void lambda$lookupVirtualTargets$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):53:54 -> a
-    3:64:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):64:125 -> a
+    1:2:void lambda$lookupVirtualTargets$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):50:51 -> a
+    3:63:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):60:120 -> a
     com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    1:14:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):38:51 -> b
-    15:15:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):111:111 -> b
-    16:16:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> b
-    16:16:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):111 -> b
-    17:17:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):111:111 -> b
-    18:18:boolean com.android.tools.r8.graph.MethodAccessFlags.isBridge():122:122 -> b
-    18:18:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):111 -> b
-    19:19:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):112:112 -> b
+    1:12:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):37:48 -> b
+    13:13:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):107:107 -> b
+    14:14:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> b
+    14:14:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):107 -> b
+    15:15:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):107:107 -> b
+    16:16:boolean com.android.tools.r8.graph.MethodAccessFlags.isBridge():122:122 -> b
+    16:16:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):107 -> b
+    17:17:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):108:108 -> b
     com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve() -> c
-    1:1:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):100:100 -> c
+    1:1:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):96:96 -> c
     2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> c
-    2:2:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):100 -> c
-    3:3:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):101:101 -> c
+    2:2:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):96 -> c
+    3:3:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):97:97 -> c
     boolean isValidVirtualTargetForDynamicDispatch() -> d
     java.util.List asListOfTargets() -> e
-com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.C.D2:
+com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.C.E2:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():38:38 -> <clinit>
-com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.C.E2:
+    1:1:void <clinit>():37:37 -> <clinit>
+com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.C.F2:
     com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult INSTANCE -> a
-    1:1:void <clinit>():228:228 -> <clinit>
-    1:1:void <init>():230:230 -> <init>
+    1:1:void <clinit>():223:223 -> <clinit>
+    1:1:void <init>():225:225 -> <init>
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isValidVirtualTargetForDynamicDispatch() -> d
-com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.C.F2:
+com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.C.G2:
     com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult INSTANCE -> a
-    1:1:void <clinit>():259:259 -> <clinit>
-    1:1:void <init>():261:261 -> <init>
-com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.C.G2:
-    1:1:void <init>():188:188 -> <init>
+    1:1:void <clinit>():254:254 -> <clinit>
+    1:1:void <init>():256:256 -> <init>
+com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.C.H2:
+    1:1:void <init>():183:183 -> <init>
     void forEachTarget(java.util.function.Consumer) -> a
     boolean hasSingleTarget() -> a
     java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> a
     com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
     java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve() -> c
-    1:1:java.util.List asListOfTargets():207:207 -> e
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.C.H2:
-    1:1:void <init>():245:245 -> <init>
+    1:1:java.util.List asListOfTargets():202:202 -> e
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.C.I2:
+    1:1:void <init>():240:240 -> <init>
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isValidVirtualTargetForDynamicDispatch() -> d
-com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.C.I2:
+com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.C.J2:
     com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult INSTANCE -> a
-    1:1:void <clinit>():267:267 -> <clinit>
-    1:1:void <init>():269:269 -> <init>
-com.android.tools.r8.graph.ResolutionResult$MultiResult -> com.android.tools.r8.C.J2:
+    1:1:void <clinit>():262:262 -> <clinit>
+    1:1:void <init>():264:264 -> <init>
+com.android.tools.r8.graph.ResolutionResult$MultiResult -> com.android.tools.r8.C.K2:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList methods -> a
-    1:1:void <clinit>():131:131 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):135:137 -> <init>
+    1:1:void <clinit>():126:126 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):130:132 -> <init>
     boolean hasSingleTarget() -> a
-    1:2:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):142:143 -> a
-    3:3:void forEachTarget(java.util.function.Consumer):184:184 -> a
+    1:2:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):137:138 -> a
+    3:3:void forEachTarget(java.util.function.Consumer):179:179 -> a
     com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():163:163 -> c
-    1:2:boolean isValidVirtualTargetForDynamicDispatch():152:153 -> d
-    1:1:java.util.List asListOfTargets():179:179 -> e
-com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.C.K2:
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():158:158 -> c
+    1:2:boolean isValidVirtualTargetForDynamicDispatch():147:148 -> d
+    1:1:java.util.List asListOfTargets():174:174 -> e
+com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.C.L2:
     com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult INSTANCE -> a
-    1:1:void <clinit>():275:275 -> <clinit>
-    1:1:void <init>():277:277 -> <init>
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.C.M2:
+    1:1:void <clinit>():270:270 -> <clinit>
+    1:1:void <init>():272:272 -> <init>
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.C.N2:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):14:14 -> <init>
     com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
     1:1:void visit(java.lang.Iterable,java.util.function.Consumer):9:9 -> a
@@ -21013,7 +21047,7 @@
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):50:50 -> b
     2:3:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:61 -> b
     2:3:com.android.tools.r8.graph.ClassHierarchyTraversal excludeInterfaces():0 -> b
-com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.C.O2:
+com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.C.P2:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -21044,12 +21078,12 @@
     boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> d
     boolean registerTypeReference(com.android.tools.r8.graph.DexType) -> d
     boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> e
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.C.N2:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.C.O2:
     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>():20:21 -> <clinit>
     1:1:void <init>(java.lang.String,int):19:19 -> <init>
-com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.C.P2.a:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.C.Q2.a:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> b
     java.util.List r8InstructionSequence -> d
     java.util.List javacInstructionSequence -> c
@@ -21068,13 +21102,13 @@
     49:55:boolean hasJavacClinitAssertionCode(com.android.tools.r8.graph.CfCode):98:104 -> a
     49:55:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):36 -> a
     56:56:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):37:37 -> a
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.C.P2.b:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.C.Q2.b:
     1:1:void <init>():13:13 -> <init>
     void done() -> a
     void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.C.P2.e:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.C.Q2.e:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):59:59 -> <init>
@@ -21082,8 +21116,8 @@
     1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):65:81 -> a
     18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):79:79 -> a
     19:19:void done():87:87 -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.C.P2.c:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.C.P2.d:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.C.Q2.c:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.C.Q2.d:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):19:19 -> <init>
@@ -21240,48 +21274,14 @@
     40:40:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):96 -> a
     41:49:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):98:106 -> a
     50:52:boolean isSubtypeOf(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):122:124 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.D.a.k:
-    com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.graph.DexType context -> c
-    com.android.tools.r8.ir.code.IRCode code -> b
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):32:35 -> <init>
-    1:33:boolean valueMayBeMutatedBeforeMethodExit(com.android.tools.r8.ir.code.Value,java.util.Set):216:248 -> a
-    34:34:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    34:34:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):53 -> a
-    35:54:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):54:73 -> a
-    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    55:55:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):73 -> a
-    56:86:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):74:104 -> a
-    87:87:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    87:87:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):104 -> a
-    88:102:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):111:125 -> a
-    103:103:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    103:103:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):104 -> a
-    104:127:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):129:152 -> a
-    128:128:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    128:128:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):73 -> a
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    1:1:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):39 -> b
-    2:5:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):40:43 -> b
-    6:24:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value):156:174 -> b
-    6:24:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):46 -> b
-    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    25:25:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value):174 -> b
-    25:25:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):46 -> b
-    26:46:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value):192:212 -> b
-    26:46:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):46 -> b
-    47:47:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    47:47:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):39 -> b
-com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.D.a.l.a:
+com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.D.a.k.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.D.a.l.b:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.D.a.k.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
@@ -21290,7 +21290,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.D.a.l.c:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.D.a.k.c:
     com.android.tools.r8.ir.code.Value value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -21306,7 +21306,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.D.a.l.d:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.D.a.k.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
@@ -21315,7 +21315,7 @@
     boolean isConst() -> d
     boolean isTop() -> e
     boolean isValueRange() -> f
-com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.D.a.l.e:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.D.a.k.e:
     java.util.Deque flowEdges -> d
     java.util.BitSet visitedBlocks -> g
     java.util.Map mapping -> b
@@ -21331,10 +21331,10 @@
     29:46:void run():53:70 -> a
     47:47:boolean lambda$rewriteCode$0(java.util.Map$Entry):83:83 -> a
     48:64:void lambda$rewriteCode$3(java.util.List,java.util.Map$Entry):86:102 -> a
-    65:65:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    65:65:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     65:65:void lambda$rewriteCode$3(java.util.List,java.util.Map$Entry):102 -> a
     66:66:void lambda$rewriteCode$3(java.util.List,java.util.Map$Entry):104:104 -> a
-    67:67:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    67:67:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     67:67:void lambda$rewriteCode$3(java.util.List,java.util.Map$Entry):104 -> a
     68:74:void lambda$rewriteCode$3(java.util.List,java.util.Map$Entry):105:111 -> a
     75:75:boolean lambda$rewriteCode$1(com.android.tools.r8.ir.code.Instruction):99:99 -> a
@@ -21356,14 +21356,14 @@
     53:110:void addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):178:235 -> b
     53:110:void visitInstruction(com.android.tools.r8.ir.code.Instruction):173 -> b
     111:116:void setExecutableEdge(int,int):241:246 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.D.a.l.f:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.D.a.k.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.D.a.m.a:
+com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.D.a.l.a:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexType context -> b
     boolean $assertionsDisabled -> c
@@ -21388,23 +21388,23 @@
     113:122:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):133:142 -> a
     123:123:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):141:141 -> a
     124:130:boolean definesValueWithNonLocalUsages(com.android.tools.r8.ir.code.Instruction):159:165 -> a
-    131:131:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    131:131:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     131:131:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):178 -> a
-    132:132:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    132:132:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     132:132:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):179 -> a
     133:136:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):183:186 -> a
     137:179:boolean instructionsDefineIdenticalValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):190:232 -> a
     137:179:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):186 -> a
-    180:180:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    180:180:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     180:180:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):179 -> a
-    181:181:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    181:181:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     181:181:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):178 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.ir.code.Instruction):174:174 -> b
     1:1:boolean definesBlockLocalValue(com.android.tools.r8.ir.code.Instruction):155:155 -> c
     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.D.a.n.a:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.D.a.m.a:
     java.util.Deque valuesToTrack -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set trackedValues -> c
@@ -21422,28 +21422,28 @@
     48:70:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):178:200 -> a
     48:70: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
     48:70:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    71:71:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    71:71:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     71:71:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):200 -> a
     71:71: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
     71:71:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
     72:72:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):201:201 -> a
     72:72: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
     72:72:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    73:73:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    73:73:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     73:73:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):200 -> a
     73:73: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
     73:73:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
     74:75:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):204:205 -> a
     74:75: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
     74:75:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     76:76:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):205 -> a
     76:76: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
     76:76:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
     77:77:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):206:206 -> a
     77: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
     77:77:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     78:78:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):205 -> a
     78:78: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
     78:78:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
@@ -21458,9 +21458,9 @@
     104:104:boolean isValueOfInterestOrAlias(com.android.tools.r8.ir.code.Value):212:212 -> a
     1:9:boolean isEscaping(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):55:63 -> b
     10:12:void addToWorklist(com.android.tools.r8.ir.code.Value):170:172 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.D.a.n.b:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.D.a.m.b:
     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) -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.D.a.o.a:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.D.a.n.a:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():20:20 -> <clinit>
@@ -21476,16 +21476,16 @@
     29:48:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     49:54:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):70:75 -> a
     49:54:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
-    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     55:55:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):76 -> a
     55:55:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     56:60:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):77:81 -> a
     56:60:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
-    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     61:61:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):76 -> a
     61:61:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     62:62:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52:52 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.D.a.p.a:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.D.a.o.a:
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():25:25 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
@@ -21495,7 +21495,7 @@
     boolean isBottom() -> d
     boolean isKnownFieldSet() -> e
     boolean isTop() -> f
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.D.a.p.b:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.D.a.o.b:
     java.util.Set fields -> a
     1:2:void <init>():18:19 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.DexEncodedField):22:23 -> <init>
@@ -21508,7 +21508,7 @@
     1:5:boolean equals(java.lang.Object):81:85 -> equals
     1:1:int hashCode():73:73 -> hashCode
     1:1:int size():68:68 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.D.a.p.c:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.D.a.o.c:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -21517,61 +21517,61 @@
     boolean isBottom() -> d
     boolean isKnownFieldSet() -> e
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet getInstance():16:16 -> g
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.D.a.p.d:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.D.a.o.d:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> c
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexEncodedMethod method -> d
     com.android.tools.r8.ir.code.IRCode code -> b
     java.util.Map fieldsMaybeReadBeforeBlockInclusiveCache -> e
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:5: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):46:50 -> <init>
-    1:4:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):55:58 -> a
-    5:47:void computeFieldOptimizationInfo():71:113 -> a
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:5: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):45:49 -> <init>
+    1:4:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):54:57 -> a
+    5:47:void computeFieldOptimizationInfo():70:112 -> a
     48:49:boolean com.android.tools.r8.ir.code.DominatorTree.dominatesAllOf(com.android.tools.r8.ir.code.BasicBlock,java.lang.Iterable):118:119 -> a
-    48:49:void computeFieldOptimizationInfo():113 -> a
-    50:50:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):127:127 -> a
-    50:50:void computeFieldOptimizationInfo():117 -> a
-    51:51:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):153:153 -> a
-    51:51:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):130 -> a
-    51:51:void computeFieldOptimizationInfo():117 -> a
-    52:55:java.util.Map getOrCreateFieldsMaybeReadBeforeBlockInclusive():63:66 -> a
-    52:55:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):163 -> a
-    52:55:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):154 -> a
-    52:55:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):130 -> a
-    52:55:void computeFieldOptimizationInfo():117 -> a
-    56:56:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):163:163 -> a
-    56:56:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):154 -> a
-    56:56:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):130 -> a
-    56:56:void computeFieldOptimizationInfo():117 -> a
-    57:64:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):136:143 -> a
-    57:64:void computeFieldOptimizationInfo():117 -> a
-    65:65:void computeFieldOptimizationInfo():120:120 -> a
-    66:67:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):247:248 -> a
-    66:67:void computeFieldOptimizationInfo():120 -> a
+    48:49:void computeFieldOptimizationInfo():112 -> a
+    50:50:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):126:126 -> a
+    50:50:void computeFieldOptimizationInfo():116 -> a
+    51:51:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):152:152 -> a
+    51:51:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):129 -> a
+    51:51:void computeFieldOptimizationInfo():116 -> a
+    52:55:java.util.Map getOrCreateFieldsMaybeReadBeforeBlockInclusive():62:65 -> a
+    52:55:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):162 -> a
+    52:55:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):153 -> a
+    52:55:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):129 -> a
+    52:55:void computeFieldOptimizationInfo():116 -> a
+    56:56:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):162:162 -> a
+    56:56:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):153 -> a
+    56:56:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):129 -> a
+    56:56:void computeFieldOptimizationInfo():116 -> a
+    57:64:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):135:142 -> a
+    57:64:void computeFieldOptimizationInfo():116 -> a
+    65:65:void computeFieldOptimizationInfo():119:119 -> a
+    66:67:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):246:247 -> a
+    66:67:void computeFieldOptimizationInfo():119 -> a
     68:68:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    68:68:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):248 -> a
-    68:68:void computeFieldOptimizationInfo():120 -> a
-    69:76:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):249:256 -> a
-    69:76:void computeFieldOptimizationInfo():120 -> a
-    77:77:java.util.LinkedList lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField):90:90 -> a
-    78:78:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$1(com.android.tools.r8.ir.code.BasicBlock):178:178 -> a
-    1:70:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():171:240 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.D.a.p.e:
+    68:68:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):247 -> a
+    68:68:void computeFieldOptimizationInfo():119 -> a
+    69:71:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):248:250 -> a
+    69:71:void computeFieldOptimizationInfo():119 -> a
+    72:72:java.util.LinkedList lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField):89:89 -> a
+    73:73:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$1(com.android.tools.r8.ir.code.BasicBlock):177:177 -> a
+    1:70:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():170:239 -> b
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.D.a.o.e:
     boolean isConcreteFieldSet() -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet() -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.D.a.p.f:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.D.a.o.f:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
     boolean isTop() -> f
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet getInstance():16:16 -> g
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.D.a.q.a:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.D.a.p.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.D.a.r.b:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.D.a.q.b:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set removedExtensionFields -> c
@@ -21600,12 +21600,12 @@
     5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> b
     5:5:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):110 -> b
     6:8:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):110:112 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.D.a.r.a:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.D.a.q.a:
     java.util.Set val$remainingProtoExtensionFieldReads -> d
     java.util.function.Predicate val$skip -> c
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker,com.android.tools.r8.graph.DexItemFactory,java.util.function.Predicate,java.util.Set):182:182 -> <init>
     1:2:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):186:187 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.D.a.r.c:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.D.a.q.c:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement objectArrayType -> f
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder encoder -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -21626,7 +21626,7 @@
     17:17:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):136 -> a
     17:17:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     17:17:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     18:18: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):144 -> a
     18:18:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):136 -> a
     18:18:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21644,7 +21644,7 @@
     21:23:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     21:23:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     21:23:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     24:24:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):156 -> a
     24:24:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     24:24:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21653,7 +21653,7 @@
     25:32:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     25:32:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     25:32:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     33:33:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):164 -> a
     33:33:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     33:33:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21662,7 +21662,7 @@
     34:35:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     34:35:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     34:35:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    36:36:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    36:36:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     36:36:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):165 -> a
     36:36:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     36:36:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21671,7 +21671,7 @@
     37:39:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     37:39:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     37:39:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    40:40:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    40:40:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     40:40:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):173 -> a
     40:40:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     40:40:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21680,7 +21680,7 @@
     41:43:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     41:43:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     41:43:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    44:44:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    44:44:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     44:44:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):174 -> a
     44:44:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     44:44:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21707,7 +21707,7 @@
     63:63:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
     64:67:void forEachDynamicMethod(java.util.function.Consumer):85:88 -> a
     68:71:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):194:197 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.D.a.r.d:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.D.a.q.d:
     com.android.tools.r8.graph.DexProto dynamicMethodProto -> i
     com.android.tools.r8.graph.DexProto findLiteExtensionByNumberProto -> j
     com.android.tools.r8.graph.DexMethod rawMessageInfoConstructor -> l
@@ -21731,24 +21731,24 @@
     2:2:boolean isDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod):83 -> a
     3:4:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):87:88 -> a
     1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92:92 -> b
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.D.a.r.e:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.D.a.q.e:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> a
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker generatedExtensionRegistryShrinker -> c
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> e
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker generatedMessageLiteShrinker -> d
     1:14:void <init>(com.android.tools.r8.graph.AppView):19:32 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.D.a.r.f:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.D.a.q.f:
     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
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     4:4:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):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
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     4:4:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):26 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.D.a.r.j:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.D.a.q.j:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> a
     boolean $assertionsDisabled -> c
@@ -21776,7 +21776,7 @@
     121:121:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):89 -> a
     122:122:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):184:184 -> a
     123:123:int invalidInfoFailure():236:236 -> a
-    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     124:124:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):191 -> a
     125:132:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):192:199 -> a
     133:134:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):541:542 -> a
@@ -21785,18 +21785,18 @@
     155:155:boolean com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo.isForFieldName():0:0 -> a
     155:155:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):212 -> a
     156:166:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):222:232 -> a
-    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     167:167:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):191 -> a
     168:176:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):300:308 -> a
-    177:177:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    177:177:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     177:177:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):308 -> a
     178:188:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):309:319 -> a
     189:189:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):312:312 -> a
-    190:190:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    190:190:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     190:190:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):308 -> a
     191:191:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):301:301 -> a
     1:1:com.android.tools.r8.ir.code.Value invalidObjectsFailure():240:240 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.D.a.r.g:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.D.a.q.g:
     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):254:256 -> <init>
@@ -21809,7 +21809,7 @@
     9:9:int nextInt():286:286 -> b
     10:10:int nextInt():275:275 -> b
     11:11:int nextInt():266:266 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.D.a.r.h:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.D.a.q.h:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -21817,36 +21817,36 @@
     1:2:boolean hasNext():325:326 -> a
     3:4:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):358:359 -> a
     3:4:boolean hasNext():327 -> a
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     5:5:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):359 -> a
     5:5:boolean hasNext():327 -> a
     6:6:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):359:359 -> a
     6:6:boolean hasNext():327 -> a
-    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     7:7:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):359 -> a
     7:7:boolean hasNext():327 -> a
     8:11:boolean hasNext():330:333 -> a
     1:7:com.android.tools.r8.ir.code.Value next():340:346 -> b
     1:7:java.lang.Object next():319 -> b
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     8:8:com.android.tools.r8.ir.code.Value next():346 -> b
     8:8:java.lang.Object next():319 -> b
     9:16:com.android.tools.r8.ir.code.Value next():347:354 -> b
     9:16:java.lang.Object next():319 -> b
-    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     17:17:com.android.tools.r8.ir.code.Value next():354 -> b
     17:17:java.lang.Object next():319 -> b
     18:18:com.android.tools.r8.ir.code.Value next():350:350 -> b
     18:18:java.lang.Object next():319 -> b
-    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     19:19:com.android.tools.r8.ir.code.Value next():346 -> b
     19:19:java.lang.Object next():319 -> b
     20:20:com.android.tools.r8.ir.code.Value next():341:341 -> b
     20:20:java.lang.Object next():319 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.D.a.r.i:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.D.a.q.i:
     1:1:void <init>():364:364 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):364:364 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.D.a.r.k:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.D.a.q.k:
     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
@@ -21859,7 +21859,7 @@
     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.D.a.r.l.a:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.D.a.q.l.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>
@@ -21869,18 +21869,18 @@
     2:2:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     2:2:java.lang.String toString():37 -> toString
     3:3:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.D.a.r.l.b:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.D.a.q.l.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
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35:35 -> a
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34 -> a
     3:8:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:41 -> a
     boolean isLiveProtoFieldObject() -> e
     1:1:com.android.tools.r8.graph.DexField getField():28:28 -> h
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.D.a.r.l.c:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.D.a.q.l.c:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> d
@@ -21914,7 +21914,7 @@
     210:223:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):308 -> a
     224:246:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):345:367 -> a
     247:247:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):355:355 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.D.a.r.l.d:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.D.a.q.l.d:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
     boolean $assertionsDisabled -> e
@@ -21944,11 +21944,11 @@
     2:2:boolean hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):119:119 -> d
     1:1:boolean hasAuxData():41:41 -> e
     1:15:java.lang.String toString():189:203 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.D.a.r.l.e:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.D.a.q.l.e:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject asProtoFieldObject() -> b
     boolean isProtoFieldObject() -> f
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.D.a.r.l.f:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.D.a.q.l.f:
     boolean $assertionsDisabled -> e
     boolean isRequired -> b
     boolean needsIsInitializedCheck -> c
@@ -21973,11 +21973,11 @@
     1:1:boolean isValid():111:111 -> k
     1:1:boolean needsIsInitializedCheck():116:116 -> l
     1:8:int serialize():136:143 -> m
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.D.a.r.l.g:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.D.a.q.l.g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> a
     1:3:void <init>():10:12 -> <init>
     1:4:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):15:18 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.D.a.r.l.j:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.D.a.q.l.j:
     java.util.LinkedList oneOfObjects -> d
     java.util.LinkedList fields -> b
     int flags -> a
@@ -21994,8 +21994,8 @@
     1:1:int numberOfHasBitsObjects():216:216 -> h
     1:1:int numberOfOneOfObjects():220:220 -> i
     1:9:java.lang.String toString():225:233 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.D.a.r.l.h:
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.D.a.r.l.i:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.D.a.q.l.h:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.D.a.q.l.i:
     boolean $assertionsDisabled -> e
     java.util.LinkedList oneOfObjects -> d
     java.util.LinkedList fields -> b
@@ -22015,7 +22015,7 @@
     49:86:void removeUnusedSharedData():121:158 -> c
     87:87:void removeUnusedSharedData():157:157 -> c
     88:89:void removeUnusedSharedData():76:77 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.D.a.r.l.k:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.D.a.q.l.k:
     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
@@ -22025,25 +22025,25 @@
     boolean isLiveProtoFieldObject() -> e
     boolean isProtoFieldObject() -> f
     boolean isProtoTypeObject() -> g
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.D.a.r.l.l:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.D.a.q.l.l:
     com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):21:22 -> <init>
     1:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:30 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29 -> a
-    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
     7:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31:31 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.D.a.r.l.m:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.D.a.q.l.m:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26:28 -> a
     4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> 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.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29:29 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.D.a.r.l.n:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.D.a.q.l.n:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean):18:18 -> <init>
@@ -22055,7 +22055,7 @@
     boolean isOneOf() -> h
     boolean isSingular() -> j
     1:1:boolean isValid():47:47 -> k
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.D.a.r.l.o:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.D.a.q.l.o:
     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>
@@ -22063,30 +22063,30 @@
     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.D.a.r.l.p:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.D.a.q.l.p:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):16:17 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26:26 -> a
-    2:2:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1049:1049 -> a
+    2:2:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045:1045 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1049 -> a
+    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045 -> a
     3:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    4:4:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1049 -> 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.TypeLatticeElement):1008:1008 -> a
+    4:4:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    5:5:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1050:1050 -> a
+    5:5:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1046:1046 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> c
     boolean isProtoTypeObject() -> g
     1:1:com.android.tools.r8.graph.DexType getType():21:21 -> h
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.D.a.s.a:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.D.a.r.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.ArrayTypeLatticeElement -> com.android.tools.r8.D.a.t.a:
+    1:3:void <clinit>():22:24 -> <clinit>
+    1:1:void <init>(java.lang.String,int):21:21 -> <init>
+com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement -> com.android.tools.r8.D.a.s.a:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement memberTypeLattice -> r
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> s
     boolean $assertionsDisabled -> t
@@ -22147,14 +22147,14 @@
     7:7:boolean equals(java.lang.Object):124:124 -> equals
     1:1:int hashCode():129:129 -> hashCode
     1:1:java.lang.String toString():109:109 -> toString
-com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement -> com.android.tools.r8.D.a.t.b:
+com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement -> com.android.tools.r8.D.a.s.b:
     com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement getInstance():11:11 -> A
     boolean isBoolean() -> f
     1:1:int hashCode():31:31 -> hashCode
-com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement -> com.android.tools.r8.D.a.t.c:
+com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement -> com.android.tools.r8.D.a.s.c:
     com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement INSTANCE -> o
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -22162,21 +22162,21 @@
     1:1:int hashCode():35:35 -> hashCode
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():11:11 -> x
     1:1:com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement getInstance():15:15 -> z
-com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement -> com.android.tools.r8.D.a.t.d:
+com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement -> com.android.tools.r8.D.a.s.d:
     com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement getInstance():11:11 -> A
     boolean isByte() -> h
     1:1:int hashCode():31:31 -> hashCode
-com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement -> com.android.tools.r8.D.a.t.e:
+com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement -> com.android.tools.r8.D.a.s.e:
     com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement getInstance():11:11 -> A
     1:1:int hashCode():31:31 -> hashCode
     boolean isChar() -> i
-com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement -> com.android.tools.r8.D.a.t.h:
+com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement -> com.android.tools.r8.D.a.s.h:
     com.android.tools.r8.graph.AppView appView -> s
     boolean $assertionsDisabled -> v
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> t
@@ -22242,16 +22242,16 @@
     1:1:int hashCode():131:131 -> hashCode
     boolean isClassType() -> j
     1:11:java.lang.String toString():115:125 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker -> com.android.tools.r8.D.a.t.f:
+com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker -> com.android.tools.r8.D.a.s.f:
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker RIGHT -> b
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker LEFT -> a
     1:2:void <clinit>():213:214 -> <clinit>
     1:1:void <init>(java.lang.String,int):212:212 -> <init>
-com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceWithMarker -> com.android.tools.r8.D.a.t.g:
+com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceWithMarker -> com.android.tools.r8.D.a.s.g:
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$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.ClassTypeLatticeElement$InterfaceMarker):221:223 -> <init>
-com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.D.a.t.i:
+com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.D.a.s.i:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     java.util.function.Function mapping -> b
@@ -22273,35 +22273,35 @@
     51:51:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     51:51:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):71 -> a
     52:52:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):71:71 -> a
-com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement -> com.android.tools.r8.D.a.t.j:
+com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement -> com.android.tools.r8.D.a.s.j:
     com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement getInstance():11:11 -> A
     1:1:int hashCode():26:26 -> hashCode
     boolean isDouble() -> k
-com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement -> com.android.tools.r8.D.a.t.k:
+com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement -> com.android.tools.r8.D.a.s.k:
     com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement getInstance():10:10 -> A
     1:1:int hashCode():25:25 -> hashCode
     boolean isFloat() -> m
-com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement -> com.android.tools.r8.D.a.t.l:
+com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement -> com.android.tools.r8.D.a.s.l:
     com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement getInstance():10:10 -> A
     1:1:int hashCode():25:25 -> hashCode
     boolean isInt() -> n
-com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement -> com.android.tools.r8.D.a.t.m:
+com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement -> com.android.tools.r8.D.a.s.m:
     com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement getInstance():11:11 -> A
     1:1:int hashCode():26:26 -> hashCode
     boolean isLong() -> o
-com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.D.a.t.n:
+com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.D.a.s.n:
     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
@@ -22322,7 +22322,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.Nullability definitelyNull():79:79 -> 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.D.a.t.o:
+com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.D.a.s.o:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement definitelyNotNullVariant -> c
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement definitelyNullVariant -> b
@@ -22334,7 +22334,7 @@
     4:12:void set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):26:34 -> a
     13:21:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement get(com.android.tools.r8.ir.analysis.type.Nullability):39:47 -> a
     22:35:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):53:66 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement -> com.android.tools.r8.D.a.t.p:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement -> com.android.tools.r8.D.a.s.p:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -22348,7 +22348,7 @@
     boolean isPrimitive() -> r
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():19:19 -> x
     1:8:boolean hasDexType():66:73 -> z
-com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement -> com.android.tools.r8.D.a.t.r:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement -> com.android.tools.r8.D.a.s.r:
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> o
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_BOTTOM_INSTANCE -> q
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_INSTANCE -> p
@@ -22369,7 +22369,7 @@
     boolean isReference() -> s
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():69:69 -> x
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asMeetWithNotNull():79:79 -> z
-com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement -> com.android.tools.r8.D.a.t.q:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement -> com.android.tools.r8.D.a.s.q:
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
     1:1:boolean equals(java.lang.Object):50:50 -> equals
@@ -22379,21 +22379,21 @@
     2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():37 -> toString
     3:3:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement -> com.android.tools.r8.D.a.t.s:
+com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement -> com.android.tools.r8.D.a.s.s:
     com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement getInstance():11:11 -> A
     1:1:int hashCode():31:31 -> hashCode
     boolean isShort() -> t
-com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement -> com.android.tools.r8.D.a.t.t:
+com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement -> com.android.tools.r8.D.a.s.t:
     com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement INSTANCE -> p
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement getInstance():17:17 -> A
     1:1:int hashCode():37:37 -> hashCode
     boolean isSinglePrimitive() -> u
-com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement -> com.android.tools.r8.D.a.t.u:
+com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement -> com.android.tools.r8.D.a.s.u:
     com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement INSTANCE -> o
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -22401,7 +22401,7 @@
     boolean isTop() -> v
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():11:11 -> x
     1:1:com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement getInstance():15:15 -> z
-com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.D.a.t.w:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.D.a.s.w:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> c
     boolean $assertionsDisabled -> e
@@ -22433,14 +22433,14 @@
     84:96:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):181:193 -> a
     1:1:boolean verifyValuesUpToDate(java.lang.Iterable):80:80 -> b
     1:1:void widening(java.lang.Iterable):68:68 -> c
-com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.D.a.t.v:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.D.a.s.v:
     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>():30:34 -> <clinit>
     1:1:void <init>(java.lang.String,int):29:29 -> <init>
-com.android.tools.r8.ir.analysis.type.TypeLatticeElement -> com.android.tools.r8.D.a.t.x:
+com.android.tools.r8.ir.analysis.type.TypeLatticeElement -> com.android.tools.r8.D.a.s.x:
     com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement FLOAT -> h
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL -> m
@@ -22538,7 +22538,7 @@
     boolean isWidePrimitive() -> w
     com.android.tools.r8.ir.analysis.type.Nullability nullability() -> x
     1:1:int requiredRegisters():338:338 -> y
-com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement -> com.android.tools.r8.D.a.t.y:
+com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement -> com.android.tools.r8.D.a.s.y:
     com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement INSTANCE -> p
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -22548,8 +22548,8 @@
     int requiredRegisters() -> y
 com.android.tools.r8.ir.code.Add -> com.android.tools.r8.D.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>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> H2
     boolean isAdd() -> O0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -22568,7 +22568,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):67:67 -> e
     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
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.D.b.b:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22578,9 +22578,9 @@
     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:int maxInValueRegister():56:56 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():56:56 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.D.b.c:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -22592,9 +22592,9 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):65:65 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():54:54 -> x2
-    1:1:int maxOutValueRegister():59:59 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():54:54 -> w2
+    1:1:int maxOutValueRegister():59:59 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.D.b.d:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():15:15 -> <clinit>
@@ -22609,13 +22609,13 @@
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
     4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:2:int maxInValueRegister():54:55 -> x2
-    1:1:int maxOutValueRegister():60:60 -> y2
-    int opcode() -> z2
+    1:2:int maxInValueRegister():54:55 -> w2
+    1:1:int maxOutValueRegister():60:60 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.And -> com.android.tools.r8.D.b.e:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):19:19 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> H2
     boolean isAnd() -> Q0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -22629,7 +22629,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):64:64 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):69:69 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> d
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.D.b.f:
     boolean $assertionsDisabled -> i
     boolean knownToBeBoolean -> h
@@ -22650,14 +22650,14 @@
     6:6:boolean outTypeKnownToBeBoolean(java.util.Set):114:114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.Argument asArgument() -> d
-    1:1:int maxInValueRegister():52:52 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():52:52 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.D.b.g:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> I2
+    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> H2
     boolean isArithmeticBinop() -> S0
     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
@@ -22684,9 +22684,9 @@
     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():264:264 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> D2
-    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> E2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> C2
+    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isArrayGet() -> T0
@@ -22755,14 +22755,14 @@
     219:219:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):276:276 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.D.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():154:154 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> D2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isArrayLength() -> U0
@@ -22788,19 +22788,19 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:88 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.D.b.j:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():30:30 -> <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):40:44 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():266:266 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> D2
-    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> E2
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> F2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> C2
+    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> D2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> E2
     boolean hasInvariantOutType() -> I0
     1:5:boolean instructionInstanceCanThrow():136:140 -> M0
     boolean instructionTypeCanThrow() -> N0
@@ -22829,154 +22829,157 @@
     111:111:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):271:271 -> a
     112:112:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):271:271 -> a
     1:7:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):150:156 -> b
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     8:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):156 -> b
     9:14:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157:162 -> b
-    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     15:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):162 -> b
     16:20:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):163:167 -> b
-    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     21:21:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):167 -> b
     22:51:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):168:197 -> b
-    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     52:52:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):167 -> b
-    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     53:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):162 -> b
-    54:54:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    54:54:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     54:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):156 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():125:125 -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():125:125 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.D.b.p:
     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:void <clinit>():21:21 -> <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):30:35 -> <init>
+    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> C2
     boolean isIntroducingAnAlias() -> D1
-    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():82:82 -> D2
-    1:1:com.android.tools.r8.ir.code.Instruction origin():90:90 -> E2
-    1:1:com.android.tools.r8.ir.code.Value src():86:86 -> F2
+    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> E2
     boolean hasInvariantOutType() -> I0
     boolean isAssume() -> W0
-    1:1:boolean isAssumeDynamicType():137:137 -> X0
-    1:1:boolean isAssumeNonNull():150:150 -> Y0
+    1:1:boolean isAssumeDynamicType():132:132 -> X0
+    1:1:boolean isAssumeNonNull():145:145 -> Y0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:1: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
-    2:2:com.android.tools.r8.ir.code.Assume createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,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
-    3:3:boolean outTypeKnownToBeBoolean(java.util.Set):95:95 -> a
-    4:22:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):167:185 -> a
-    23:29:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):183:189 -> a
-    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204:204 -> a
-    31:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):209:209 -> a
-    32:36:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):229:233 -> a
+    1:1: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):45:45 -> a
+    2:2:com.android.tools.r8.ir.code.Assume createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,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):55:55 -> a
+    3:3:boolean outTypeKnownToBeBoolean(java.util.Set):90:90 -> a
+    4:22:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):162:180 -> a
+    23:29:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):178:184 -> a
+    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):199:199 -> a
+    31:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):204:204 -> a
+    32:36:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):224:228 -> a
     37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAssume():235:235 -> a
-    37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):239 -> a
-    38:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):244:251 -> a
-    46:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):245:245 -> a
-    47:47:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):256:256 -> a
-    48:48:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):266:266 -> a
-    1:1:com.android.tools.r8.ir.code.Assume createAssumeNoneInstruction(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:41 -> b
-    2:4:boolean verifyTypes(com.android.tools.r8.graph.AppView):276:278 -> b
+    37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):234 -> a
+    38:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):239:246 -> a
+    46:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):240:240 -> a
+    47:47:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):251:251 -> a
+    48:48:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):261:261 -> a
+    1:1:com.android.tools.r8.ir.code.Assume createAssumeNoneInstruction(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):40:40 -> b
+    2:4:boolean verifyTypes(com.android.tools.r8.graph.AppView):271:273 -> b
     5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    5:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):279 -> b
-    6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):279:279 -> b
-    7:7:boolean isAssumeNone():124:124 -> b
-    7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):280 -> b
-    8:8:boolean isAssumeDynamicType():137:137 -> b
-    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):280 -> b
-    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):285:285 -> b
-    10:10:boolean isAssumeNonNull():150:150 -> b
-    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):285 -> b
-    11:14:boolean verifyTypes(com.android.tools.r8.graph.AppView):285:288 -> b
-    15:17:boolean verifyTypes(com.android.tools.r8.graph.AppView):287:289 -> b
-    18:20:boolean verifyTypes(com.android.tools.r8.graph.AppView):281:283 -> b
+    5:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):274 -> b
+    6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):274:274 -> b
+    7:7:boolean isAssumeNone():119:119 -> b
+    7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):275 -> b
+    8:8:boolean isAssumeDynamicType():132:132 -> b
+    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):275 -> b
+    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):280:280 -> b
+    10:10:boolean isAssumeNonNull():145:145 -> b
+    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):280 -> b
+    11:14:boolean verifyTypes(com.android.tools.r8.graph.AppView):280:283 -> b
+    15:17:boolean verifyTypes(com.android.tools.r8.graph.AppView):282:284 -> b
+    18:20:boolean verifyTypes(com.android.tools.r8.graph.AppView):276:278 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    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
+    1:1:boolean isAssumeDynamicType():132:132 -> c
+    1:1:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):65 -> c
+    2:2:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):66:66 -> c
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> c
-    3:3:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):71 -> c
-    4:4:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):71:71 -> c
-    boolean isOutConstant() -> g2
+    3:3:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):66 -> c
+    4:4:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):66:66 -> c
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
-    1:1:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():142:142 -> j
-    2:2:boolean isAssumeDynamicType():137:137 -> j
-    2:2:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():142 -> j
-    3:3:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():142:142 -> j
-    1:1:com.android.tools.r8.ir.code.Assume asAssumeNonNull():155:155 -> k
-    2:2:boolean isAssumeNonNull():150:150 -> k
-    2:2:com.android.tools.r8.ir.code.Assume asAssumeNonNull():155 -> k
-    3:3:com.android.tools.r8.ir.code.Assume asAssumeNonNull():155:155 -> k
-    1:1:java.lang.String toString():302:302 -> toString
-    2:2:boolean isAssumeNone():124:124 -> toString
-    2:2:java.lang.String toString():303 -> toString
-    3:3:boolean isAssumeNonNull():150:150 -> toString
-    3:3:java.lang.String toString():303 -> toString
-    4:4:boolean isAssumeDynamicType():137:137 -> toString
-    4:4:java.lang.String toString():306 -> toString
-    5:5:java.lang.String toString():307:307 -> toString
-    6:6:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():82:82 -> toString
-    6:6:java.lang.String toString():307 -> toString
-    7:16:java.lang.String toString():307:316 -> toString
-    17:17:java.lang.String toString():304:304 -> toString
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():199:199 -> w0
-    1:1:int maxInValueRegister():214:214 -> x2
-    1:1:int maxOutValueRegister():219:219 -> y2
-    1:1:boolean isAssumeNone():124:124 -> z0
-    1:1:java.lang.String getInstructionName():100 -> z0
-    2:2:boolean isAssumeDynamicType():137:137 -> z0
-    2:2:java.lang.String getInstructionName():103 -> z0
-    3:3:boolean isAssumeNonNull():150:150 -> z0
-    3:3:java.lang.String getInstructionName():106 -> z0
-    4:4:java.lang.String getInstructionName():109:109 -> z0
-    int opcode() -> z2
+    1:1:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():137:137 -> j
+    2:2:boolean isAssumeDynamicType():132:132 -> j
+    2:2:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():137 -> j
+    3:3:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():137:137 -> j
+    1:1:com.android.tools.r8.ir.code.Assume asAssumeNonNull():150:150 -> k
+    2:2:boolean isAssumeNonNull():145:145 -> k
+    2:2:com.android.tools.r8.ir.code.Assume asAssumeNonNull():150 -> k
+    3:3:com.android.tools.r8.ir.code.Assume asAssumeNonNull():150:150 -> k
+    1:1:java.lang.String toString():293:293 -> toString
+    2:2:boolean isAssumeNonNull():145:145 -> toString
+    2:2:java.lang.String toString():293 -> toString
+    3:5:java.lang.String toString():293:295 -> toString
+    6:6:boolean isAssumeNone():119:119 -> toString
+    6:6:java.lang.String toString():296 -> toString
+    7:7:boolean isAssumeNonNull():145:145 -> toString
+    7:7:java.lang.String toString():296 -> toString
+    8:8:boolean isAssumeDynamicType():132:132 -> toString
+    8:8:java.lang.String toString():299 -> toString
+    9:9:java.lang.String toString():300:300 -> toString
+    10:10:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> toString
+    10:10:java.lang.String toString():300 -> toString
+    11:17:java.lang.String toString():300:306 -> toString
+    18:18:java.lang.String toString():297:297 -> toString
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():194:194 -> w0
+    1:1:int maxInValueRegister():209:209 -> w2
+    1:1:int maxOutValueRegister():214:214 -> x2
+    int opcode() -> y2
+    1:1:boolean isAssumeNone():119:119 -> z0
+    1:1:java.lang.String getInstructionName():95 -> z0
+    2:2:boolean isAssumeDynamicType():132:132 -> z0
+    2:2:java.lang.String getInstructionName():98 -> z0
+    3:3:boolean isAssumeNonNull():145:145 -> z0
+    3:3:java.lang.String getInstructionName():101 -> z0
+    4:4:java.lang.String getInstructionName():104:104 -> z0
 com.android.tools.r8.ir.code.Assume$1 -> com.android.tools.r8.D.b.k:
 com.android.tools.r8.ir.code.Assume$Assumption -> com.android.tools.r8.D.b.l:
-    1:1:void <init>():319:319 -> <init>
+    1:1:void <init>():309:309 -> <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.D.b.m:
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement dynamicLowerBoundType -> b
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicUpperBoundType -> a
+    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement lowerBoundType -> b
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement type -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():359:359 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.ir.code.Assume$1):359:359 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):365:367 -> <init>
+    1:1:void <clinit>():349:349 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.ir.code.Assume$1):349:349 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):354:356 -> <init>
     boolean isAssumeDynamicType() -> a
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement access$100(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):359:359 -> 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):385:385 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement access$100(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):349:349 -> 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):374:374 -> a
     boolean isAssumeNonNull() -> b
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement access$200(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):359:359 -> b
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement access$200(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):349:349 -> b
     boolean isAssumeNone() -> c
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():375:375 -> d
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType():371:371 -> e
-    1:5:boolean equals(java.lang.Object):394:398 -> equals
-    1:1:int hashCode():404:404 -> hashCode
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getLowerBoundType():364:364 -> d
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getType():360:360 -> e
+    1:5:boolean equals(java.lang.Object):383:387 -> equals
+    1:1:int hashCode():392:392 -> hashCode
 com.android.tools.r8.ir.code.Assume$NoAssumption -> com.android.tools.r8.D.b.n:
     com.android.tools.r8.ir.code.Assume$NoAssumption instance -> a
     boolean $assertionsDisabled -> b
-    1:2:void <clinit>():338:339 -> <clinit>
-    1:1:void <init>():341:341 -> <init>
+    1:2:void <clinit>():328:329 -> <clinit>
+    1:1:void <init>():331:331 -> <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):354:354 -> 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):344:344 -> a
     boolean isAssumeNonNull() -> b
     boolean isAssumeNone() -> c
-    1:1:com.android.tools.r8.ir.code.Assume$NoAssumption get():344:344 -> d
+    1:1:com.android.tools.r8.ir.code.Assume$NoAssumption get():334:334 -> d
 com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.D.b.o:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption instance -> a
     boolean $assertionsDisabled -> b
-    1:3:void <clinit>():408:410 -> <clinit>
-    1:1:void <init>():412:412 -> <init>
+    1:3:void <clinit>():396:398 -> <clinit>
+    1:1:void <init>():400:400 -> <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):425:425 -> 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):413:413 -> a
     boolean isAssumeNonNull() -> b
     boolean isAssumeNone() -> c
-    1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():415:415 -> d
+    1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():403:403 -> d
 com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.D.b.v:
     int color -> n
     int estimatedPredecessorsCount -> l
@@ -23042,156 +23045,153 @@
     18:18:java.util.List getPhis():531:531 -> a
     18:18:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):275 -> a
     19:27:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):275:283 -> a
-    28:28:void com.android.tools.r8.ir.code.Phi.removeTrivialPhi():228:228 -> a
+    28:28:void com.android.tools.r8.ir.code.Phi.removeTrivialPhi():227:227 -> a
     28:28:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):284 -> a
     29:46:void swapSuccessorsByIndex(int,int):313:330 -> a
     47:54:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):445:452 -> a
-    55:58:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456:459 -> a
-    59:60:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):41:42 -> a
-    59:60:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):459 -> a
-    61:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):459:464 -> a
-    67:67:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    67:67:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464 -> a
-    68:86:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464:482 -> a
-    87:87:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    87:87:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484 -> a
-    88:104:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484:500 -> a
-    105:105:java.util.LinkedList getInstructions():570:570 -> a
-    105:105:boolean consistentBlockInstructions(boolean,boolean):65 -> a
-    106:112:boolean consistentBlockInstructions(boolean,boolean):65:71 -> a
-    113:113:java.util.List getPredecessors():234:234 -> a
-    113:113:boolean consistentBlockInstructions(boolean,boolean):72 -> a
-    114:116:boolean consistentBlockInstructions(boolean,boolean):72:74 -> a
-    117:121:boolean consistentBlockInstructions(boolean,boolean):73:77 -> a
-    122:122:java.util.LinkedList getInstructions():570:570 -> a
-    122:122:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98 -> a
-    123:124:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:99 -> a
-    125:125:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    125:125:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):99 -> a
-    126:126:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:100 -> a
-    127:127:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):574:574 -> a
-    128:129:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):643:644 -> a
-    130:132:void clearMark(int):656:658 -> a
-    133:133:void addPhi(com.android.tools.r8.ir.code.Phi):688:688 -> a
-    134:134:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:702 -> a
-    135:135:boolean isFilled():535:535 -> a
-    135:135:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702 -> a
-    136:139:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:705 -> a
-    140:140:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:709 -> a
-    141:141:boolean isFilled():535:535 -> a
-    141:141:void close(com.android.tools.r8.ir.conversion.IRBuilder):709 -> a
-    142:146:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:713 -> a
-    147:147:boolean com.android.tools.r8.ir.code.JumpInstruction.isJumpInstruction():0:0 -> a
-    147:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):713 -> a
-    148:148:void close(com.android.tools.r8.ir.conversion.IRBuilder):714:714 -> a
-    149:150:boolean verifyNoValuesAfterThrowingInstruction():1580:1581 -> a
-    149:150:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
-    151:151:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> a
-    151:151:boolean verifyNoValuesAfterThrowingInstruction():1581 -> a
-    151:151:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
-    152:157:boolean verifyNoValuesAfterThrowingInstruction():1582:1587 -> a
-    152:157:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
-    158:158:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    158:158:boolean verifyNoValuesAfterThrowingInstruction():1587 -> a
-    158:158:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
-    159:159:boolean verifyNoValuesAfterThrowingInstruction():1587:1587 -> a
-    159:159:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
-    160:160:void close(com.android.tools.r8.ir.conversion.IRBuilder):715:715 -> a
-    161:172:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1079:1090 -> a
-    161:172:void close(com.android.tools.r8.ir.conversion.IRBuilder):716 -> a
-    173:173:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):796:796 -> a
-    174:178:boolean isCatchHandlerForSingleGuard():822:826 -> a
-    174:178:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):797 -> a
-    179:183:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):799:803 -> a
-    184:184:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):814:814 -> a
-    185:194:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):843:852 -> a
-    195:204:void linkCatchSuccessors(java.util.List,java.util.List):891:900 -> a
-    205:217:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):904:916 -> a
-    218:221:int numberOfNormalSuccessors() -> a
-    218:221:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):917 -> a
-    222:235:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):922:935 -> a
-    236:246:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):946:956 -> a
-    247:248:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1006:1007 -> a
-    247:248:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1019 -> a
-    249:251:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1021:1023 -> a
-    252:270:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1044:1062 -> a
-    271:275:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1069:1073 -> a
-    276:279:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1072:1075 -> a
-    280:281:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1095:1096 -> a
-    282:286:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1124:1128 -> a
-    287:294:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1141:1148 -> a
-    295:298:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1258:1261 -> a
-    299:331:void print(com.android.tools.r8.utils.CfgPrinter):1266:1298 -> a
-    332:333:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1302:1303 -> a
-    334:346:void removeInstructions(java.util.List):1324:1336 -> a
-    347:347:void setInstructions(java.util.LinkedList):1316:1316 -> a
-    347:347:void removeInstructions(java.util.List):1337 -> a
-    348:349: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):1361:1362 -> a
-    350:354:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1375:1379 -> a
-    355:361: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[]):1410:1416 -> a
-    362:362: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):1432:1432 -> a
-    363:363:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    363:363: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):1432 -> a
-    364:372: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):1433:1441 -> a
-    373:373:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    373:373: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):1442 -> a
-    374:374:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    374:374: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):1443 -> a
-    375:376: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):1444:1445 -> a
-    377:378:boolean canThrow():1557:1558 -> a
-    379:379:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606:1606 -> a
-    380:380:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
-    380:380:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606 -> a
-    381:381:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
-    382:382:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1614:1614 -> a
-    383:383:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1625:1625 -> a
-    384:389:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1643:1648 -> a
-    390:390:java.util.List getSuccessors():188:188 -> a
-    390:390:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1649 -> a
-    391:396:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1649:1654 -> a
-    397:402:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1675:1680 -> a
-    397:402:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1658 -> a
-    403:407:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1662:1666 -> a
-    408:424: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):1691:1707 -> a
-    425:434:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1735 -> a
-    425:434: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):1707 -> a
-    435:435:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    435:435:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1736 -> a
-    435:435: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):1707 -> a
-    436:438:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1736:1738 -> a
-    436:438: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):1707 -> a
-    439:439:java.util.LinkedList getInstructions():570:570 -> a
-    439:439:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1739 -> a
-    439:439: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):1707 -> a
-    440:457:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1739:1756 -> a
-    440:457:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
-    458:458:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    458:458:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1757 -> a
-    458:458: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):1707 -> a
-    459:462:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1758:1761 -> a
-    459:462: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):1707 -> a
-    463:463:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    463:463:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1762 -> a
-    463:463: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):1707 -> a
-    464:469:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1763:1768 -> a
-    464:469: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):1707 -> a
-    470:470:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1746 -> a
-    470:470: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):1707 -> a
-    471:471:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    471:471:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746 -> a
-    471:471: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):1707 -> a
-    472:506:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1780 -> a
-    472:506: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):1707 -> a
-    507:507:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):131:131 -> a
-    507:507:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1782 -> a
+    55:63:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456:464 -> a
+    64:64:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
+    64:64:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464 -> a
+    65:83:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464:482 -> a
+    84:84:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
+    84:84:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484 -> a
+    85:101:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484:500 -> a
+    102:102:java.util.LinkedList getInstructions():570:570 -> a
+    102:102:boolean consistentBlockInstructions(boolean,boolean):65 -> a
+    103:109:boolean consistentBlockInstructions(boolean,boolean):65:71 -> a
+    110:110:java.util.List getPredecessors():234:234 -> a
+    110:110:boolean consistentBlockInstructions(boolean,boolean):72 -> a
+    111:113:boolean consistentBlockInstructions(boolean,boolean):72:74 -> a
+    114:118:boolean consistentBlockInstructions(boolean,boolean):73:77 -> a
+    119:119:java.util.LinkedList getInstructions():570:570 -> a
+    119:119:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98 -> a
+    120:121:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:99 -> a
+    122:122:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    122:122:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):99 -> a
+    123:123:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:100 -> a
+    124:124:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):574:574 -> a
+    125:126:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):643:644 -> a
+    127:129:void clearMark(int):656:658 -> a
+    130:130:void addPhi(com.android.tools.r8.ir.code.Phi):688:688 -> a
+    131:131:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:702 -> a
+    132:132:boolean isFilled():535:535 -> a
+    132:132:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702 -> a
+    133:136:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:705 -> a
+    137:137:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:709 -> a
+    138:138:boolean isFilled():535:535 -> a
+    138:138:void close(com.android.tools.r8.ir.conversion.IRBuilder):709 -> a
+    139:143:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:713 -> a
+    144:144:boolean com.android.tools.r8.ir.code.JumpInstruction.isJumpInstruction():0:0 -> a
+    144:144:void close(com.android.tools.r8.ir.conversion.IRBuilder):713 -> a
+    145:145:void close(com.android.tools.r8.ir.conversion.IRBuilder):714:714 -> a
+    146:147:boolean verifyNoValuesAfterThrowingInstruction():1580:1581 -> a
+    146:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    148:148:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> a
+    148:148:boolean verifyNoValuesAfterThrowingInstruction():1581 -> a
+    148:148:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    149:154:boolean verifyNoValuesAfterThrowingInstruction():1582:1587 -> a
+    149:154:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    155:155:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    155:155:boolean verifyNoValuesAfterThrowingInstruction():1587 -> a
+    155:155:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    156:156:boolean verifyNoValuesAfterThrowingInstruction():1587:1587 -> a
+    156:156:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    157:157:void close(com.android.tools.r8.ir.conversion.IRBuilder):715:715 -> a
+    158:169:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1079:1090 -> a
+    158:169:void close(com.android.tools.r8.ir.conversion.IRBuilder):716 -> a
+    170:170:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):796:796 -> a
+    171:175:boolean isCatchHandlerForSingleGuard():822:826 -> a
+    171:175:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):797 -> a
+    176:180:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):799:803 -> a
+    181:181:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):814:814 -> a
+    182:191:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):843:852 -> a
+    192:201:void linkCatchSuccessors(java.util.List,java.util.List):891:900 -> a
+    202:214:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):904:916 -> a
+    215:218:int numberOfNormalSuccessors():218:221 -> a
+    215:218:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):917 -> a
+    219:232:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):922:935 -> a
+    233:243:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):946:956 -> a
+    244:245:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1006:1007 -> a
+    244:245:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1019 -> a
+    246:248:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1021:1023 -> a
+    249:267:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1044:1062 -> a
+    268:272:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1069:1073 -> a
+    273:276:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1072:1075 -> a
+    277:278:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1095:1096 -> a
+    279:283:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1124:1128 -> a
+    284:291:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1141:1148 -> a
+    292:295:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1258:1261 -> a
+    296:328:void print(com.android.tools.r8.utils.CfgPrinter):1266:1298 -> a
+    329:330:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1302:1303 -> a
+    331:343:void removeInstructions(java.util.List):1324:1336 -> a
+    344:344:void setInstructions(java.util.LinkedList):1316:1316 -> a
+    344:344:void removeInstructions(java.util.List):1337 -> a
+    345:346: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):1361:1362 -> a
+    347:351:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1375:1379 -> a
+    352:358: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[]):1410:1416 -> a
+    359:359: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):1432:1432 -> a
+    360:360:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    360:360: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):1432 -> a
+    361:369: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):1433:1441 -> a
+    370:370:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    370:370: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):1442 -> a
+    371:371:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    371:371: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):1443 -> a
+    372:373: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):1444:1445 -> a
+    374:375:boolean canThrow():1557:1558 -> a
+    376:376:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606:1606 -> a
+    377:377:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
+    377:377:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606 -> a
+    378:378:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
+    379:379:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1614:1614 -> a
+    380:380:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1625:1625 -> a
+    381:386:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1643:1648 -> a
+    387:387:java.util.List getSuccessors():188:188 -> a
+    387:387:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1649 -> a
+    388:393:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1649:1654 -> a
+    394:399:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1675:1680 -> a
+    394:399:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1658 -> a
+    400:404:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1662:1666 -> a
+    405:421:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1691:1707 -> a
+    422:431:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1735 -> a
+    422:431: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):1707 -> a
+    432:432:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    432:432:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1736 -> a
+    432:432: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):1707 -> a
+    433:435:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1736:1738 -> a
+    433:435: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):1707 -> a
+    436:436:java.util.LinkedList getInstructions():570:570 -> a
+    436:436:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1739 -> a
+    436:436: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):1707 -> a
+    437:454:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1739:1756 -> a
+    437:454: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):1707 -> a
+    455:455:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    455:455:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1757 -> a
+    455:455: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):1707 -> a
+    456:459:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1758:1761 -> a
+    456:459:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    460:460:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    460:460:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1762 -> a
+    460:460: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):1707 -> a
+    461:466:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1763:1768 -> a
+    461:466: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):1707 -> a
+    467:467:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1746 -> a
+    467:467: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):1707 -> a
+    468:468:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    468:468:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746 -> a
+    468:468: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):1707 -> a
+    469:503:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1780 -> a
+    469:503: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):1707 -> a
+    504:504:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    504:504:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1782 -> a
+    504:504: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):1707 -> a
+    505:505:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    505:505:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783 -> a
+    505:505: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):1707 -> a
+    506:506:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783:1783 -> a
+    506:506: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):1707 -> a
+    507:507:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1726 -> a
     507:507: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):1707 -> a
-    508:508:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    508:508:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783 -> a
-    508:508: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):1707 -> a
-    509:509:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783:1783 -> a
-    509:509: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):1707 -> a
-    510:510:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1726 -> a
-    510:510: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):1707 -> a
     1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):244:244 -> b
     2:30:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):335:363 -> b
     31:31:java.util.LinkedList getInstructions():570:570 -> b
@@ -23362,7 +23362,7 @@
     5:5:int doHash(java.lang.Object):1904:1904 -> a
     6:6:int doHash(com.android.tools.r8.ir.code.Phi):1919:1919 -> a
     6:6:int doHash(java.lang.Object):1904 -> a
-    7:7:int com.android.tools.r8.ir.code.Value.hashCode():763:763 -> a
+    7:7:int com.android.tools.r8.ir.code.Value.hashCode():764:764 -> a
     7:7:int doHash(com.android.tools.r8.ir.code.Phi):1920 -> a
     7:7:int doHash(java.lang.Object):1904 -> a
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.D.b.u:
@@ -23370,7 +23370,7 @@
     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():335:335 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> 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.D.b.w:
@@ -23391,187 +23391,187 @@
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.code.Position position -> d
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):36:36 -> <init>
-    2:9:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):32:39 -> <init>
-    10:10:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):42:42 -> <init>
-    11:24:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):32:45 -> <init>
-    25:26:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):50:51 -> <init>
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):37:37 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):33:40 -> <init>
+    10:10:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):43:43 -> <init>
+    11:24:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):33:46 -> <init>
+    25:26:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):51:52 -> <init>
     boolean lambda$inlineInvoke$2(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
     boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):88:88 -> a
-    2:2:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):183:183 -> a
+    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):89:89 -> a
+    2:2:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):184:184 -> a
     3:3:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    3:3:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):186 -> a
-    4:7:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):186:189 -> a
+    3:3:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):187 -> a
+    4:7:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):187:190 -> a
     8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    8:8:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):189 -> a
-    9:10:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):189:190 -> a
+    8:8:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):190 -> a
+    9:10:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):190:191 -> a
     11:11:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    11:11:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):190 -> a
-    12:13:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):190:191 -> a
+    11:11:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):191 -> a
+    12:13:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):191:192 -> a
     14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):191 -> a
+    14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):192 -> a
     15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    15:15:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):191 -> a
-    16:24:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):191:199 -> a
-    25:25:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):184:184 -> a
-    26:29:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):204:207 -> a
+    15:15:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):192 -> a
+    16:24:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):192:200 -> a
+    25:25:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):185:185 -> a
+    26:29:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):205:208 -> a
     30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    30:30:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):208 -> a
-    31:54:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):227:250 -> a
+    30:30:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):209 -> a
+    31:54:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):228:251 -> a
     55:55:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    55:55:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):250 -> a
-    56:69:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):250:263 -> a
-    70:70:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):228:228 -> a
-    71:80:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):265:274 -> a
-    81:88:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):282:289 -> a
-    89:89:boolean hasNext():56:56 -> a
-    89:89:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):289 -> a
-    90:93:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):289:292 -> a
+    55:55:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251 -> a
+    56:69:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251:264 -> a
+    70:70:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):229:229 -> a
+    71:80:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):266:275 -> a
+    81:88:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):283:290 -> a
+    89:89:boolean hasNext():57:57 -> a
+    89:89:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290 -> a
+    90:93:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290:293 -> a
     94:94:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    94:94:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):292 -> a
-    95:95:boolean hasPrevious():72:72 -> a
-    95:95:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):296 -> a
-    96:100:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):296:300 -> a
+    94:94:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):293 -> a
+    95:95:boolean hasPrevious():73:73 -> a
+    95:95:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297 -> a
+    96:100:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297:301 -> a
     101:102:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    101:102:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):300 -> a
-    103:121:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):301:319 -> a
-    122:127:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):328:333 -> a
-    128:128:java.lang.Object next():27:27 -> a
-    128:128:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):333 -> a
-    129:129:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):335:335 -> a
-    130:162:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):361:393 -> a
-    163:166:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):431:434 -> a
+    101:102:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):301 -> a
+    103:121:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):302:320 -> a
+    122:127:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):329:334 -> a
+    128:128:java.lang.Object next():28:28 -> a
+    128:128:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):334 -> a
+    129:129:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):336:336 -> a
+    130:162:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):362:394 -> a
+    163:166:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):432:435 -> a
     167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    167:167:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):434 -> a
-    168:169:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):434:435 -> a
+    167:167:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435 -> a
+    168:169:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435:436 -> a
     170:170:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    170:170:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435 -> a
-    171:172:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435:436 -> a
-    173:179: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):447:453 -> a
-    180:180:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
-    180:180:boolean canThrow(com.android.tools.r8.ir.code.IRCode):341 -> a
-    180:180: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):455 -> a
-    181:182:boolean canThrow(com.android.tools.r8.ir.code.IRCode):342:343 -> a
-    181:182: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):455 -> a
-    183:200: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):459:476 -> a
+    170:170:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):436 -> a
+    171:172:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):436:437 -> a
+    173:179: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):448:454 -> a
+    180:180:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    180:180:boolean canThrow(com.android.tools.r8.ir.code.IRCode):342 -> a
+    180:180: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):456 -> a
+    181:182:boolean canThrow(com.android.tools.r8.ir.code.IRCode):343:344 -> a
+    181:182: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):456 -> a
+    183:200: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):460:477 -> a
     201:201:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    201:201: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):476 -> a
-    202:209: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):476:483 -> a
+    201:201: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):477 -> a
+    202:209: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):477:484 -> a
     210:210:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    210:210: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):486 -> a
-    211:214: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):486:489 -> a
+    210:210: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):487 -> a
+    211:214: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):487:490 -> a
     215:215:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    215:215: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):488 -> a
-    216: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):490:490 -> a
-    217:217:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> 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):491 -> a
-    218:231: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):491:504 -> a
+    215:215: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):489 -> a
+    216: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):491:491 -> a
+    217:217:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> 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):492 -> a
+    218:231: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):492:505 -> a
     232:232:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
-    232:232: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):504 -> a
-    233:235: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):505:507 -> a
-    236:236:void add(java.lang.Object):27:27 -> a
-    236:236: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):507 -> a
-    237:242: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:513 -> a
-    243:243:void add(java.lang.Object):27:27 -> a
-    243:243: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):513 -> a
-    244:250: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):517:523 -> a
+    232:232: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):505 -> a
+    233:235: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):506:508 -> a
+    236:236:void add(java.lang.Object):28:28 -> a
+    236:236: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
+    237:242: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):509:514 -> a
+    243:243:void add(java.lang.Object):28:28 -> a
+    243:243: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):514 -> a
+    244:250: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):518:524 -> a
     251:251:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    251:251: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):527 -> a
-    252: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):527:531 -> a
+    251:251: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):528 -> a
+    252: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):528:532 -> a
     257:257:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    257:257: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):532 -> a
-    258:265: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):532:539 -> a
+    257:257: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):533 -> a
+    258:265: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):533:540 -> a
     266:266:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    266:266: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
-    267:280: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:552 -> a
+    266:266: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):540 -> a
+    267:280: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):540:553 -> a
     281:281:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    281:281: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):553 -> a
-    282:283: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):554:555 -> a
+    281:281: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):554 -> a
+    282:283: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):555:556 -> a
     284:284:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    284:284: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):556 -> a
-    285:287: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):556:558 -> a
+    284:284: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):557 -> a
+    285:287: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):557:559 -> a
     288:288:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    288:288: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):558 -> a
-    289:289: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):561:561 -> a
+    288:288: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):559 -> a
+    289:289: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):562:562 -> a
     290:290:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    290:290: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):560 -> a
-    291:291: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):559:559 -> a
+    290:290: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):561 -> a
+    291:291: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):560:560 -> a
     292:292:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
-    292:292: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):565 -> a
-    293:295: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):566:568 -> a
-    296:296:java.lang.Object next():27:27 -> a
-    296:296: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):568 -> a
-    297:298: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):569:570 -> a
-    299:299:boolean hasNext():56:56 -> a
-    299:299: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):570 -> a
-    300:307: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):570:577 -> a
-    308:308:java.lang.Object next():27:27 -> a
-    308:308: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):577 -> a
-    309:323: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):578:592 -> a
-    324:324:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):950:950 -> a
-    324:324: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):592 -> a
-    325:338: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):595:608 -> a
-    339:355: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):408:424 -> a
-    339:355: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):609 -> a
-    356:361: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):616:621 -> a
+    292:292: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):566 -> a
+    293:295: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):567:569 -> a
+    296:296:java.lang.Object next():28:28 -> a
+    296:296: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):569 -> a
+    297:298: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):570:571 -> a
+    299:299:boolean hasNext():57:57 -> a
+    299:299: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):571 -> a
+    300:307: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):571:578 -> a
+    308:308:java.lang.Object next():28:28 -> a
+    308:308: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):578 -> a
+    309:323: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:593 -> a
+    324:324:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):946:946 -> a
+    324:324: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):593 -> a
+    325:338: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):596:609 -> a
+    339:355: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):409:425 -> a
+    339:355: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):610 -> a
+    356:361: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):617:622 -> a
     362:362:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    362:362: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):621 -> a
-    363:373: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):621:631 -> a
-    374:378: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):630:634 -> a
-    379:382:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):640:643 -> a
-    383:383:java.lang.Object previous():27:27 -> a
-    383:383:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):643 -> a
-    384:404:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):646:666 -> a
-    405:405:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):131:131 -> a
-    405:405:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):671 -> a
-    406:406:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672:672 -> a
+    362:362: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):622 -> a
+    363:373: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):622:632 -> a
+    374:378: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):631:635 -> a
+    379:382:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):641:644 -> a
+    383:383:java.lang.Object previous():28:28 -> a
+    383:383:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):644 -> a
+    384:404:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):647:667 -> a
+    405:405:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672 -> a
+    406:406:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:673 -> a
     407:407:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    407:407:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672 -> a
-    408:418:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672:682 -> a
-    419:419:java.lang.Object previous():27:27 -> a
-    419:419:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):682 -> a
-    420:426:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):683:689 -> a
-    427:427:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
-    427:427:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):213 -> a
-    428:429:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):215:216 -> a
+    407:407:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673 -> a
+    408:418:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:683 -> a
+    419:419:java.lang.Object previous():28:28 -> a
+    419:419:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):683 -> a
+    420:426:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):684:690 -> a
+    427:427:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    427:427:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):214 -> a
+    428:429:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):216:217 -> a
     430:430:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    430:430:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):217 -> a
-    1:1:void add(java.lang.Object):27:27 -> add
-    1:7:void add(com.android.tools.r8.ir.code.Instruction):101:107 -> b
-    1:7:void removeOrReplaceByDebugLocalRead():171:177 -> d
-    8:8:void removeOrReplaceByDebugLocalRead():172:172 -> d
-    1:5:void removeInstructionIgnoreOutValue():162:166 -> f
-    6:6:void removeInstructionIgnoreOutValue():163:163 -> f
-    1:1:boolean hasNext():56:56 -> hasNext
-    1:1:boolean hasPrevious():72:72 -> hasPrevious
-    1:1:java.lang.Object next():27:27 -> next
-    2:2:com.android.tools.r8.ir.code.Instruction next():61:61 -> next
-    1:1:int nextIndex():67:67 -> nextIndex
-    1:1:java.lang.Object previous():27:27 -> previous
-    2:2:com.android.tools.r8.ir.code.Instruction previous():77:77 -> previous
-    1:1:int previousIndex():83:83 -> previousIndex
-    1:4:void remove():137:140 -> remove
+    430:430:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):218 -> a
+    1:1:void add(java.lang.Object):28:28 -> add
+    1:7:void add(com.android.tools.r8.ir.code.Instruction):102:108 -> b
+    1:7:void removeOrReplaceByDebugLocalRead():172:178 -> d
+    8:8:void removeOrReplaceByDebugLocalRead():173:173 -> d
+    1:5:void removeInstructionIgnoreOutValue():163:167 -> f
+    6:6:void removeInstructionIgnoreOutValue():164:164 -> f
+    1:1:boolean hasNext():57:57 -> hasNext
+    1:1:boolean hasPrevious():73:73 -> hasPrevious
+    1:1:java.lang.Object next():28:28 -> next
+    2:2:com.android.tools.r8.ir.code.Instruction next():62:62 -> next
+    1:1:int nextIndex():68:68 -> nextIndex
+    1:1:java.lang.Object previous():28:28 -> previous
+    2:2:com.android.tools.r8.ir.code.Instruction previous():78:78 -> previous
+    1:1:int previousIndex():84:84 -> previousIndex
+    1:4:void remove():138:141 -> remove
     5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> remove
-    5:5:void remove():140 -> remove
-    6:8:void remove():140:142 -> remove
+    5:5:void remove():141 -> remove
+    6:8:void remove():141:143 -> remove
     9:9:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> remove
-    9:9:void remove():142 -> remove
-    10:11:void remove():142:143 -> remove
+    9:9:void remove():143 -> remove
+    10:11:void remove():143:144 -> remove
     12:12:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> remove
-    12:12:void remove():143 -> remove
-    13:22:void remove():143:152 -> remove
+    12:12:void remove():144 -> remove
+    13:22:void remove():144:153 -> remove
     23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> remove
-    23:23:void remove():152 -> remove
-    24:25:void remove():152:153 -> remove
+    23:23:void remove():153 -> remove
+    24:25:void remove():153:154 -> remove
     26:26:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> remove
-    26:26:void remove():153 -> remove
-    27:31:void remove():153:157 -> remove
-    32:32:void remove():138:138 -> remove
-    1:1:void set(java.lang.Object):27:27 -> set
-    2:5:void set(com.android.tools.r8.ir.code.Instruction):120:123 -> set
-    2:5:void set(java.lang.Object):27 -> set
+    26:26:void remove():154 -> remove
+    27:31:void remove():154:158 -> remove
+    32:32:void remove():139:139 -> remove
+    1:1:void set(java.lang.Object):28:28 -> set
+    2:5:void set(com.android.tools.r8.ir.code.Instruction):121:124 -> set
+    2:5:void set(java.lang.Object):28 -> set
 com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.D.b.y:
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> a
@@ -23590,9 +23590,9 @@
     1:1:java.lang.Object previous():9 -> previous
     1:1:int previousIndex():54:54 -> previousIndex
     1:6:void remove():77:82 -> remove
-    7:7:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():56:56 -> remove
+    7:7:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():57:57 -> remove
     7:7:void remove():82 -> remove
-    8:8:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> remove
+    8:8:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> remove
     8:8:void remove():83 -> remove
     9:13:void remove():84:88 -> remove
     14:14:void remove():78:78 -> remove
@@ -23602,15 +23602,15 @@
 com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.D.b.z:
     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:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> D2
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> F2
-    1:2:int maxInOutValueRegisterSize():82:83 -> G2
-    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> H2
+    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> C2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> E2
+    1:2:int maxInOutValueRegisterSize():82:83 -> F2
+    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> G2
     boolean hasInvariantOutType() -> I0
     boolean isBinop() -> Z0
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1261:1261 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1256:1256 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
     10:10:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58:58 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():75:75 -> a
@@ -23626,8 +23626,8 @@
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> g
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     com.android.tools.r8.ir.code.Binop asBinop() -> l
-    1:1:int maxInValueRegister():90:90 -> x2
-    1:1:int maxOutValueRegister():95:95 -> y2
+    1:1:int maxInValueRegister():90:90 -> w2
+    1:1:int maxOutValueRegister():95:95 -> x2
 com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.D.b.A:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> e
@@ -23694,10 +23694,10 @@
     com.android.tools.r8.graph.DexType type -> h
     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):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> D2
-    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> E2
-    1:1:com.android.tools.r8.ir.code.Value object():49 -> E2
-    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> E2
+    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> C2
+    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> D2
+    1:1:com.android.tools.r8.ir.code.Value object():49 -> D2
+    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41:41 -> a
@@ -23724,15 +23724,15 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     1:1:java.lang.String toString():108:108 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.D.b.G:
     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>
-    boolean isCommutative() -> E2
+    boolean isCommutative() -> D2
     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:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:86 -> a
@@ -23757,9 +23757,9 @@
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     1:17:java.lang.String toString():104:120 -> toString
     18:40:java.lang.String toString():109:131 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.D.b.F:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
@@ -23773,7 +23773,7 @@
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):29:30 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> D2
+    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> C2
     boolean instructionInstanceCanThrow() -> M0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
@@ -23809,12 +23809,12 @@
     54:54:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):182:182 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> b
     boolean isConstClass() -> c1
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     1:1:java.lang.String toString():83:83 -> toString
-    1:1:int maxInValueRegister():72:72 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():72:72 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.D.b.I:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
@@ -23830,7 +23830,7 @@
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> h
     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:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> D2
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> C2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):49:49 -> a
@@ -23850,18 +23850,18 @@
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():275:275 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):85 -> a
     boolean isConstMethodHandle() -> e1
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     1:1:java.lang.String toString():95:95 -> toString
-    1:1:int maxInValueRegister():78:78 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():78:78 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.D.b.K:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
     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:com.android.tools.r8.graph.DexProto getValue():57:57 -> D2
+    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> C2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):49:49 -> a
@@ -23881,50 +23881,50 @@
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():279:279 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131 -> a
     boolean isConstMethodType() -> f1
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     1:1:java.lang.String toString():89:89 -> toString
-    1:1:int maxInValueRegister():78:78 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():78:78 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.D.b.L:
     boolean $assertionsDisabled -> i
     long value -> h
     1:1:void <clinit>():32:32 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Value,long):37:42 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> D2
-    1:1:double getDoubleValue():92:92 -> E2
+    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> C2
+    1:1:double getDoubleValue():92:92 -> D2
+    2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> D2
+    2:2:double getDoubleValue():92 -> D2
+    3:4:double getDoubleValue():92:93 -> D2
+    1:1:float getFloatValue():87:87 -> E2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> E2
-    2:2:double getDoubleValue():92 -> E2
-    3:4:double getDoubleValue():92:93 -> E2
-    1:1:float getFloatValue():87:87 -> F2
+    2:2:float getFloatValue():87 -> E2
+    3:4:float getFloatValue():87:88 -> E2
+    1:1:int getIntValue():76:76 -> F2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> F2
-    2:2:float getFloatValue():87 -> F2
-    3:4:float getFloatValue():87:88 -> F2
-    1:1:int getIntValue():76:76 -> G2
+    2:2:int getIntValue():76 -> F2
+    3:3:int getIntValue():76:76 -> F2
+    4:4:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> F2
+    4:4:int getIntValue():77 -> F2
+    5:5:int getIntValue():77:77 -> F2
+    6:8:int getIntValue():76:78 -> F2
+    1:1:long getLongValue():82:82 -> G2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> G2
-    2:2:int getIntValue():76 -> G2
-    3:3:int getIntValue():76:76 -> G2
-    4:4:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> G2
-    4:4:int getIntValue():77 -> G2
-    5:5:int getIntValue():77:77 -> G2
-    6:8:int getIntValue():76:78 -> G2
-    1:1:long getLongValue():82:82 -> H2
-    2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> H2
-    2:2:long getLongValue():82 -> H2
-    3:4:long getLongValue():82:83 -> H2
-    1:1:long getRawValue():97:97 -> I2
-    1:1:boolean is16Bit():273:273 -> J2
-    1:1:boolean is8Bit():265:265 -> K2
+    2:2:long getLongValue():82 -> G2
+    3:4:long getLongValue():82:83 -> G2
+    1:1:long getRawValue():97:97 -> H2
+    1:1:boolean is16Bit():273:273 -> I2
+    1:1:boolean is8Bit():265:265 -> J2
+    1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> K2
+    1:1:boolean isIntegerOne():109 -> K2
+    2:2:boolean isIntegerOne():109:109 -> K2
     1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> L2
-    1:1:boolean isIntegerOne():109 -> L2
-    2:2:boolean isIntegerOne():109:109 -> L2
-    1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> M2
-    1:1:boolean isIntegerZero():105 -> M2
-    2:2:boolean isIntegerZero():105:105 -> M2
-    1:1:boolean isZero():101:101 -> N2
-    1:1:boolean negativeIs16Bit():277:277 -> O2
-    1:1:boolean negativeIs8Bit():269:269 -> P2
+    1:1:boolean isIntegerZero():105 -> L2
+    2:2:boolean isIntegerZero():105:105 -> L2
+    1:1:boolean isZero():101:101 -> M2
+    1:1:boolean negativeIs16Bit():277:277 -> N2
+    1:1:boolean negativeIs8Bit():269:269 -> O2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:2:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):56:57 -> a
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
@@ -24007,23 +24007,23 @@
     5:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):319 -> b
     6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):319:319 -> b
     7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):317:317 -> b
+    boolean isOutConstant() -> f2
     boolean isConstNumber() -> g1
-    boolean isOutConstant() -> g2
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     1:2:java.lang.String toString():245:246 -> toString
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
     3:3:java.lang.String toString():246 -> toString
     4:6:java.lang.String toString():246:248 -> toString
-    1:1:int maxInValueRegister():234:234 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():234:234 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.D.b.M:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> i
     1:1:void <clinit>():20:20 -> <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):26:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> D2
+    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> C2
     1:11:boolean instructionInstanceCanThrow():110:120 -> M0
     1:1:boolean instructionTypeCanThrow():90:90 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24047,7 +24047,7 @@
     13:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:64 -> a
     15:15:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> a
     16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     17:17:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129 -> a
     18:18:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
     19:19:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):134:134 -> a
@@ -24055,33 +24055,29 @@
     21:21:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):144:144 -> a
     22:22:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):149:149 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     boolean isConstString() -> h1
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     1:1:java.lang.String toString():85:85 -> toString
-    1:1:int maxInValueRegister():74:74 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():74:74 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.D.b.N:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
-    1:2:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:43 -> a
+    1:1:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):41:41 -> a
+    2:2:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    2:2:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42 -> a
     3:3:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:42 -> a
     4:4:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    4:4:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44 -> a
-    5:5:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44:44 -> a
-    6:6:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    6:6:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44 -> a
-    7:7:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44:44 -> a
-    8:8:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    8:8:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):45 -> a
-    9:13:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):45:49 -> a
-    14:22:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):48:56 -> a
-    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    23:23:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20 -> a
-    24:36:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):21:33 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    37:37:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20 -> a
+    4:4:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43 -> a
+    5:9:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43:47 -> a
+    10:18:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):46:54 -> a
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    19:19:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20 -> a
+    20:31:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):21:32 -> a
+    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    32:32:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20 -> a
 com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.D.b.O:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -24096,9 +24092,9 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean isDebugLocalRead() -> l1
-    1:1:int maxInValueRegister():59:59 -> x2
-    1:1:int maxOutValueRegister():64:64 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():59:59 -> w2
+    1:1:int maxOutValueRegister():64:64 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.D.b.P:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isAllowedAfterThrowingInstruction() -> P0
@@ -24119,7 +24115,7 @@
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
     6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71 -> a
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     boolean isDebugLocalWrite() -> n1
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
 com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.D.b.S:
@@ -24128,8 +24124,8 @@
     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>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> D2
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> E2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> C2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> D2
     boolean hasInvariantOutType() -> I0
     boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24150,9 +24146,9 @@
     boolean isDebugLocalsChange() -> o1
     1:6:java.lang.String toString():92:97 -> toString
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
-    1:1:int maxInValueRegister():77:77 -> x2
-    1:1:int maxOutValueRegister():82:82 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():77:77 -> w2
+    1:1:int maxOutValueRegister():82:82 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.D.b.T:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
@@ -24170,9 +24166,9 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean isDebugPosition() -> p1
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    1:1:int maxInValueRegister():55:55 -> x2
-    1:1:int maxOutValueRegister():60:60 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():55:55 -> w2
+    1:1:int maxOutValueRegister():60:60 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.D.b.U:
     1:1:void <init>():7:7 -> <init>
     java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction) -> a
@@ -24194,8 +24190,8 @@
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> i
     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>
-    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> D2
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> E2
+    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> C2
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> D2
     boolean instructionInstanceCanThrow() -> M0
     1:1:boolean instructionTypeCanThrow():113:113 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24226,17 +24222,17 @@
     21:21:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):146:146 -> a
     22:22:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):151:151 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     boolean isDexItemBasedConstString() -> q1
     1:1:java.lang.String toString():108:108 -> toString
+    1:1:int maxInValueRegister():97:97 -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
-    1:1:int maxInValueRegister():97:97 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Div -> com.android.tools.r8.D.b.W:
     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 isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> H2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -24257,7 +24253,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
     boolean isDiv() -> r1
     com.android.tools.r8.ir.code.Div asDiv() -> y
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.D.b.a0:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
@@ -24316,19 +24312,19 @@
     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>
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> C2
+    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> C2
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55 -> C2
+    3:3:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> C2
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> D2
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> D2
-    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> D2
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> D2
     2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> D2
-    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55 -> D2
-    3:3:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> D2
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> E2
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> E2
-    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> E2
-    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> E2
-    2:2:com.android.tools.r8.ir.code.StackValue outTop():59 -> E2
-    3:3:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> E2
-    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> F2
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():59 -> D2
+    3:3:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> D2
+    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> E2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24340,10 +24336,10 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
     boolean isDup() -> s1
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():92:92 -> y2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():92:92 -> x2
+    int opcode() -> y2
     com.android.tools.r8.ir.code.Dup asDup() -> z
-    int opcode() -> z2
 com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.D.b.b0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -24360,41 +24356,34 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
     boolean isDup2() -> t1
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():106:106 -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():106:106 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.D.b.d0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
-    1:1:void <clinit>():25:25 -> <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):30:30 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):34:36 -> <init>
+    1:1:void <clinit>():22:22 -> <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):27:27 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):31:33 -> <init>
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
-    1:1:com.android.tools.r8.graph.DexField getField():46:46 -> D2
-    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():42:42 -> E2
-    com.android.tools.r8.ir.code.Value value() -> F2
+    1:1:com.android.tools.r8.graph.DexField getField():43:43 -> C2
+    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> D2
+    com.android.tools.r8.ir.code.Value value() -> E2
     boolean hasInvariantOutType() -> I0
-    1:24:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):62:85 -> a
+    1:24:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):59:82 -> a
     25:25:boolean com.android.tools.r8.graph.DexEncodedField.isStaticMember():123:123 -> a
-    25:25:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):89 -> a
-    26:43:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):90:107 -> a
+    25:25:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):86 -> a
+    26:43:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):87:104 -> a
     44:44:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    44:44:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):107 -> a
-    45:65:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):113:133 -> a
-    66:66:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):108:108 -> a
-    67:67:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):95:95 -> a
-    68:68:boolean lambda$instructionInstanceCanThrow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):129:129 -> a
-    69:74:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):176:181 -> a
-    75:75:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    75:75:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):181 -> a
-    76:93:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):182:199 -> a
-    94:94:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):198:198 -> a
-    95:95:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    95:95:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):181 -> a
-    1:6:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):144:149 -> d
-    7:7:com.android.tools.r8.graph.DexField getField():46:46 -> d
-    7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):150 -> d
-    8:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):152:167 -> d
+    44:44:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104 -> a
+    45:65:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):110:130 -> a
+    66:66:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):105:105 -> a
+    67:67:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):92:92 -> a
+    68:68:boolean lambda$instructionInstanceCanThrow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):126:126 -> a
+    1:6:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):141:146 -> d
+    7:7:com.android.tools.r8.graph.DexField getField():43:43 -> d
+    7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147 -> d
+    8:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):149:164 -> d
     boolean isFieldInstruction() -> v1
 com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.D.b.e0:
     com.android.tools.r8.ir.code.FieldMemberType DOUBLE -> i
@@ -24430,21 +24419,21 @@
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int):16:18 -> <init>
-    boolean isConstant() -> E
-    boolean isFixedRegisterValue() -> G
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1082:1082 -> W
-    1:1:com.android.tools.r8.ir.code.ValueType outType():23 -> W
-    2:23:com.android.tools.r8.ir.code.ValueType outType():24:45 -> W
-    24:25:com.android.tools.r8.ir.code.ValueType outType():42:43 -> W
+    boolean isConstant() -> D
+    boolean isFixedRegisterValue() -> F
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1199:1199 -> V
+    1:1:com.android.tools.r8.ir.code.ValueType outType():23 -> V
+    2:23:com.android.tools.r8.ir.code.ValueType outType():24:45 -> V
+    24:25:com.android.tools.r8.ir.code.ValueType outType():42:43 -> V
+    1:1:int getRegister():49:49 -> b0
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> c
-    1:1:int getRegister():49:49 -> c0
     1:1:java.lang.String toString():69:69 -> toString
 com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.D.b.g0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.code.Goto asGoto() -> B
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> E2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> D2
     boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24453,7 +24442,7 @@
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> a
     5:5:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:104 -> a
     6:6:void com.android.tools.r8.ir.code.BasicBlockIterator.<init>(com.android.tools.r8.ir.code.IRCode):17:17 -> a
-    6:6:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():946 -> a
+    6:6:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():942 -> a
     6:6:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):105 -> a
     7:7:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> a
     7:7:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):106 -> a
@@ -24466,14 +24455,14 @@
     10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():9 -> a
     10:10:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):109 -> a
     11:11:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):109:109 -> a
-    12:12:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():946:946 -> a
+    12:12:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():942:942 -> a
     12:12:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):105 -> a
     13:13:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
     1:4:java.lang.String toString():71:74 -> toString
+    1:1:int maxInValueRegister():59:59 -> w2
     boolean isGoto() -> x1
-    1:1:int maxInValueRegister():59:59 -> x2
-    1:1:int maxOutValueRegister():65:65 -> y2
-    int opcode() -> z2
+    1:1:int maxOutValueRegister():65:65 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.D.b.j0:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> a
@@ -24486,297 +24475,294 @@
     com.android.tools.r8.utils.InternalOptions options -> i
     com.android.tools.r8.origin.Origin origin -> j
     java.util.LinkedList blocks -> b
-    1:1:void <clinit>():50:50 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):124:124 -> <init>
-    2:32:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):104:134 -> <init>
-    1:20:void traceBlocks():401:420 -> A
-    21:33:void traceBlocks():419:431 -> A
-    34:34:boolean noColorsInUse():1149:1149 -> A
-    34:34:void traceBlocks():431 -> A
-    35:35:void traceBlocks():431:431 -> A
-    1:12:boolean verifyNoImpreciseOrBottomTypes():853:864 -> B
-    1:8:boolean verifyNoNullabilityBottomTypes():868:875 -> C
-    1:14:boolean verifySplitCriticalEdges():374:387 -> D
-    1:6:boolean computeAllThrowingInstructionsHavePositions():1072:1077 -> E
-    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():879:890 -> F
-    1:17:boolean controlFlowMayDependOnEnvironment(com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis):267:283 -> a
-    18:18:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):335:335 -> a
-    19:23:void ensureBlockNumbering():435:439 -> a
-    19:23:void print(com.android.tools.r8.utils.CfgPrinter):541 -> a
-    24:25:void print(com.android.tools.r8.utils.CfgPrinter):542:543 -> a
-    26:36:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):558:568 -> a
-    37:37:boolean lambda$verifyTypes$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.BasicBlock):593:593 -> a
-    38:38:void lambda$consistentBlockNumbering$2(java.lang.Integer,java.lang.Long):748:748 -> a
-    39:45:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):855:861 -> a
-    46:46:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):860:860 -> a
-    47:50:boolean lambda$wrapSSAVerifierWithStackValueHandling$8(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):897:900 -> a
-    51:51:java.lang.Iterable instructions(java.util.function.Predicate):924:924 -> a
-    52:53:java.util.List collectArguments(boolean):980:981 -> a
-    52:53:java.util.List collectArguments():976 -> a
-    54:54:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
-    54:54:java.util.List collectArguments(boolean):981 -> a
-    54:54:java.util.List collectArguments():976 -> a
-    55:58:java.util.List collectArguments(boolean):982:985 -> a
-    55:58:java.util.List collectArguments():976 -> a
-    59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    59:59:java.util.List collectArguments(boolean):985 -> a
-    59:59:java.util.List collectArguments():976 -> a
-    60:65:java.util.List collectArguments(boolean):987:992 -> a
-    60:65:java.util.List collectArguments():976 -> a
-    66:66:java.util.List collectArguments(boolean):991:991 -> a
-    66:66:java.util.List collectArguments():976 -> a
-    67:67:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
-    67:67:java.util.List collectArguments(boolean):981 -> a
-    67:67:java.util.List collectArguments():976 -> a
-    68:68:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):1008:1008 -> a
-    69:70:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1030:1031 -> a
-    71:71:void setAllThrowingInstructionsHavePositions(boolean):1068:1068 -> a
-    72:75:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1097:1100 -> a
-    76:76:boolean isMarkingColorInUse(int):1136:1136 -> a
-    77:77:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1153:1153 -> a
-    78:86:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1178:1186 -> a
-    78:86:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1154 -> a
-    87:92:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1155:1160 -> a
-    93:93:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    93:93:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1160 -> a
-    94:100:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1161:1167 -> a
-    101:101:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    101:101:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1167 -> a
-    102:102:void markTransitiveSuccessors(java.util.Deque,int):1225:1225 -> a
-    103:103:boolean isMarkingColorInUse(int):1136:1136 -> a
-    103:103:void markTransitiveSuccessors(java.util.Deque,int):1225 -> a
-    104:105:boolean anyBlocksMarkedWithColor(int):1140:1141 -> a
-    104:105:void markTransitiveSuccessors(java.util.Deque,int):1225 -> a
-    106:115:void markTransitiveSuccessors(java.util.Deque,int):1225:1234 -> a
-    116:116:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1246:1246 -> a
-    117:117:boolean isMarkingColorInUse(int):1136:1136 -> a
-    117:117:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1246 -> a
-    118:129:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1246:1257 -> a
-    130:130:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> a
-    130:130:java.util.Iterator lambda$getInstructionsReachableFrom$10(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1165 -> a
-    1:53:java.util.Map computeLiveAtEntrySets():149:201 -> b
-    54:57:java.util.Map computeLiveAtEntrySets():200:203 -> b
-    58:58:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasPrevious():72:72 -> b
-    58:58:java.util.Map computeLiveAtEntrySets():203 -> b
-    59:59:java.util.Map computeLiveAtEntrySets():204:204 -> b
-    60:60:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    60:60:java.util.Map computeLiveAtEntrySets():205 -> b
-    61:74:java.util.Map computeLiveAtEntrySets():207:220 -> b
-    75:75:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
-    75:75:java.util.Map computeLiveAtEntrySets():224 -> b
-    76:111:java.util.Map computeLiveAtEntrySets():224:259 -> b
-    112:112:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():83:83 -> b
-    112:112:java.util.Map computeLiveAtEntrySets():259 -> b
-    113:115:java.util.Map computeLiveAtEntrySets():259:261 -> b
-    116:117:boolean verifyTypes(com.android.tools.r8.graph.AppView):589:590 -> b
-    118:121:boolean validAssumeDynamicTypeInstructions(com.android.tools.r8.graph.AppView):598:601 -> b
-    118:121:boolean verifyTypes(com.android.tools.r8.graph.AppView):590 -> b
-    122:124:boolean verifyTypes(com.android.tools.r8.graph.AppView):591:593 -> b
-    125:127:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):870:872 -> b
-    128:128:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):870:870 -> b
-    129:129:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():928:928 -> b
-    129:129:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):924 -> b
-    130:130:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):924:924 -> b
-    131:131:java.util.ListIterator listIterator(int):950:950 -> b
-    132:132:boolean lambda$findFirstNonNonePosition$11(com.android.tools.r8.ir.code.Instruction):1265:1265 -> b
-    1:6:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):881:886 -> c
-    7:13:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):881:887 -> c
-    14:14:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):882:882 -> c
-    15:18:boolean verifySSATypeLattice(java.util.function.Predicate):906:909 -> c
-    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> c
-    19:19:boolean verifySSATypeLattice(java.util.function.Predicate):909 -> c
-    20:24:boolean verifySSATypeLattice(java.util.function.Predicate):909:913 -> c
-    25:31:java.util.List computeNormalExitBlocks():936:942 -> c
-    32:32:void returnMarkingColor(int):1130:1130 -> c
-    33:33:boolean isMarkingColorInUse(int):1136:1136 -> c
-    33:33:void returnMarkingColor(int):1130 -> c
-    34:34:void returnMarkingColor(int):1130:1130 -> c
-    35:36:void clearMarks(int):456:457 -> c
-    35:36:void returnMarkingColor(int):1131 -> c
-    37:37:void returnMarkingColor(int):1132:1132 -> c
-    1:4:boolean consistentBlockNumbering():743:746 -> d
-    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Instruction):885:885 -> d
-    6:6:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):894:894 -> d
-    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1054:1054 -> e
-    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> e
-    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1054 -> e
-    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():1055:1055 -> e
-    1:1:boolean doAllThrowingInstructionsHavePositions():1064:1064 -> f
-    1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():142:142 -> g
-    1:1:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1265:1265 -> h
+    1:1:void <clinit>():48:48 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):122:122 -> <init>
+    2:32:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):102:132 -> <init>
+    1:20:void traceBlocks():397:416 -> A
+    21:33:void traceBlocks():415:427 -> A
+    34:34:boolean noColorsInUse():1145:1145 -> A
+    34:34:void traceBlocks():427 -> A
+    35:35:void traceBlocks():427:427 -> A
+    1:12:boolean verifyNoImpreciseOrBottomTypes():849:860 -> B
+    1:8:boolean verifyNoNullabilityBottomTypes():864:871 -> C
+    1:14:boolean verifySplitCriticalEdges():370:383 -> D
+    1:6:boolean computeAllThrowingInstructionsHavePositions():1068:1073 -> E
+    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():875:886 -> F
+    1:17:boolean controlFlowMayDependOnEnvironment(com.android.tools.r8.graph.AppView):263:279 -> a
+    18:18:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):331:331 -> a
+    19:23:void ensureBlockNumbering():431:435 -> a
+    19:23:void print(com.android.tools.r8.utils.CfgPrinter):537 -> a
+    24:25:void print(com.android.tools.r8.utils.CfgPrinter):538:539 -> a
+    26:26:boolean lambda$verifyTypes$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.BasicBlock):589:589 -> a
+    27:27:void lambda$consistentBlockNumbering$2(java.lang.Integer,java.lang.Long):744:744 -> a
+    28:34:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):851:857 -> a
+    35:35:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):856:856 -> a
+    36:39:boolean lambda$wrapSSAVerifierWithStackValueHandling$8(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):893:896 -> a
+    40:40:java.lang.Iterable instructions(java.util.function.Predicate):920:920 -> a
+    41:42:java.util.List collectArguments(boolean):976:977 -> a
+    41:42:java.util.List collectArguments():972 -> a
+    43:43:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    43:43:java.util.List collectArguments(boolean):977 -> a
+    43:43:java.util.List collectArguments():972 -> a
+    44:47:java.util.List collectArguments(boolean):978:981 -> a
+    44:47:java.util.List collectArguments():972 -> a
+    48:48:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    48:48:java.util.List collectArguments(boolean):981 -> a
+    48:48:java.util.List collectArguments():972 -> a
+    49:54:java.util.List collectArguments(boolean):983:988 -> a
+    49:54:java.util.List collectArguments():972 -> a
+    55:55:java.util.List collectArguments(boolean):987:987 -> a
+    55:55:java.util.List collectArguments():972 -> a
+    56:56:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    56:56:java.util.List collectArguments(boolean):977 -> a
+    56:56:java.util.List collectArguments():972 -> a
+    57:57:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):1004:1004 -> a
+    58:59:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1026:1027 -> a
+    60:60:void setAllThrowingInstructionsHavePositions(boolean):1064:1064 -> a
+    61:64:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1093:1096 -> a
+    65:65:boolean isMarkingColorInUse(int):1132:1132 -> a
+    66:66:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1149:1149 -> a
+    67:75:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1174:1182 -> a
+    67:75:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1150 -> a
+    76:81:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1151:1156 -> a
+    82:82:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    82:82:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1156 -> a
+    83:89:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1157:1163 -> a
+    90:90:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    90:90:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1163 -> a
+    91:91:void markTransitiveSuccessors(java.util.Deque,int):1221:1221 -> a
+    92:92:boolean isMarkingColorInUse(int):1132:1132 -> a
+    92:92:void markTransitiveSuccessors(java.util.Deque,int):1221 -> a
+    93:94:boolean anyBlocksMarkedWithColor(int):1136:1137 -> a
+    93:94:void markTransitiveSuccessors(java.util.Deque,int):1221 -> a
+    95:104:void markTransitiveSuccessors(java.util.Deque,int):1221:1230 -> a
+    105:105:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242:1242 -> a
+    106:106:boolean isMarkingColorInUse(int):1132:1132 -> a
+    106:106:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242 -> a
+    107:118:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242:1253 -> a
+    119:119:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> a
+    119:119:java.util.Iterator lambda$getInstructionsReachableFrom$10(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1161 -> a
+    1:52:java.util.Map computeLiveAtEntrySets():147:198 -> b
+    53:56:java.util.Map computeLiveAtEntrySets():197:200 -> b
+    57:57:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasPrevious():73:73 -> b
+    57:57:java.util.Map computeLiveAtEntrySets():200 -> b
+    58:58:java.util.Map computeLiveAtEntrySets():201:201 -> b
+    59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
+    59:59:java.util.Map computeLiveAtEntrySets():202 -> b
+    60:73:java.util.Map computeLiveAtEntrySets():204:217 -> b
+    74:74:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
+    74:74:java.util.Map computeLiveAtEntrySets():221 -> b
+    75:110:java.util.Map computeLiveAtEntrySets():221:256 -> b
+    111:111:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():81:81 -> b
+    111:111:java.util.Map computeLiveAtEntrySets():256 -> b
+    112:114:java.util.Map computeLiveAtEntrySets():256:258 -> b
+    115:125:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):554:564 -> b
+    126:128:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):866:868 -> b
+    129:129:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):866:866 -> b
+    130:130:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():924:924 -> b
+    130:130:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):920 -> b
+    131:131:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):920:920 -> b
+    132:132:java.util.ListIterator listIterator(int):946:946 -> b
+    133:133:boolean lambda$findFirstNonNonePosition$11(com.android.tools.r8.ir.code.Instruction):1261:1261 -> b
+    1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):585:586 -> c
+    3:6:boolean validAssumeDynamicTypeInstructions(com.android.tools.r8.graph.AppView):594:597 -> c
+    3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):586 -> c
+    7:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):587:589 -> c
+    10:15:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):877:882 -> c
+    16:22:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):877:883 -> c
+    23:23:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):878:878 -> c
+    24:27:boolean verifySSATypeLattice(java.util.function.Predicate):902:905 -> c
+    28:28:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> c
+    28:28:boolean verifySSATypeLattice(java.util.function.Predicate):905 -> c
+    29:33:boolean verifySSATypeLattice(java.util.function.Predicate):905:909 -> c
+    34:40:java.util.List computeNormalExitBlocks():932:938 -> c
+    41:41:void returnMarkingColor(int):1126:1126 -> c
+    42:42:boolean isMarkingColorInUse(int):1132:1132 -> c
+    42:42:void returnMarkingColor(int):1126 -> c
+    43:43:void returnMarkingColor(int):1126:1126 -> c
+    44:45:void clearMarks(int):452:453 -> c
+    44:45:void returnMarkingColor(int):1127 -> c
+    46:46:void returnMarkingColor(int):1128:1128 -> c
+    1:4:boolean consistentBlockNumbering():739:742 -> d
+    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Instruction):881:881 -> d
+    6:6:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):890:890 -> d
+    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1050:1050 -> e
+    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> e
+    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1050 -> e
+    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():1051:1051 -> e
+    1:1:boolean doAllThrowingInstructionsHavePositions():1060:1060 -> f
+    1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():140:140 -> g
+    1:1:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261:1261 -> h
     2:2:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> h
-    2:2:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1265 -> h
-    3:16:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1265:1278 -> h
+    2:2:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261 -> h
+    3:16:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261:1274 -> h
     17:17:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> h
-    17:17:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1265 -> h
-    1:1:int getHighestBlockNumber():1044:1044 -> i
-    1:1:int getNextInstructionNumber():972:972 -> j
-    1:4:com.android.tools.r8.ir.code.Value getThis():997:1000 -> k
+    17:17:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261 -> h
+    1:1:int getHighestBlockNumber():1040:1040 -> i
+    1:1:int getNextInstructionNumber():968:968 -> j
+    1:4:com.android.tools.r8.ir.code.Value getThis():993:996 -> k
     5:5:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> k
-    5:5:com.android.tools.r8.ir.code.Value getThis():1000 -> k
-    6:8:com.android.tools.r8.ir.code.Value getThis():1000:1002 -> k
+    5:5:com.android.tools.r8.ir.code.Value getThis():996 -> k
+    6:8:com.android.tools.r8.ir.code.Value getThis():996:998 -> k
     9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> k
-    9:9:com.android.tools.r8.ir.code.Value getThis():1002 -> k
-    10:10:com.android.tools.r8.ir.code.Value getThis():1003:1003 -> k
+    9:9:com.android.tools.r8.ir.code.Value getThis():998 -> k
+    10:10:com.android.tools.r8.ir.code.Value getThis():999:999 -> k
     11:11:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> k
-    11:11:com.android.tools.r8.ir.code.Value getThis():1000 -> k
-    1:3:java.util.Set getUnreachableBlocks():1191:1193 -> l
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1221:1221 -> l
-    4:4:java.util.Set getUnreachableBlocks():1193 -> l
-    5:10:java.util.Set getUnreachableBlocks():1194:1199 -> l
-    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():928:928 -> m
-    1:1:java.lang.Iterable instructions():920:920 -> n
-    1:1:boolean isConsistentGraph():576:576 -> o
-    2:2:boolean noColorsInUse():1149:1149 -> o
-    2:2:boolean isConsistentGraph():576 -> o
-    3:5:boolean isConsistentGraph():576:578 -> o
-    6:21:boolean consistentPredecessorSuccessors():714:729 -> o
-    6:21:boolean isConsistentGraph():578 -> o
-    22:22:boolean isConsistentGraph():579:579 -> o
-    23:24:boolean consistentCatchHandlers():736:737 -> o
-    23:24:boolean isConsistentGraph():579 -> o
-    25:25:boolean isConsistentGraph():580:580 -> o
-    26:29:boolean consistentBlockInstructions():755:758 -> o
-    26:29:boolean isConsistentGraph():580 -> o
-    30:30:boolean consistentBlockInstructions():756:756 -> o
-    30:30:boolean isConsistentGraph():580 -> o
-    31:31:boolean isConsistentGraph():581:581 -> o
-    32:88:boolean consistentMetadata():765:821 -> o
-    32:88:boolean isConsistentGraph():581 -> o
-    89:89:boolean isConsistentGraph():582:582 -> o
-    1:2:boolean isConsistentSSA():548:549 -> p
-    3:19:boolean consistentDefUseChains():638:654 -> p
-    3:19:boolean isConsistentSSA():549 -> p
+    11:11:com.android.tools.r8.ir.code.Value getThis():996 -> k
+    1:3:java.util.Set getUnreachableBlocks():1187:1189 -> l
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1217:1217 -> l
+    4:4:java.util.Set getUnreachableBlocks():1189 -> l
+    5:10:java.util.Set getUnreachableBlocks():1190:1195 -> l
+    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():924:924 -> m
+    1:1:java.lang.Iterable instructions():916:916 -> n
+    1:1:boolean isConsistentGraph():572:572 -> o
+    2:2:boolean noColorsInUse():1145:1145 -> o
+    2:2:boolean isConsistentGraph():572 -> o
+    3:5:boolean isConsistentGraph():572:574 -> o
+    6:21:boolean consistentPredecessorSuccessors():710:725 -> o
+    6:21:boolean isConsistentGraph():574 -> o
+    22:22:boolean isConsistentGraph():575:575 -> o
+    23:24:boolean consistentCatchHandlers():732:733 -> o
+    23:24:boolean isConsistentGraph():575 -> o
+    25:25:boolean isConsistentGraph():576:576 -> o
+    26:29:boolean consistentBlockInstructions():751:754 -> o
+    26:29:boolean isConsistentGraph():576 -> o
+    30:30:boolean consistentBlockInstructions():752:752 -> o
+    30:30:boolean isConsistentGraph():576 -> o
+    31:31:boolean isConsistentGraph():577:577 -> o
+    32:88:boolean consistentMetadata():761:817 -> o
+    32:88:boolean isConsistentGraph():577 -> o
+    89:89:boolean isConsistentGraph():578:578 -> o
+    1:2:boolean isConsistentSSA():544:545 -> p
+    3:19:boolean consistentDefUseChains():634:650 -> p
+    3:19:boolean isConsistentSSA():545 -> p
     20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> p
-    20:20:boolean consistentDefUseChains():655 -> p
-    20:20:boolean isConsistentSSA():549 -> p
-    21:22:boolean consistentDefUseChains():657:658 -> p
-    21:22:boolean isConsistentSSA():549 -> p
+    20:20:boolean consistentDefUseChains():651 -> p
+    20:20:boolean isConsistentSSA():545 -> p
+    21:22:boolean consistentDefUseChains():653:654 -> p
+    21:22:boolean isConsistentSSA():545 -> p
     23:23:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> p
-    23:23:boolean consistentDefUseChains():660 -> p
-    23:23:boolean isConsistentSSA():549 -> p
-    24:36:boolean consistentDefUseChains():660:672 -> p
-    24:36:boolean isConsistentSSA():549 -> p
-    37:37:boolean verifyValue(com.android.tools.r8.ir.code.Value):680:680 -> p
-    37:37:boolean consistentDefUseChains():672 -> p
-    37:37:boolean isConsistentSSA():549 -> p
-    38:38:boolean verifyPhi(com.android.tools.r8.ir.code.Phi):685:685 -> p
-    38:38:boolean verifyValue(com.android.tools.r8.ir.code.Value):680 -> p
-    38:38:boolean consistentDefUseChains():672 -> p
-    38:38:boolean isConsistentSSA():549 -> p
-    39:39:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):690:690 -> p
-    39:39:boolean verifyValue(com.android.tools.r8.ir.code.Value):680 -> p
-    39:39:boolean consistentDefUseChains():672 -> p
-    39:39:boolean isConsistentSSA():549 -> p
+    23:23:boolean consistentDefUseChains():656 -> p
+    23:23:boolean isConsistentSSA():545 -> p
+    24:36:boolean consistentDefUseChains():656:668 -> p
+    24:36:boolean isConsistentSSA():545 -> p
+    37:37:boolean verifyValue(com.android.tools.r8.ir.code.Value):676:676 -> p
+    37:37:boolean consistentDefUseChains():668 -> p
+    37:37:boolean isConsistentSSA():545 -> p
+    38:38:boolean verifyPhi(com.android.tools.r8.ir.code.Phi):681:681 -> p
+    38:38:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    38:38:boolean consistentDefUseChains():668 -> p
+    38:38:boolean isConsistentSSA():545 -> p
+    39:39:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):686:686 -> p
+    39:39:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    39:39:boolean consistentDefUseChains():668 -> p
+    39:39:boolean isConsistentSSA():545 -> p
     40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> p
-    40:40:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):690 -> p
-    40:40:boolean verifyValue(com.android.tools.r8.ir.code.Value):680 -> p
-    40:40:boolean consistentDefUseChains():672 -> p
-    40:40:boolean isConsistentSSA():549 -> p
-    41:43:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):691:693 -> p
-    41:43:boolean verifyValue(com.android.tools.r8.ir.code.Value):680 -> p
-    41:43:boolean consistentDefUseChains():672 -> p
-    41:43:boolean isConsistentSSA():549 -> p
-    44:44:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):691:691 -> p
-    44:44:boolean verifyValue(com.android.tools.r8.ir.code.Value):680 -> p
-    44:44:boolean consistentDefUseChains():672 -> p
-    44:44:boolean isConsistentSSA():549 -> p
-    45:45:boolean consistentDefUseChains():673:673 -> p
-    45:45:boolean isConsistentSSA():549 -> p
-    46:47:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):698:699 -> p
-    46:47:boolean consistentDefUseChains():673 -> p
-    46:47:boolean isConsistentSSA():549 -> p
+    40:40:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):686 -> p
+    40:40:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    40:40:boolean consistentDefUseChains():668 -> p
+    40:40:boolean isConsistentSSA():545 -> p
+    41:43:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):687:689 -> p
+    41:43:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    41:43:boolean consistentDefUseChains():668 -> p
+    41:43:boolean isConsistentSSA():545 -> p
+    44:44:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):687:687 -> p
+    44:44:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    44:44:boolean consistentDefUseChains():668 -> p
+    44:44:boolean isConsistentSSA():545 -> p
+    45:45:boolean consistentDefUseChains():669:669 -> p
+    45:45:boolean isConsistentSSA():545 -> p
+    46:47:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):694:695 -> p
+    46:47:boolean consistentDefUseChains():669 -> p
+    46:47:boolean isConsistentSSA():545 -> p
     48:48:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> p
-    48:48:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):699 -> p
-    48:48:boolean consistentDefUseChains():673 -> p
-    48:48:boolean isConsistentSSA():549 -> p
-    49:57:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):699:707 -> p
-    49:57:boolean consistentDefUseChains():673 -> p
-    49:57:boolean isConsistentSSA():549 -> p
-    58:58:boolean isConsistentSSA():550:550 -> p
-    59:75:boolean validThrowingInstructions():829:845 -> p
-    59:75:boolean isConsistentSSA():550 -> p
-    76:76:boolean isConsistentSSA():551:551 -> p
-    77:88:boolean noCriticalEdges():609:620 -> p
-    77:88:boolean isConsistentSSA():551 -> p
-    89:91:boolean isConsistentSSA():551:553 -> p
-    1:1:java.util.ListIterator listIterator():946:946 -> q
-    1:1:com.android.tools.r8.ir.code.IRMetadata metadata():138:138 -> r
-    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():954:956 -> s
-    1:7:int numberRemainingInstructions():962:968 -> t
-    1:7:java.lang.String toString():446:452 -> toString
-    1:1:void prepareBlocksForCatchHandlers():304:304 -> u
-    2:2:java.util.ListIterator listIterator():946:946 -> u
-    2:2:void prepareBlocksForCatchHandlers():305 -> u
+    48:48:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):695 -> p
+    48:48:boolean consistentDefUseChains():669 -> p
+    48:48:boolean isConsistentSSA():545 -> p
+    49:57:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):695:703 -> p
+    49:57:boolean consistentDefUseChains():669 -> p
+    49:57:boolean isConsistentSSA():545 -> p
+    58:58:boolean isConsistentSSA():546:546 -> p
+    59:75:boolean validThrowingInstructions():825:841 -> p
+    59:75:boolean isConsistentSSA():546 -> p
+    76:76:boolean isConsistentSSA():547:547 -> p
+    77:88:boolean noCriticalEdges():605:616 -> p
+    77:88:boolean isConsistentSSA():547 -> p
+    89:91:boolean isConsistentSSA():547:549 -> p
+    1:1:java.util.ListIterator listIterator():942:942 -> q
+    1:1:com.android.tools.r8.ir.code.IRMetadata metadata():136:136 -> r
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():950:952 -> s
+    1:7:int numberRemainingInstructions():958:964 -> t
+    1:7:java.lang.String toString():442:448 -> toString
+    1:1:void prepareBlocksForCatchHandlers():300:300 -> u
+    2:2:java.util.ListIterator listIterator():942:942 -> u
+    2:2:void prepareBlocksForCatchHandlers():301 -> u
     3:3:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> u
-    3:3:void prepareBlocksForCatchHandlers():306 -> u
-    4:7:void prepareBlocksForCatchHandlers():307:310 -> u
-    8:8:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():56:56 -> u
-    8:8:void prepareBlocksForCatchHandlers():310 -> u
-    9:9:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> u
-    9:9:void prepareBlocksForCatchHandlers():311 -> u
-    10:11:void prepareBlocksForCatchHandlers():312:313 -> u
-    12:12:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> u
-    12:12:void prepareBlocksForCatchHandlers():315 -> u
-    13:23:void prepareBlocksForCatchHandlers():316:326 -> u
-    24:24:java.lang.Object com.android.tools.r8.utils.ListUtils.first(java.util.List):16:16 -> u
-    24:24:void prepareBlocksForCatchHandlers():326 -> u
-    25:27:void prepareBlocksForCatchHandlers():326:328 -> u
-    28:29:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> u
-    28:29:void prepareBlocksForCatchHandlers():328 -> u
-    30:31:void prepareBlocksForCatchHandlers():329:330 -> u
-    32:32:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> u
-    32:32:void prepareBlocksForCatchHandlers():330 -> u
-    33:37:void prepareBlocksForCatchHandlers():331:335 -> u
-    1:1:void removeAllTrivialPhis():1085:1085 -> v
-    1:3:java.util.Set removeUnreachableBlocks():1204:1206 -> w
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1221:1221 -> w
-    4:4:java.util.Set removeUnreachableBlocks():1206 -> w
+    3:3:void prepareBlocksForCatchHandlers():302 -> u
+    4:7:void prepareBlocksForCatchHandlers():303:306 -> u
+    8:8:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():57:57 -> u
+    8:8:void prepareBlocksForCatchHandlers():306 -> u
+    9:9:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> u
+    9:9:void prepareBlocksForCatchHandlers():307 -> u
+    10:11:void prepareBlocksForCatchHandlers():308:309 -> u
+    12:12:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> u
+    12:12:void prepareBlocksForCatchHandlers():311 -> u
+    13:25:void prepareBlocksForCatchHandlers():312:324 -> u
+    26:27:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> u
+    26:27:void prepareBlocksForCatchHandlers():324 -> u
+    28:29:void prepareBlocksForCatchHandlers():325:326 -> u
+    30:30:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> u
+    30:30:void prepareBlocksForCatchHandlers():326 -> u
+    31:35:void prepareBlocksForCatchHandlers():327:331 -> u
+    1:1:void removeAllTrivialPhis():1081:1081 -> v
+    1:3:java.util.Set removeUnreachableBlocks():1200:1202 -> w
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1217:1217 -> w
+    4:4:java.util.Set removeUnreachableBlocks():1202 -> w
     5:5:void com.android.tools.r8.ir.code.BasicBlockIterator.<init>(com.android.tools.r8.ir.code.IRCode):17:17 -> w
-    5:5:java.util.ListIterator listIterator():946 -> w
-    5:5:java.util.Set removeUnreachableBlocks():1207 -> w
+    5:5:java.util.ListIterator listIterator():942 -> w
+    5:5:java.util.Set removeUnreachableBlocks():1203 -> w
     6:6:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> w
-    6:6:java.util.Set removeUnreachableBlocks():1208 -> w
+    6:6:java.util.Set removeUnreachableBlocks():1204 -> w
     7:7:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():32:32 -> w
     7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():9 -> w
-    7:7:java.util.Set removeUnreachableBlocks():1209 -> w
-    8:9:java.util.Set removeUnreachableBlocks():1210:1211 -> w
+    7:7:java.util.Set removeUnreachableBlocks():1205 -> w
+    8:9:java.util.Set removeUnreachableBlocks():1206:1207 -> w
     10:11:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():81:82 -> w
-    10:11:java.util.Set removeUnreachableBlocks():1212 -> w
-    12:12:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():56:56 -> w
+    10:11:java.util.Set removeUnreachableBlocks():1208 -> w
+    12:12:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():57:57 -> w
     12:12:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():82 -> w
-    12:12:java.util.Set removeUnreachableBlocks():1212 -> w
-    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> w
+    12:12:java.util.Set removeUnreachableBlocks():1208 -> w
+    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> w
     13:13:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():83 -> w
-    13:13:java.util.Set removeUnreachableBlocks():1212 -> w
+    13:13:java.util.Set removeUnreachableBlocks():1208 -> w
     14:17:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():84:87 -> w
-    14:17:java.util.Set removeUnreachableBlocks():1212 -> w
-    18:19:java.util.Set removeUnreachableBlocks():1215:1216 -> w
-    1:1:int reserveMarkingColor():1106:1106 -> x
-    2:2:boolean anyMarkingColorAvailable():1120:1120 -> x
-    2:2:int reserveMarkingColor():1106 -> x
-    3:11:int reserveMarkingColor():1106:1114 -> x
-    12:13:boolean verifyNoBlocksMarked(int):472:473 -> x
-    12:13:int reserveMarkingColor():1114 -> x
-    1:24:void splitCriticalEdges():339:362 -> y
-    25:34:void splitCriticalEdges():361:370 -> y
-    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList depthFirstSorting():497:520 -> z
-    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():490 -> z
-    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():491:491 -> z
-    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):526:537 -> z
-    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():492 -> z
+    14:17:java.util.Set removeUnreachableBlocks():1208 -> w
+    18:19:java.util.Set removeUnreachableBlocks():1211:1212 -> w
+    1:1:int reserveMarkingColor():1102:1102 -> x
+    2:2:boolean anyMarkingColorAvailable():1116:1116 -> x
+    2:2:int reserveMarkingColor():1102 -> x
+    3:11:int reserveMarkingColor():1102:1110 -> x
+    12:13:boolean verifyNoBlocksMarked(int):468:469 -> x
+    12:13:int reserveMarkingColor():1110 -> x
+    1:24:void splitCriticalEdges():335:358 -> y
+    25:34:void splitCriticalEdges():357:366 -> y
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList depthFirstSorting():493:516 -> z
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():486 -> z
+    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():487:487 -> z
+    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):522:533 -> z
+    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():488 -> z
 com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.D.b.h0:
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):91:92 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):89:90 -> <init>
 com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.D.b.i0:
     java.util.Deque liveStackValues -> c
     java.util.Set liveValues -> a
     java.util.Set liveLocalValues -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():54:54 -> <clinit>
-    1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):64:68 -> <init>
-    1:2:boolean equals(java.lang.Object):78:79 -> equals
-    1:1:int hashCode():73:73 -> hashCode
+    1:1:void <clinit>():52:52 -> <clinit>
+    1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):62:66 -> <init>
+    1:2:boolean equals(java.lang.Object):76:77 -> equals
+    1:1:int hashCode():71:71 -> hashCode
 com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.D.b.k0:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
@@ -24900,17 +24886,17 @@
     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>
     com.android.tools.r8.ir.code.If asIf() -> C
-    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> D2
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> E2
-    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> F2
-    1:2:void invert():110:111 -> G2
-    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> G2
-    3:4:void invert():112 -> G2
-    5:5:void invert():113:113 -> G2
-    1:1:boolean isZeroTest():93:93 -> H2
-    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> I2
-    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> J2
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> K2
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> C2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> D2
+    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> E2
+    1:2:void invert():110:111 -> F2
+    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> F2
+    3:4:void invert():112 -> F2
+    5:5:void invert():113:113 -> F2
+    1:1:boolean isZeroTest():93:93 -> G2
+    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> H2
+    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> I2
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> J2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,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
@@ -24941,10 +24927,10 @@
     31:31: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
-    1:1:int maxInValueRegister():174:174 -> x2
+    1:1:int maxInValueRegister():174:174 -> w2
+    1:1:int maxOutValueRegister():179:179 -> x2
     boolean isIf() -> y1
-    1:1:int maxOutValueRegister():179:179 -> y2
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.D.b.n0:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
@@ -24979,18 +24965,18 @@
     5:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:96 -> a
     1:2:void addInValue(com.android.tools.r8.ir.code.Value):43:44 -> b
     1:1:java.lang.String toString():102:102 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.D.b.r0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():207:207 -> B0
-    boolean throwsOnNullInput() -> C2
+    boolean throwsOnNullInput() -> B2
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> F2
-    1:2:com.android.tools.r8.ir.code.Value object():60:61 -> G2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> E2
+    1:2:com.android.tools.r8.ir.code.Value object():60:61 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:boolean outTypeKnownToBeBoolean(java.util.Set):47:47 -> a
     2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52:52 -> a
@@ -25021,17 +25007,17 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):119:119 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():169:169 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
     boolean isInstanceGet() -> z1
-    int opcode() -> z2
 com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.D.b.s0:
     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>
     boolean isInstanceOf() -> A1
-    1:1:com.android.tools.r8.graph.DexType type():39:39 -> D2
+    1:1:com.android.tools.r8.graph.DexType type():39:39 -> C2
+    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> D2
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> E
-    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> E2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -25045,19 +25031,19 @@
     8:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:106 -> a
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.D.b.t0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():220:220 -> B0
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():219:219 -> B0
     boolean isInstancePut() -> B1
-    boolean throwsOnNullInput() -> C2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> E2
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> F
-    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> F2
-    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> G2
+    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
     2:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:92 -> a
@@ -25067,26 +25053,26 @@
     53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
     54:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
     55:72:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:94 -> a
-    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:130 -> a
-    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):137:147 -> a
+    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):128:129 -> a
+    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):136:146 -> a
     86:86:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):141 -> a
-    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):157:161 -> 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):178:178 -> a
-    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):198:198 -> a
-    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):203:205 -> a
-    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):203:203 -> a
-    98:98:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):210:210 -> a
-    99:99: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):230:230 -> a
-    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104:114 -> b
+    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):140 -> a
+    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):156:160 -> 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):177:177 -> a
+    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):197:197 -> a
+    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):202:204 -> a
+    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):202:202 -> a
+    98:98:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):209:209 -> a
+    99:99: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):229:229 -> a
+    1:10:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104:113 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:java.lang.String toString():193:193 -> toString
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():171:171 -> y2
-    int opcode() -> z2
+    1:1:java.lang.String toString():192:192 -> toString
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():170:170 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.D.b.u0:
     java.util.List inValues -> b
-    java.util.LinkedHashSet debugValues -> e
+    java.util.Set debugValues -> e
     boolean $assertionsDisabled -> g
     int number -> d
     com.android.tools.r8.ir.code.Value outValue -> a
@@ -25102,15 +25088,14 @@
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():595:595 -> A0
     boolean isInstanceOf() -> A1
-    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> A2
+    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> A2
     com.android.tools.r8.ir.code.Goto asGoto() -> B
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1365:1365 -> B0
     boolean isInstancePut() -> B1
-    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> B2
+    boolean throwsOnNullInput() -> B2
     com.android.tools.r8.ir.code.If asIf() -> C
     1:1:int getNumber():342:342 -> C0
     boolean isIntSwitch() -> C1
-    boolean throwsOnNullInput() -> C2
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
     boolean isIntroducingAnAlias() -> D1
@@ -25133,55 +25118,55 @@
     boolean isInvokeMethod() -> I1
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
     1:1:boolean hasOutValue():116:116 -> J0
-    1:1:boolean isInvokeMethodWithDynamicDispatch():1124:1124 -> J1
+    boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
     1:1:boolean hasPosition():75:75 -> K0
-    boolean isInvokeMethodWithReceiver() -> K1
+    boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
     1:1:java.util.List inValues():93:93 -> L0
-    boolean isInvokeMultiNewArray() -> L1
+    boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
     1:1:boolean instructionInstanceCanThrow():524:524 -> M0
-    boolean isInvokeNewArray() -> M1
+    boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     boolean instructionTypeCanThrow() -> N0
-    boolean isInvokePolymorphic() -> N1
+    boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     boolean isAdd() -> O0
-    boolean isInvokeStatic() -> O1
+    boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
     boolean isAllowedAfterThrowingInstruction() -> P0
-    boolean isInvokeSuper() -> P1
+    boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
     boolean isAnd() -> Q0
-    boolean isInvokeVirtual() -> Q1
+    boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
     boolean isArgument() -> R0
-    boolean isJumpInstruction() -> R1
+    boolean isLoad() -> R1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
     boolean isArithmeticBinop() -> S0
-    boolean isLoad() -> S1
+    boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
     boolean isArrayGet() -> T0
-    boolean isLogicalBinop() -> T1
+    boolean isMonitor() -> T1
     com.android.tools.r8.ir.code.Load asLoad() -> U
     boolean isArrayLength() -> U0
-    boolean isMonitor() -> U1
+    boolean isMonitorEnter() -> U1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     boolean isArrayPut() -> V0
-    boolean isMonitorEnter() -> V1
+    boolean isMove() -> V1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     boolean isAssume() -> W0
-    boolean isMove() -> W1
+    boolean isMoveException() -> W1
     com.android.tools.r8.ir.code.Move asMove() -> X
     boolean isAssumeDynamicType() -> X0
-    boolean isMoveException() -> X1
+    boolean isMul() -> X1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     boolean isAssumeNonNull() -> Y0
-    boolean isMul() -> Y1
+    boolean isNeg() -> Y1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     boolean isBinop() -> Z0
-    boolean isNeg() -> Z1
+    boolean isNewArrayEmpty() -> 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
@@ -25203,10 +25188,10 @@
     33:33:java.lang.String com.android.tools.r8.utils.CfgPrinter.makeUnusedValue():20:20 -> a
     33:33:void print(com.android.tools.r8.utils.CfgPrinter):318 -> a
     34:37:void print(com.android.tools.r8.utils.CfgPrinter):320:323 -> a
-    38:38:int com.android.tools.r8.ir.code.Value.getNumber():292:292 -> a
+    38:38:int com.android.tools.r8.ir.code.Value.getNumber():291:291 -> a
     38:38:void print(com.android.tools.r8.utils.CfgPrinter):323 -> a
     39:47:void print(com.android.tools.r8.utils.CfgPrinter):323:331 -> a
-    48:48:int com.android.tools.r8.ir.code.Value.getNumber():292:292 -> a
+    48:48:int com.android.tools.r8.ir.code.Value.getNumber():291:291 -> a
     48:48:void print(com.android.tools.r8.utils.CfgPrinter):331 -> a
     49:49:void print(com.android.tools.r8.utils.CfgPrinter):331:331 -> a
     50:51:void setNumber(int):346:347 -> a
@@ -25214,37 +25199,41 @@
     62:63:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction):356:357 -> a
     62:63:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
     64:64:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):460:460 -> a
-    65:68:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):103:106 -> a
+    65:68:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):105:108 -> a
     65:68:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):460 -> a
     69:70:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):463:464 -> a
     71:71:int getNumber():342:342 -> a
     71:71:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):468 -> a
-    72:104: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):412:444 -> a
-    72:104:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> a
-    105:114:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):471:480 -> a
-    115:115:int getNumber():342:342 -> a
-    115:115:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
-    116:151: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):367:402 -> a
-    116:151:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
-    152:168: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):391:407 -> a
-    152:168:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
-    169:170:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):487:488 -> a
-    171:171:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495:495 -> a
-    172:172:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():797:797 -> a
-    172:172:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
-    173:173:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():797:797 -> a
-    173:173:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
-    174:180:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):499:505 -> a
-    181:181:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
-    182:182:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):546:546 -> a
-    183:184:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1301:1302 -> a
-    185:188:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1308:1311 -> a
-    189:191:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1316:1318 -> a
-    192:198:boolean verifyValidPositionInfo(boolean):1385:1391 -> a
-    199:199:boolean verifyValidPositionInfo(boolean):1387:1387 -> a
+    72:72:int getNumber():342:342 -> a
+    72:72:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):468 -> a
+    73:105: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):412:444 -> a
+    73:105:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> a
+    106:115:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):471:480 -> a
+    116:116:int getNumber():342:342 -> a
+    116:116:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
+    117:117:int getNumber():342:342 -> a
+    117:117:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
+    118:153: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):367:402 -> a
+    118:153:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
+    154:170: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):391:407 -> a
+    154:170:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
+    171:172:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):487:488 -> a
+    173:173:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495:495 -> a
+    174:174:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
+    174:174:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
+    175:175:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
+    175:175:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
+    176:182:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):499:505 -> a
+    183:183:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
+    184:184:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):546:546 -> a
+    185:186:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1301:1302 -> a
+    187:190:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1308:1311 -> a
+    191:193:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1316:1318 -> a
+    194:200:boolean verifyValidPositionInfo(boolean):1385:1391 -> a
+    201:201:boolean verifyValidPositionInfo(boolean):1387:1387 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
     boolean isCheckCast() -> a1
-    boolean isNewArrayEmpty() -> a2
+    boolean isNewArrayFilledData() -> a2
     com.android.tools.r8.ir.code.Add asAdd() -> b
     1:4:void addInValue(com.android.tools.r8.ir.code.Value):98:101 -> b
     5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):171:174 -> b
@@ -25254,111 +25243,111 @@
     18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1323:1334 -> b
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
     boolean isCmp() -> b1
-    boolean isNewArrayFilledData() -> b2
+    boolean isNewInstance() -> b2
     com.android.tools.r8.ir.code.And asAnd() -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
     1:7:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):152:158 -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
     boolean isConstClass() -> c1
-    boolean isNewInstance() -> c2
+    boolean isNot() -> c2
     com.android.tools.r8.ir.code.Argument asArgument() -> d
     1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):218:226 -> d
     10:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):554:558 -> d
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
     boolean isConstInstruction() -> d1
-    boolean isNot() -> d2
+    boolean isNumberConversion() -> d2
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> e
     1:4:void setOutValue(com.android.tools.r8.ir.code.Value):124:127 -> e
     com.android.tools.r8.ir.code.Not asNot() -> e0
     boolean isConstMethodHandle() -> e1
-    boolean isNumberConversion() -> e2
+    boolean isOr() -> e2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
     1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):132:136 -> f
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
     boolean isConstMethodType() -> f1
-    boolean isOr() -> f2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
     com.android.tools.r8.ir.code.Or asOr() -> g0
     boolean isConstNumber() -> g1
-    boolean isOutConstant() -> g2
+    boolean isPop() -> g2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
     com.android.tools.r8.ir.code.Rem asRem() -> h0
     boolean isConstString() -> h1
-    boolean isPop() -> h2
+    boolean isRem() -> h2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
     com.android.tools.r8.ir.code.Return asReturn() -> i0
     1:4:boolean isCreatingArray():1280:1283 -> i1
-    boolean isRem() -> i2
+    boolean isReturn() -> i2
     com.android.tools.r8.ir.code.Assume asAssumeDynamicType() -> j
     com.android.tools.r8.ir.code.Shl asShl() -> j0
     1:1:boolean isCreatingInstanceOrArray():1287:1287 -> j1
-    boolean isReturn() -> j2
+    boolean isShl() -> j2
     com.android.tools.r8.ir.code.Assume asAssumeNonNull() -> k
     com.android.tools.r8.ir.code.Shr asShr() -> k0
     1:5:boolean isDebugInstruction():1084:1088 -> k1
-    boolean isShl() -> k2
+    boolean isShr() -> k2
     com.android.tools.r8.ir.code.Binop asBinop() -> l
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
     boolean isDebugLocalRead() -> l1
-    boolean isShr() -> l2
+    boolean isStaticGet() -> l2
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
     boolean isDebugLocalUninitialized() -> m1
-    boolean isStaticGet() -> m2
+    boolean isStaticPut() -> m2
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     com.android.tools.r8.ir.code.Store asStore() -> n0
     boolean isDebugLocalWrite() -> n1
-    boolean isStaticPut() -> n2
+    boolean isStore() -> n2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
     boolean isDebugLocalsChange() -> o1
-    boolean isStore() -> o2
+    boolean isStringSwitch() -> o2
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> p
     com.android.tools.r8.ir.code.Sub asSub() -> p0
     boolean isDebugPosition() -> p1
-    boolean isStringSwitch() -> p2
+    boolean isSub() -> p2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
     boolean isDexItemBasedConstString() -> q1
-    boolean isSub() -> q2
+    boolean isSwap() -> q2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
     boolean isDiv() -> r1
-    boolean isSwap() -> r2
+    boolean isSwitch() -> r2
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
     boolean isDup() -> s1
-    boolean isSwitch() -> s2
+    boolean isThrow() -> s2
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     com.android.tools.r8.ir.code.Xor asXor() -> t0
     boolean isDup2() -> t1
-    boolean isThrow() -> t2
+    boolean isUnop() -> t2
     1:14:java.lang.String toString():298:311 -> toString
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
     1:2:void clearBlock():273:274 -> u0
     1:1:boolean isFieldGet():856:856 -> u1
-    boolean isUnop() -> u2
+    boolean isUshr() -> u2
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
     1:5:void clearDebugValues():245:249 -> v0
     boolean isFieldInstruction() -> v1
-    boolean isUshr() -> v2
+    boolean isXor() -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
     1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1275:1275 -> w0
     1:1:boolean isFieldPut():860:860 -> w1
-    boolean isXor() -> w2
+    int maxInValueRegister() -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
     1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():257:258 -> x0
     boolean isGoto() -> x1
-    int maxInValueRegister() -> x2
+    int maxOutValueRegister() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
     1:1:java.util.Set getDebugValues():599:599 -> y0
     boolean isIf() -> y1
-    int maxOutValueRegister() -> y2
+    int opcode() -> y2
     com.android.tools.r8.ir.code.Dup asDup() -> z
     1:1:java.lang.String getInstructionName():293:293 -> z0
     boolean isInstanceGet() -> z1
-    int opcode() -> z2
+    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> z2
 com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.D.b.v0:
     1:3:java.lang.Object com.android.tools.r8.ir.code.NextUntilIterator.nextUntil(java.util.function.Predicate):18:20 -> a
     1:3:java.lang.Object com.android.tools.r8.ir.code.NextUntilIterator.nextUntil(java.util.function.Predicate):0 -> a
@@ -25379,13 +25368,13 @@
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):32:34 -> <init>
     boolean isIntSwitch() -> C1
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> G
-    1:7:boolean valid():55:61 -> H2
-    1:1:int getFirstKey():177:177 -> J2
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> K2
-    3:3:int getKey(int):206:206 -> K2
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> K2
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> K2
-    1:1:int[] getKeys():210:210 -> L2
+    1:7:boolean valid():55:61 -> G2
+    1:1:int getFirstKey():177:177 -> I2
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> J2
+    3:3:int getKey(int):206:206 -> J2
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> J2
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> J2
+    1:1:int[] getKeys():210:210 -> K2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> a
     1:1:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):48:48 -> a
@@ -25435,34 +25424,34 @@
     5:5:int getKey(int):206:206 -> toString
     5:5:java.lang.String toString():268 -> toString
     6:11:java.lang.String toString():268:273 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.D.b.A0:
     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.util.List arguments():103:103 -> D2
+    1:1:java.util.List arguments():103:103 -> C2
+    com.android.tools.r8.graph.DexType getReturnType() -> D2
     boolean isInvoke() -> E1
-    com.android.tools.r8.graph.DexType getReturnType() -> E2
-    com.android.tools.r8.ir.code.Invoke$Type getType() -> F2
-    java.lang.String getTypeString() -> G2
+    com.android.tools.r8.ir.code.Invoke$Type getType() -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:int requiredArgumentRegisters():108:108 -> G2
+    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> G2
+    2:2:int requiredArgumentRegisters():109 -> G2
     com.android.tools.r8.ir.code.Invoke asInvoke() -> H
-    1:1:int requiredArgumentRegisters():108:108 -> H2
-    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> H2
-    2:2:int requiredArgumentRegisters():109 -> H2
-    1:1:java.util.List arguments():103:103 -> I2
-    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> I2
-    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> I2
-    3:3:java.util.List arguments():103:103 -> I2
-    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> I2
-    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> I2
-    6:6:java.util.List arguments():103:103 -> I2
-    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> I2
-    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> I2
-    8:8:java.util.List arguments():103:103 -> I2
-    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> I2
-    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> I2
+    1:1:java.util.List arguments():103:103 -> H2
+    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> H2
+    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> H2
+    3:3:java.util.List arguments():103:103 -> H2
+    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> H2
+    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> H2
+    6:6:java.util.List arguments():103:103 -> H2
+    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> H2
+    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> H2
+    8:8:java.util.List arguments():103:103 -> H2
+    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> H2
+    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> H2
     boolean instructionTypeCanThrow() -> N0
     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
@@ -25484,13 +25473,13 @@
     44:44:java.util.List arguments():103:103 -> a
     44:44:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):130 -> a
     45:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):130:139 -> a
-    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> a
+    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):140 -> a
     56:58:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):141:143 -> a
-    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> a
+    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     59:59:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):143 -> a
     60:60:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):143:143 -> a
-    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> a
+    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     61:61:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):144 -> a
     62:63:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):145:146 -> a
     64:77:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):165:178 -> a
@@ -25508,7 +25497,7 @@
     1:1:java.util.List arguments():103:103 -> b
     1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):153 -> b
     2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):153:154 -> b
-    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> b
+    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> b
     4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):154 -> b
     5:5:java.util.List arguments():103:103 -> b
     5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):155 -> b
@@ -25516,7 +25505,7 @@
     7:7:java.util.List arguments():103:103 -> b
     7:7:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):156 -> b
     8:9:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):156:157 -> b
-    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> b
+    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> b
     10:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):158 -> b
     1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):240:240 -> c
     2:2:java.util.List arguments():103:103 -> c
@@ -25525,10 +25514,10 @@
     11:11:java.util.List arguments():103:103 -> c
     11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255 -> c
     12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255:256 -> c
-    1:1:java.util.List arguments():103:103 -> x2
-    1:1:int maxInValueRegister():213 -> x2
-    2:4:int maxInValueRegister():213:215 -> x2
-    int maxOutValueRegister() -> y2
+    1:1:java.util.List arguments():103:103 -> w2
+    1:1:int maxInValueRegister():213 -> w2
+    2:4:int maxInValueRegister():213:215 -> w2
+    int maxOutValueRegister() -> x2
     1:1:java.lang.String getInstructionName():269:269 -> z0
 com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.D.b.z0:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
@@ -25546,21 +25535,23 @@
     1:1:void <init>(java.lang.String,int):26:26 -> <init>
     1:1:com.android.tools.r8.ir.code.Invoke$Type[] values():26:26 -> a
     2:18:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):38:54 -> a
-    19:29:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):42:52 -> a
-    30:40:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):40:50 -> a
-    41:44:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):44:47 -> a
+    19:19:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):52:52 -> a
+    20:20:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):50:50 -> a
+    21:24:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):44:47 -> a
+    25:25:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):42:42 -> a
+    26:26:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):40:40 -> a
 com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.D.b.B0:
     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>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> E2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> E2
     boolean isInvokeCustom() -> F1
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> F2
-    java.lang.String getTypeString() -> G2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> H2
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> I
     boolean hasInvariantOutType() -> I0
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> I2
     1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):66:94 -> a
     30:42:boolean verifyLambdaInterfaces(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,java.util.Set,com.android.tools.r8.graph.DexType):47:59 -> a
     30:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):94 -> a
@@ -25598,104 +25589,99 @@
     2:2:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     2:2:java.lang.String toString():120 -> toString
     3:3:java.lang.String toString():120:120 -> toString
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.D.b.C0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:45 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():65:65 -> F2
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):44:47 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeDirect() -> G1
-    java.lang.String getTypeString() -> G2
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
-    1:1:boolean isInterface():55:55 -> K2
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:94 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):111:111 -> 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):150:150 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):155:155 -> 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):165:165 -> a
+    1:1:boolean isInterface():57:57 -> J2
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:96 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):113:113 -> 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):159:159 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):164:164 -> 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):174:174 -> a
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeDirect):184:184 -> a
-    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):60 -> a
-    25:61:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):234:270 -> a
-    62:62:boolean com.android.tools.r8.ir.code.Value.isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):987:987 -> a
-    62:62:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):270 -> a
-    63:63:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):275:275 -> a
-    64:64:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    64:64:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):275 -> a
-    65:65:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):275:275 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    66:66:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):275 -> a
-    67:67:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):269:269 -> a
-    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):171:181 -> b
+    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):62 -> a
+    25:66:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):236:277 -> a
+    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    67:67:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):277 -> a
+    68:68:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):277:277 -> a
+    69:69:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    69:69:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):277 -> a
+    70:70:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):271:271 -> a
+    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):180:190 -> b
     12:12:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> b
-    12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):181 -> b
-    13:52:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):187:226 -> b
-    1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):285:298 -> d
-    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):126:141 -> e
-    int opcode() -> z2
+    12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):190 -> b
+    13:42:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):196:225 -> b
+    1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):287:300 -> d
+    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128:143 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):152:153 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.D.b.D0:
     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>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():41:41 -> F2
-    java.lang.String getTypeString() -> G2
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeInterface() -> H1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:70 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> 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):105:105 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):110:110 -> 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):120:120 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> 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):124:124 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):129:129 -> 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):139:139 -> a
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeInterface):189:189 -> a
-    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36 -> a
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):90:97 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:93 -> e
-    int opcode() -> z2
+    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39 -> a
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> e
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:96 -> e
+    1:10:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):109:118 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.D.b.E0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):33:34 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():39:39 -> E2
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:30 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():35:35 -> D2
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():39:39 -> H2
     boolean hasInvariantOutType() -> I0
     boolean isInvokeMethod() -> I1
-    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():43:43 -> I2
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,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
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):48:48 -> a
-    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():43:43 -> a
-    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):48 -> a
-    3:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):128:133 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44:44 -> a
+    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():39:39 -> a
+    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44 -> a
+    3:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):79:84 -> a
     9:9:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):138 -> a
-    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):138:138 -> a
+    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89 -> a
+    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89:89 -> a
     11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):139 -> a
-    12:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):139:140 -> a
+    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90 -> a
+    12:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90:91 -> a
     14:14:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):140 -> a
-    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):140:140 -> a
+    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):91 -> a
+    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):91:91 -> a
     16:16:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):132 -> a
-    17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):151:159 -> a
-    26:26:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):170:170 -> a
+    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):83 -> a
+    17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):102:110 -> a
+    26:26:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):121:121 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):180:180 -> d
+    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
-    1:21:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):76:96 -> f
-    22:22:com.android.tools.r8.graph.DexMethod getInvokedMethod():43:43 -> f
-    22:22:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101 -> f
-    23:26:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101:104 -> f
-    27:35:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):103:111 -> f
-    1:1:java.lang.String toString():53:53 -> toString
+    java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
+    1:1:java.lang.String toString():49:49 -> toString
 com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.D.b.F0:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):25:25 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():66:66 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:2:com.android.tools.r8.ir.code.Value getReceiver():39:40 -> J2
-    boolean isInvokeMethodWithReceiver() -> K1
+    boolean throwsOnNullInput() -> B2
+    1:2:com.android.tools.r8.ir.code.Value getReceiver():39:40 -> I2
+    boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
     1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,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):50:50 -> a
     2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):56:56 -> a
@@ -25706,16 +25692,16 @@
     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>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> E2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> E2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> F2
-    java.lang.String getTypeString() -> G2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> D2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> H2
     boolean hasInvariantOutType() -> I0
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> I2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> J2
-    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> J2
-    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> J2
-    boolean isInvokeMultiNewArray() -> L1
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> I2
+    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> I2
+    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> I2
+    boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> a
     2:2: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
@@ -25741,20 +25727,20 @@
     2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):176 -> b
     3:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):176:181 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.D.b.H0:
     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>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> E2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> E2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> F2
-    java.lang.String getTypeString() -> G2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> D2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> H2
     boolean hasInvariantOutType() -> I0
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> I2
-    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> J2
-    boolean isInvokeNewArray() -> M1
+    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> I2
+    boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:89 -> a
     20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> a
@@ -25778,17 +25764,17 @@
     3:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:194 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():65:65 -> toString
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.D.b.I0:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
     1:1:void <clinit>():28:28 -> <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):33:34 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():49:49 -> E2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():54:54 -> F2
-    java.lang.String getTypeString() -> G2
-    1:1:com.android.tools.r8.graph.DexProto getProto():63:63 -> J2
-    boolean isInvokePolymorphic() -> N1
+    1:1:com.android.tools.r8.graph.DexType getReturnType():49:49 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():54:54 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexProto getProto():63:63 -> I2
+    boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
     1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:75 -> a
     8:8:com.android.tools.r8.graph.DexProto getProto():63:63 -> a
@@ -25809,80 +25795,83 @@
     42:42:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.D.b.J0:
     boolean itf -> k
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):35:36 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):40:41 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> F2
-    java.lang.String getTypeString() -> G2
-    boolean isInvokeStatic() -> O1
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:39 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):43:44 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():59:59 -> E2
+    java.lang.String getTypeString() -> F2
+    boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:85 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):90:90 -> 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):129:129 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,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
-    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):145:145 -> a
-    24:24: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
-    25:25:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):202:202 -> a
-    26:26:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
-    26:26:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):51 -> a
-    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):213:213 -> a
-    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):161:198 -> b
-    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):105:120 -> e
-    int opcode() -> z2
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:88 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):93:93 -> 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):139:139 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,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):149:149 -> a
+    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):155:155 -> a
+    24:24: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):165:165 -> a
+    25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):54 -> a
+    26:26:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):212:212 -> a
+    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):223:223 -> a
+    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):171:208 -> b
+    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):108:123 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):132:133 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.D.b.K0:
     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>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():43:43 -> F2
-    java.lang.String getTypeString() -> G2
-    boolean isInvokeSuper() -> P1
+    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>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> E2
+    java.lang.String getTypeString() -> F2
+    boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
-    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:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):110:110 -> 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):120:120 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
+    20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
+    21:21:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):121:121 -> 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):131:131 -> a
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeSuper):214:214 -> a
-    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38 -> a
-    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:101 -> e
-    int opcode() -> z2
+    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):100:104 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):114:115 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.D.b.L0:
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> F2
-    java.lang.String getTypeString() -> G2
-    boolean isInvokeVirtual() -> Q1
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> E2
+    java.lang.String getTypeString() -> F2
+    boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> 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:108 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):113:113 -> 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):123:123 -> a
-    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):180:180 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> 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):127:127 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):132:132 -> 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):142:142 -> a
+    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):199:199 -> a
     25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):219:219 -> a
-    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39 -> a
-    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):129:139 -> b
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42 -> a
+    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):148:158 -> b
     12:12:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> b
-    12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):139 -> b
-    13:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):145:169 -> b
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:96 -> e
-    int opcode() -> z2
+    12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):158 -> b
+    13:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):164:188 -> b
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:103 -> e
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):99:99 -> e
+    1:10:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):112:121 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.D.b.M0:
     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() -> D2
+    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> C2
     boolean hasInvariantOutType() -> I0
-    boolean isJumpInstruction() -> R1
+    boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
@@ -25920,9 +25909,9 @@
     2:2:void set(java.lang.Object):14 -> set
 com.android.tools.r8.ir.code.Load -> com.android.tools.r8.D.b.O0:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> C2
     boolean hasInvariantOutType() -> I0
-    boolean isLoad() -> S1
+    boolean isLoad() -> R1
     com.android.tools.r8.ir.code.Load asLoad() -> U
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -25934,15 +25923,15 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():207:207 -> 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):67 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():61:61 -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():61:61 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.D.b.P0:
     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() -> I2
-    boolean isLogicalBinop() -> T1
+    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> H2
+    boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     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
@@ -25989,14 +25978,14 @@
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type,com.android.tools.r8.ir.code.Value):31:32 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():156:156 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:1:boolean isEnter():50:50 -> D2
-    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> E2
+    boolean throwsOnNullInput() -> B2
+    1:1:boolean isEnter():50:50 -> C2
+    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isMonitor() -> U1
-    1:1:boolean isEnter():50:50 -> V1
-    1:1:boolean isMonitorEnter():103 -> V1
+    boolean isMonitor() -> T1
+    1:1:boolean isEnter():50:50 -> U1
+    1:1:boolean isMonitorEnter():103 -> U1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:71 -> a
@@ -26007,10 +25996,10 @@
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> 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):114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():87:87 -> y2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():87:87 -> x2
+    int opcode() -> y2
     1:7:java.lang.String getInstructionName():119:125 -> z0
-    int opcode() -> z2
 com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.D.b.R0:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> c
@@ -26022,11 +26011,11 @@
     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>
+    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> C2
     1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():86:87 -> D0
-    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> D2
-    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> E2
+    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> D2
     boolean hasInvariantOutType() -> I0
-    boolean isMove() -> W1
+    boolean isMove() -> V1
     com.android.tools.r8.ir.code.Move asMove() -> X
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):46:46 -> a
@@ -26037,28 +26026,24 @@
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:118 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():215:215 -> 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):103 -> a
-    1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):128:129 -> b
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    3:3:boolean verifyTypes(com.android.tools.r8.graph.AppView):129 -> b
-    4:4:boolean verifyTypes(com.android.tools.r8.graph.AppView):129:129 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:boolean isOutConstant():81:81 -> g2
+    1:1:boolean isOutConstant():81:81 -> f2
     1:1:java.lang.String toString():76:76 -> toString
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
     2:2:java.lang.String toString():76 -> toString
     3:3:java.lang.String toString():76:76 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.D.b.U0:
     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:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> D2
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> C2
     boolean hasInvariantOutType() -> I0
-    boolean isMoveException() -> X1
+    boolean isMoveException() -> W1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
@@ -26066,7 +26051,7 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
     2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:46 -> a
     4:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:65 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1398:1398 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1393:1393 -> a
     8:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):65 -> a
     9:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> a
     10:11:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):83:84 -> a
@@ -26078,14 +26063,14 @@
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():219:219 -> 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):90 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():51:51 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():51:51 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.D.b.V0:
     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>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> I2
-    boolean isMul() -> Y1
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> H2
+    boolean isMul() -> X1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -26103,13 +26088,13 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.D.b.W0:
     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>
-    boolean isNeg() -> Z1
+    boolean isNeg() -> Y1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     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
@@ -26122,16 +26107,17 @@
     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
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.D.b.X0:
     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>
-    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> D2
+    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> C2
     boolean hasInvariantOutType() -> I0
     1:4:boolean instructionInstanceCanThrow():77:80 -> M0
     boolean instructionTypeCanThrow() -> N0
+    boolean isNewArrayEmpty() -> Z1
     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
@@ -26146,16 +26132,15 @@
     19:19:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):138:138 -> a
     20:20:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     20:20:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):138 -> a
-    boolean isNewArrayEmpty() -> a2
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():41:41 -> toString
     2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():41 -> toString
     3:3:java.lang.String toString():41:41 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.D.b.Y0:
     long size -> i
     short[] data -> j
@@ -26163,7 +26148,7 @@
     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>
-    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -26178,57 +26163,57 @@
     22:22:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):153:153 -> a
     23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayFilledData():227:227 -> a
     23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):105 -> a
+    boolean isNewArrayFilledData() -> a2
     1:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):134:141 -> b
-    boolean isNewArrayFilledData() -> b2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():83:83 -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():83:83 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.D.b.Z0:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType clazz -> h
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):34:34 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):31:36 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():50:50 -> D2
-    1:1:boolean isSpillingAllowed():199:199 -> E2
-    1:1:void markNoSpilling():195:195 -> F2
+    1:1:void <clinit>():25:25 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):31:31 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):28:33 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value dest():47:47 -> C2
+    1:1:boolean isSpillingAllowed():184:184 -> D2
+    1:1:void markNoSpilling():180:180 -> E2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46:46 -> a
-    2:2:com.android.tools.r8.ir.code.Value dest():50:50 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
-    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:56 -> a
-    5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> a
-    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):99:99 -> a
-    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):109:109 -> a
-    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):114:114 -> a
-    9:9:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):119:119 -> a
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):124:124 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
+    2:2:com.android.tools.r8.ir.code.Value dest():47:47 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52 -> a
+    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:53 -> a
+    5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):63:63 -> 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):96:96 -> a
+    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):106:106 -> a
+    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
+    9:9:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):116:116 -> a
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):121:121 -> a
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):124 -> a
-    12:12: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):134:134 -> a
-    13:13:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):170:170 -> a
-    14:14:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):191:191 -> a
+    11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):121 -> a
+    12:12: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):131:131 -> a
+    13:13:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):167:167 -> a
+    14:14:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):176:176 -> a
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    1:1:boolean verifyTypes(com.android.tools.r8.graph.AppView):220 -> b
-    2:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):220:223 -> b
-    6:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):222:224 -> b
+    1:1:boolean verifyTypes(com.android.tools.r8.graph.AppView):205 -> b
+    2:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):205:208 -> b
+    6:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):207:209 -> b
     9:9:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
-    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):224 -> b
-    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):224:224 -> b
-    11:51:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:180 -> b
-    52:52:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):145:145 -> b
-    53:53:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):210:210 -> b
-    1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):204:214 -> c
-    boolean isNewInstance() -> c2
+    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):209 -> b
+    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):209:209 -> b
+    11:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):137:164 -> b
+    39:39:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):142:142 -> b
+    40:40:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):195:195 -> b
+    boolean isNewInstance() -> b2
+    1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:199 -> c
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
-    1:1:java.lang.String toString():61:61 -> toString
-    1:1:int maxInValueRegister():71:71 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:java.lang.String toString():58:58 -> toString
+    1:1:int maxInValueRegister():68:68 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Not -> com.android.tools.r8.D.b.a1:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
@@ -26244,9 +26229,9 @@
     38:38:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> 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
-    boolean isNot() -> d2
+    boolean isNot() -> c2
     com.android.tools.r8.ir.code.Not asNot() -> e0
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.D.b.b1:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
@@ -26275,9 +26260,9 @@
     219:219:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):157:157 -> a
     220:220:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):162:162 -> a
     221:221:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
-    boolean isNumberConversion() -> e2
+    boolean isNumberConversion() -> d2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.D.b.c1:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
@@ -26306,8 +26291,8 @@
     60:60:boolean isWide():62:62 -> a
 com.android.tools.r8.ir.code.Or -> com.android.tools.r8.D.b.d1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26319,9 +26304,9 @@
     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
-    boolean isOr() -> f2
+    boolean isOr() -> e2
     com.android.tools.r8.ir.code.Or asOr() -> g0
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.D.b.f1:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
@@ -26329,93 +26314,93 @@
     boolean isStackPhi -> u
     boolean $assertionsDisabled -> w
     com.android.tools.r8.ir.code.BasicBlock block -> r
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):54:54 -> <init>
-    2:21:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):38:57 -> <init>
-    boolean isConstant() -> E
-    boolean isPhi() -> J
-    1:2:boolean isValueOnStack():346:347 -> M
-    1:1:void markNonDebugLocalRead():152:152 -> Q
-    1:1:boolean needsRegister():369:369 -> R
-    1:4: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):77:80 -> a
-    5:27:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):102:124 -> a
-    28:29:void appendOperand(com.android.tools.r8.ir.code.Value):163:164 -> a
-    28:29:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):125 -> a
-    30:30:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):127:127 -> a
-    31:31:void throwUndefinedValueError():156:156 -> a
-    31:31:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):104 -> a
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):53:53 -> <init>
+    2:21:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):37:56 -> <init>
+    boolean isConstant() -> D
+    boolean isPhi() -> I
+    1:2:boolean isValueOnStack():345:346 -> L
+    1:1:void markNonDebugLocalRead():151:151 -> P
+    1:1:boolean needsRegister():368:368 -> Q
+    1:4: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):76:79 -> a
+    5:27:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):101:123 -> a
+    28:29:void appendOperand(com.android.tools.r8.ir.code.Value):162:163 -> a
+    28:29:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):124 -> a
+    30:30:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):126:126 -> a
+    31:31:void throwUndefinedValueError():155:155 -> a
+    31:31:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):103 -> a
     32:32:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    32:32:void throwUndefinedValueError():156 -> a
-    32:32:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):104 -> a
+    32:32:void throwUndefinedValueError():155 -> a
+    32:32:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):103 -> a
     33:33:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     33:33:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    33:33:void throwUndefinedValueError():156 -> a
-    33:33:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):104 -> a
-    34:34:void throwUndefinedValueError():156:156 -> a
-    34:34:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):104 -> a
-    35:39:void addOperands(java.util.List,boolean):138:142 -> a
-    40:41:void appendOperand(com.android.tools.r8.ir.code.Value):163:164 -> a
-    40:41:void addOperands(java.util.List,boolean):143 -> a
-    42:42:void removeTrivialPhi():228:228 -> a
-    42:42:void addOperands(java.util.List,boolean):146 -> a
-    43:43:void throwUndefinedValueError():156:156 -> a
-    43:43:void addOperands(java.util.List,boolean):140 -> a
+    33:33:void throwUndefinedValueError():155 -> a
+    33:33:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):103 -> a
+    34:34:void throwUndefinedValueError():155:155 -> a
+    34:34:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):103 -> a
+    35:39:void addOperands(java.util.List,boolean):137:141 -> a
+    40:41:void appendOperand(com.android.tools.r8.ir.code.Value):162:163 -> a
+    40:41:void addOperands(java.util.List,boolean):142 -> a
+    42:42:void removeTrivialPhi():227:227 -> a
+    42:42:void addOperands(java.util.List,boolean):145 -> a
+    43:43:void throwUndefinedValueError():155:155 -> a
+    43:43:void addOperands(java.util.List,boolean):139 -> a
     44:44:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    44:44:void throwUndefinedValueError():156 -> a
-    44:44:void addOperands(java.util.List,boolean):140 -> a
+    44:44:void throwUndefinedValueError():155 -> a
+    44:44:void addOperands(java.util.List,boolean):139 -> 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 com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    45:45:void throwUndefinedValueError():156 -> a
-    45:45:void addOperands(java.util.List,boolean):140 -> a
-    46:46:void throwUndefinedValueError():156:156 -> a
-    46:46:void addOperands(java.util.List,boolean):140 -> a
-    47:50:void replaceOperandAt(int,com.android.tools.r8.ir.code.Value):196:199 -> a
-    51:54:void replaceOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):203:206 -> a
-    55:94:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):233:272 -> a
-    95:95:void addDefinitionsUser(java.util.Map):328:328 -> a
-    95:95:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):272 -> a
-    96:105:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):279:288 -> a
-    106:113:void print(com.android.tools.r8.utils.CfgPrinter):316:323 -> a
-    114:114:void addDefinitionsUser(java.util.Map):328:328 -> a
-    115:118:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):358:361 -> a
-    119:119:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):377:377 -> a
-    120:120:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():797:797 -> a
-    120:120:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):377 -> a
-    121:129:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):377:385 -> a
-    1:3:void abortOnInvalidDebugInfo(com.android.tools.r8.ir.code.ValueTypeConstraint):84:86 -> b
-    4:4:com.android.tools.r8.ir.code.Value getOperand(int):168:168 -> b
-    5:16:void removeOperandsByIndex(java.util.List):181:192 -> b
-    17:17:void removeDefinitionsUser(java.util.Map):332:332 -> b
-    18:18:void setIsStackPhi(boolean):351:351 -> b
-    19:20:boolean verifyIsStackPhi(java.util.Set):355:356 -> b
-    1:2:void removeOperand(int):176:177 -> c
-    1:1:void clearDefinitionsUsers():336:336 -> c0
+    45:45:void throwUndefinedValueError():155 -> a
+    45:45:void addOperands(java.util.List,boolean):139 -> a
+    46:46:void throwUndefinedValueError():155:155 -> a
+    46:46:void addOperands(java.util.List,boolean):139 -> a
+    47:47:com.android.tools.r8.ir.code.Value getOperand(int):167:167 -> a
+    48:59:void removeOperandsByIndex(java.util.List):180:191 -> a
+    60:63:void replaceOperandAt(int,com.android.tools.r8.ir.code.Value):195:198 -> a
+    64:67:void replaceOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):202:205 -> a
+    68:107:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):232:271 -> a
+    108:108:void addDefinitionsUser(java.util.Map):327:327 -> a
+    108:108:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):271 -> a
+    109:118:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):278:287 -> a
+    119:126:void print(com.android.tools.r8.utils.CfgPrinter):315:322 -> a
+    127:127:void addDefinitionsUser(java.util.Map):327:327 -> a
+    128:131:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):357:360 -> a
+    132:132:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376:376 -> a
+    133:133:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
+    133:133:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376 -> a
+    134:142:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376:384 -> a
+    1:3:void abortOnInvalidDebugInfo(com.android.tools.r8.ir.code.ValueTypeConstraint):83:85 -> b
+    4:5:void removeOperand(int):175:176 -> b
+    6:6:void removeDefinitionsUser(java.util.Map):331:331 -> b
+    7:7:void setIsStackPhi(boolean):350:350 -> b
+    8:9:boolean verifyIsStackPhi(java.util.Set):354:355 -> b
+    1:1:void clearDefinitionsUsers():335:335 -> b0
+    1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():70:70 -> c0
     com.android.tools.r8.ir.code.Phi asPhi() -> d
-    1:1:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):373:373 -> d
-    1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():71:71 -> d0
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390:390 -> e
-    2:2:java.util.List getOperands():172:172 -> e
-    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):391 -> e
-    3:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):391:392 -> e
-    1:1:java.util.List getOperands():172:172 -> e0
-    1:1:boolean isTrivialPhi():213:213 -> f0
-    1:9:java.lang.String printPhi():303:311 -> g0
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1082:1082 -> g0
-    10:10:java.lang.String printPhi():311 -> g0
-    11:12:java.lang.String printPhi():311:312 -> g0
-    1:1:void removeDeadPhi():293:293 -> h0
-    2:2:java.util.List getOperands():172:172 -> h0
-    2:2:void removeDeadPhi():295 -> h0
-    3:4:void removeDeadPhi():295:296 -> h0
-    5:5:com.android.tools.r8.ir.code.BasicBlock getBlock():71:71 -> h0
-    5:5:void removeDeadPhi():299 -> h0
-    6:6:void removeDeadPhi():299:299 -> h0
-    1:1:void removeTrivialPhi():228:228 -> i0
+    1:1:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):372:372 -> d
+    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):389:389 -> d
+    3:3:java.util.List getOperands():171:171 -> d
+    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390 -> d
+    4:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390:391 -> d
+    1:1:java.util.List getOperands():171:171 -> d0
+    1:1:boolean isTrivialPhi():212:212 -> e0
+    1:9:java.lang.String printPhi():302:310 -> f0
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1199:1199 -> f0
+    10:10:java.lang.String printPhi():310 -> f0
+    11:12:java.lang.String printPhi():310:311 -> f0
+    1:1:void removeDeadPhi():292:292 -> g0
+    2:2:java.util.List getOperands():171:171 -> g0
+    2:2:void removeDeadPhi():294 -> g0
+    3:4:void removeDeadPhi():294:295 -> g0
+    5:5:com.android.tools.r8.ir.code.BasicBlock getBlock():70:70 -> g0
+    5:5:void removeDeadPhi():298 -> g0
+    6:6:void removeDeadPhi():298:298 -> g0
+    1:1:void removeTrivialPhi():227:227 -> h0
 com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.D.b.e1:
     com.android.tools.r8.ir.code.Phi$RegisterReadType NORMAL -> a
     com.android.tools.r8.ir.code.Phi$RegisterReadType DEBUG -> b
-    1:2:void <clinit>():33:34 -> <clinit>
-    1:1:void <init>(java.lang.String,int):32:32 -> <init>
+    1:2:void <clinit>():32:33 -> <clinit>
+    1:1:void <init>(java.lang.String,int):31:31 -> <init>
 com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.D.b.g1:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue):19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -26432,10 +26417,10 @@
     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:5:void addInValue(com.android.tools.r8.ir.code.Value):34:38 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isPop() -> h2
-    1:1:int maxInValueRegister():59:59 -> x2
-    1:1:int maxOutValueRegister():64:64 -> y2
-    int opcode() -> z2
+    boolean isPop() -> g2
+    1:1:int maxInValueRegister():59:59 -> w2
+    1:1:int maxOutValueRegister():64:64 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Position -> com.android.tools.r8.D.b.h1:
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     com.android.tools.r8.graph.DexString file -> b
@@ -26462,8 +26447,8 @@
     1:19:java.lang.String toString():151 -> toString
 com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.D.b.i1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> H2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -26483,16 +26468,16 @@
     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() -> h0
-    boolean isRem() -> i2
-    int opcode() -> z2
+    boolean isRem() -> h2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Return -> com.android.tools.r8.D.b.j1:
     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>
-    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> E2
-    1:1:boolean isReturnVoid():42:42 -> F2
-    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> G2
+    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> D2
+    1:1:boolean isReturnVoid():42:42 -> E2
+    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> F2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
     2:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:87 -> a
@@ -26505,14 +26490,14 @@
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):114 -> a
     1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):56:70 -> b
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    boolean isReturn() -> j2
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():97:97 -> y2
-    int opcode() -> z2
+    boolean isReturn() -> i2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():97:97 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.D.b.k1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26525,12 +26510,12 @@
     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() -> j0
-    boolean isShl() -> k2
-    int opcode() -> z2
+    boolean isShl() -> j2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.D.b.l1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26543,8 +26528,8 @@
     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() -> k0
-    boolean isShr() -> l2
-    int opcode() -> z2
+    boolean isShr() -> k2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.D.b.m1:
     int decodedValue() -> a
 com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.D.b.n1:
@@ -26553,37 +26538,37 @@
     boolean $assertionsDisabled -> t
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:void <init>(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int):17:20 -> <init>
-    boolean isValueOnStack() -> M
-    boolean needsRegister() -> R
+    boolean isValueOnStack() -> L
+    boolean needsRegister() -> Q
     1:3:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):24:26 -> a
     4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     4:4:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):26 -> a
     5:5:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):26:26 -> a
-    6:6:void setNeedsRegister(boolean):54:54 -> a
-    1:1:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> b
-    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1082:1082 -> b
-    2:2:com.android.tools.r8.ir.code.StackValue duplicate(int):39 -> b
-    3:3:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> b
-    1:1:int getHeight():31:31 -> c0
-    1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> d0
+    6:6:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> a
+    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1199:1199 -> a
+    7:7:com.android.tools.r8.ir.code.StackValue duplicate(int):39 -> a
+    8:8:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> a
+    9:9:void setNeedsRegister(boolean):54:54 -> a
+    1:1:int getHeight():31:31 -> b0
+    1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> c0
     1:1:java.lang.String toString():59:59 -> toString
 com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.D.b.o1:
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():14:14 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.StackValue[]):19:21 -> <init>
-    boolean isValueOnStack() -> M
-    boolean needsRegister() -> R
+    boolean isValueOnStack() -> L
+    boolean needsRegister() -> Q
     1:1:void setNeedsRegister(boolean):35:35 -> a
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> c0
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> b0
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():59:59 -> t
     1:10:java.lang.String toString():40:49 -> toString
 com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.D.b.p1:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> F2
-    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> G2
+    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> E2
+    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
     2:2:com.android.tools.r8.ir.code.Value dest():49:49 -> a
@@ -26615,51 +26600,63 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:120 -> b
     1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):213:217 -> c
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
-    boolean isStaticGet() -> m2
+    boolean isStaticGet() -> l2
     1:1:java.lang.String toString():160:160 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.D.b.q1:
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
-    1:2:com.android.tools.r8.ir.code.Value value():50:51 -> F2
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):39:39 -> <init>
+    1:2:com.android.tools.r8.ir.code.Value value():54:55 -> E2
     boolean instructionTypeCanThrow() -> N0
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
-    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
-    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:66 -> a
-    31:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:81 -> a
-    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
-    52:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
-    53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
-    54:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:86 -> a
-    72:72:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):118:118 -> a
-    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):139:140 -> a
-    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):158:168 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
+    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:88 -> a
+    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:70 -> a
+    31:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:85 -> a
+    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
+    52:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:79 -> a
+    53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
+    54:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:90 -> a
+    72:72:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):122:122 -> a
+    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):177:178 -> a
+    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):196:206 -> a
     86:86:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):162 -> a
-    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):178:182 -> 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):188:188 -> a
-    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):208:208 -> a
-    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):213:215 -> a
-    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):213:213 -> a
-    98:98: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):225:225 -> a
-    99:99:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):238:238 -> a
-    1:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:118 -> b
-    23:30:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:124 -> b
-    1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):231:235 -> c
+    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):200 -> a
+    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):216:220 -> 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):226:226 -> a
+    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):246:246 -> a
+    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):251:253 -> a
+    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):251:251 -> a
+    98:98: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):263:263 -> a
+    99:99:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):276:276 -> a
+    1:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101:122 -> b
+    23:29:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):121:127 -> b
+    30:34:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):141:145 -> b
+    30:34:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    35:35:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):145 -> b
+    35:35:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    36:53:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):146:163 -> b
+    36:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    54:54:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):162:162 -> b
+    54:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    55:55:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):145 -> b
+    55:55:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):269:273 -> c
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
-    boolean isStaticPut() -> n2
-    1:1:java.lang.String toString():193:193 -> toString
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():152:152 -> y2
-    int opcode() -> z2
+    boolean isStaticPut() -> m2
+    1:1:java.lang.String toString():231:231 -> toString
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():190:190 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Store -> com.android.tools.r8.D.b.r1:
     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:com.android.tools.r8.ir.code.Value src():37:37 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> C2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52:52 -> a
@@ -26677,16 +26674,16 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):108:109 -> c
     com.android.tools.r8.ir.code.Store asStore() -> n0
-    boolean isStore() -> o2
-    1:1:int maxInValueRegister():57:57 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    boolean isStore() -> n2
+    1:1:int maxInValueRegister():57:57 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.D.b.s1:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():15:15 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString[],int[],int):21:23 -> <init>
-    1:4:boolean valid():44:47 -> H2
+    1:4:boolean valid():44:47 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void forEachCase(java.util.function.BiConsumer):37:37 -> a
     2:2:com.android.tools.r8.graph.DexString getKey(int):62:62 -> a
@@ -26697,21 +26694,21 @@
     6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> a
     7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):96:96 -> a
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
-    boolean isStringSwitch() -> p2
+    boolean isStringSwitch() -> o2
     1:4:java.lang.String toString():67:70 -> toString
     5:5:com.android.tools.r8.graph.DexString getKey(int):62:62 -> toString
     5:5:java.lang.String toString():71 -> toString
     6:11:java.lang.String toString():71:76 -> toString
-    1:1:int maxInValueRegister():101:101 -> x2
-    1:1:int maxOutValueRegister():106:106 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():101:101 -> w2
+    1:1:int maxOutValueRegister():106:106 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.D.b.t1:
     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 isCommutative() -> E2
-    1:8:int maxInOutValueRegisterSize():131:138 -> G2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> I2
+    boolean isCommutative() -> D2
+    1:8:int maxInOutValueRegisterSize():131:138 -> F2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
@@ -26736,8 +26733,8 @@
     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() -> p0
-    boolean isSub() -> q2
-    int opcode() -> z2
+    boolean isSub() -> p2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.D.b.u1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -26753,29 +26750,29 @@
     4:4: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 instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
-    boolean isSwap() -> r2
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():87:87 -> y2
-    int opcode() -> z2
+    boolean isSwap() -> q2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():87:87 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.D.b.v1:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int):15:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> D2
-    1:1:int getFallthroughBlockIndex():55:55 -> E2
-    1:1:int numberOfKeys():68:68 -> F2
-    1:1:int[] targetBlockIndices():40:40 -> G2
-    1:1:int numberOfKeys():68:68 -> H2
-    1:1:boolean valid():25 -> H2
-    2:2:boolean valid():26:26 -> H2
-    3:3:int getTargetBlockIndex(int):36:36 -> H2
-    3:3:boolean valid():26 -> H2
-    4:4:int getFallthroughBlockIndex():55:55 -> H2
-    4:4:boolean valid():26 -> H2
-    5:5:boolean valid():26:26 -> H2
-    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> I2
+    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> C2
+    1:1:int getFallthroughBlockIndex():55:55 -> D2
+    1:1:int numberOfKeys():68:68 -> E2
+    1:1:int[] targetBlockIndices():40:40 -> F2
+    1:1:int numberOfKeys():68:68 -> G2
+    1:1:boolean valid():25 -> G2
+    2:2:boolean valid():26:26 -> G2
+    3:3:int getTargetBlockIndex(int):36:36 -> G2
+    3:3:boolean valid():26 -> G2
+    4:4:int getFallthroughBlockIndex():55:55 -> G2
+    4:4:boolean valid():26 -> G2
+    5:5:boolean valid():26:26 -> G2
+    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> H2
     1:1:int getTargetBlockIndex(int):36:36 -> b
     2:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):64:64 -> b
     1:1:void setFallthroughBlockIndex(int):59:59 -> c
@@ -26784,12 +26781,12 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32 -> d
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32:32 -> d
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
-    boolean isSwitch() -> s2
+    boolean isSwitch() -> r2
 com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.D.b.w1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> E2
+    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> D2
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
@@ -26800,34 +26797,34 @@
     10:10:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
     10:10:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):99 -> a
     11:11:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104:104 -> a
-    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     12:12:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
     13:16:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):105:108 -> a
-    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     17:17:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():267:267 -> 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):76 -> a
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
-    boolean isThrow() -> t2
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():49:49 -> y2
-    int opcode() -> z2
+    boolean isThrow() -> s2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():49:49 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.D.b.x1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> D2
+    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> C2
     boolean hasInvariantOutType() -> I0
     1:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> 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):51 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isUnop() -> u2
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
+    boolean isUnop() -> t2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
 com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.D.b.y1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26840,8 +26837,8 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
-    boolean isUshr() -> v2
-    int opcode() -> z2
+    boolean isUshr() -> u2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Value -> com.android.tools.r8.D.b.B1:
     int needsRegister -> j
     boolean isThis -> k
@@ -26860,199 +26857,212 @@
     com.android.tools.r8.ir.code.Value$DebugData debugData -> n
     com.android.tools.r8.utils.LongInterval valueRange -> m
     java.util.LinkedList users -> c
-    1:165:void <clinit>():41:205 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):224:224 -> <init>
-    2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):209:227 -> <init>
-    1:1:boolean isArgument():886:886 -> A
-    1:1:boolean isConstClass():826:826 -> B
-    1:1:boolean isConstNumber():806:806 -> C
-    1:1:boolean isConstString():810:810 -> D
-    1:1:boolean isConstant():830:830 -> E
-    1:1:boolean isDexItemBasedConstString():814:814 -> F
-    boolean isFixedRegisterValue() -> G
-    1:1:boolean isLinked():393:393 -> H
-    1:3:boolean isNeverNull():874:876 -> I
-    boolean isPhi() -> J
-    1:1:boolean isThis():946:946 -> K
-    1:1:boolean isUsed():498:498 -> L
-    boolean isValueOnStack() -> M
-    1:3:boolean isZero():1039:1041 -> N
-    1:3:void markAsArgument():880:882 -> O
-    1:3:void markAsThis():935:937 -> P
-    1:1:void markNonDebugLocalRead():138:138 -> Q
-    1:3:boolean needsRegister():713:715 -> R
-    1:1:int numberOfAllNonDebugUsers():486:486 -> S
-    1:1:int numberOfAllUsers():494 -> S
-    2:2:int numberOfAllUsers():494:494 -> S
-    1:1:int numberOfDebugUsers():490:490 -> T
-    1:5:int numberOfPhiUsers():478:482 -> U
-    1:5:int numberOfUsers():470:474 -> V
-    1:1:com.android.tools.r8.ir.code.ValueType outType():797:797 -> W
-    1:1:int requiredRegisters():296:296 -> X
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():429:430 -> Y
-    1:4:java.util.Set uniquePhiUsers():459:462 -> Z
+    1:165:void <clinit>():40:204 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):223:223 -> <init>
+    2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):208:226 -> <init>
+    1:1:boolean isConstClass():827:827 -> A
+    1:1:boolean isConstNumber():807:807 -> B
+    1:1:boolean isConstString():811:811 -> C
+    1:1:boolean isConstant():831:831 -> D
+    1:1:boolean isDexItemBasedConstString():815:815 -> E
+    boolean isFixedRegisterValue() -> F
+    1:1:boolean isLinked():392:392 -> G
+    1:3:boolean isNeverNull():991:993 -> H
+    boolean isPhi() -> I
+    1:1:boolean isThis():1063:1063 -> J
+    1:1:boolean isUsed():493:493 -> K
+    boolean isValueOnStack() -> L
+    1:3:boolean isZero():1156:1158 -> M
+    1:3:void markAsArgument():997:999 -> N
+    1:3:void markAsThis():1052:1054 -> O
+    1:1:void markNonDebugLocalRead():137:137 -> P
+    1:3:boolean needsRegister():719:721 -> Q
+    1:1:int numberOfAllNonDebugUsers():481:481 -> R
+    1:1:int numberOfAllUsers():489 -> R
+    2:2:int numberOfAllUsers():489:489 -> R
+    1:1:int numberOfDebugUsers():485:485 -> S
+    1:5:int numberOfPhiUsers():473:477 -> T
+    1:5:int numberOfUsers():465:469 -> U
+    1:1:com.android.tools.r8.ir.code.ValueType outType():798:798 -> V
+    1:1:int requiredRegisters():295:295 -> W
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():428:429 -> X
+    1:4:java.util.Set uniquePhiUsers():454:457 -> Y
+    1:4:java.util.Set uniqueUsers():421:424 -> Z
     boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi) -> a
-    1:13: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):45:57 -> a
-    14:14:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1050:1050 -> a
-    14: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):58 -> 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):47:47 -> a
+    1:13: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):44:56 -> a
+    14:14:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    14: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):57 -> 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):46:46 -> a
     16:18:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> 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):47 -> a
-    19:79:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):63:123 -> a
-    80:81:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):118:119 -> a
-    82:83:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):113:114 -> a
-    84:85:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):108:109 -> a
-    86:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):100:104 -> a
-    91:92:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):95:96 -> a
-    93:94:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):90:91 -> a
-    95:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):69:85 -> a
-    112:116:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):82:86 -> a
-    117:117:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):129:129 -> a
-    118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):133:133 -> a
-    118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):129 -> a
-    119:119:com.android.tools.r8.ir.code.Value getAliasedValue():258:258 -> a
-    119:119:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1119 -> a
-    120:138:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1120:1138 -> 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):46 -> a
+    19:79:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):62:122 -> a
+    80:81:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):117:118 -> a
+    82:83:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):112:113 -> a
+    84:85:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):107:108 -> a
+    86:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):99:103 -> a
+    91:92:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):94:95 -> a
+    93:94:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):89:90 -> a
+    95:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):68:84 -> a
+    112:116:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):81:85 -> a
+    117:117:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128:128 -> a
+    118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):132:132 -> a
+    118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128 -> a
+    119:119:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    119:119:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1235 -> a
+    120:138:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1236:1254 -> a
     139:139:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    139:139:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1138 -> a
+    139:139:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1254 -> a
     140:140:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    140:140:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1138 -> a
-    141:141:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1139:1139 -> a
-    142:162:com.android.tools.r8.ir.code.Value getAliasedValue(java.util.function.Predicate):262:282 -> a
-    163:165:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):308:310 -> a
-    166:169:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):319:322 -> a
-    170:171:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362:363 -> a
-    172:173:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367:368 -> a
-    172:173:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363 -> a
-    174:182:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():173:181 -> a
-    174:182:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):368 -> a
-    174:182:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363 -> a
-    183:183:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():179:179 -> a
-    183:183:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):368 -> a
-    183:183:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363 -> a
-    184:184:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():176:176 -> a
-    184:184:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):368 -> a
-    184:184:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363 -> a
-    185:185:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363:363 -> a
-    186:187:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):413:414 -> a
-    188:192:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set,java.util.Set):442:446 -> a
-    193:193:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    193:193:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set,java.util.Set):447 -> a
-    194:194:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set,java.util.Set):447:447 -> a
-    195:195:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    195:195:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set,java.util.Set):448 -> a
-    196:196:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set,java.util.Set):448:448 -> a
-    197:198:void addPhiUser(com.android.tools.r8.ir.code.Phi):553:554 -> a
-    199:200:java.util.Set affectedValues():604:605 -> a
-    201:201:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    201:201:java.util.Set affectedValues():606 -> a
-    202:206:java.util.Set affectedValues():607:611 -> a
-    207:234:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):643:670 -> a
-    235:244:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):677:686 -> a
-    245:258: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):186:199 -> a
-    245:258:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):686 -> a
-    259:259: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):187:187 -> a
-    259:259:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):686 -> a
-    260:260:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):686:686 -> a
-    261:269:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):691:699 -> a
-    270:271:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):704:705 -> a
-    272:273:void setNeedsRegister(boolean):719:720 -> a
-    274:276:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):890:892 -> a
-    277:277:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
-    277:277:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):892 -> a
-    278:280:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):893:895 -> a
-    281:281:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    281:281:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):896 -> a
-    282:282:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):901:901 -> a
-    283:283:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
-    283:283:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):892 -> a
-    284:306:boolean knownToBeBoolean(java.util.Set):909:931 -> a
-    307:307:void setValueRange(com.android.tools.r8.utils.LongInterval):950:950 -> a
-    308:308:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):982:982 -> a
-    309:309:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):987:987 -> a
-    309:309:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):982 -> a
-    310:326:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1004:1020 -> a
-    327:327:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    327:327:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1023 -> a
-    328:334:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1025:1031 -> a
-    335:335:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1050:1050 -> a
-    336:338:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1069:1071 -> a
-    339:347:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1069:1077 -> a
-    348:348:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1050:1050 -> a
-    348:348:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1078 -> a
-    1:4:java.util.Set uniqueUsers():422:425 -> a0
+    140:140:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1254 -> a
+    141:141:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1255:1255 -> a
+    142:142:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    142:142:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):835 -> a
+    143:154:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):836:847 -> a
+    155:155:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    155:155:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):848 -> a
+    156:157:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):848:849 -> a
+    158:158:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    158:158:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853 -> a
+    159:162:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853:856 -> a
+    163:163:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    163:163:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):856 -> a
+    164:194:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):857:887 -> a
+    195:195:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    195:195:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):887 -> a
+    196:210:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):894:908 -> a
+    211:211:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    211:211:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):887 -> a
+    212:271:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):912:971 -> a
+    272:272:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    272:272:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):856 -> a
+    273:293:com.android.tools.r8.ir.code.Value getAliasedValue(java.util.function.Predicate):261:281 -> a
+    294:296:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):307:309 -> a
+    297:300:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):318:321 -> a
+    301:302:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):361:362 -> a
+    303:304:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):366:367 -> a
+    303:304:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    305:313:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():172:180 -> a
+    305:313:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    305:313:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    314:314:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():178:178 -> a
+    314:314:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    314:314:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    315:315:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():175:175 -> a
+    315:315:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    315:315:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    316:316:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362:362 -> a
+    317:318:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):412:413 -> a
+    319:320:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):440:441 -> a
+    321:321:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    321:321:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):442 -> a
+    322:322:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):442:442 -> a
+    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    323:323:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):443 -> a
+    324:324:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):443:443 -> a
+    325:326:void addPhiUser(com.android.tools.r8.ir.code.Phi):559:560 -> a
+    327:328:java.util.Set affectedValues():610:611 -> a
+    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    329:329:java.util.Set affectedValues():612 -> a
+    330:334:java.util.Set affectedValues():613:617 -> a
+    335:362:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):649:676 -> a
+    363:372:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):683:692 -> a
+    373:386: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):185:198 -> a
+    373:386:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692 -> a
+    387:387: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):186:186 -> a
+    387:387:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692 -> a
+    388:388:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692:692 -> a
+    389:397:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):697:705 -> a
+    398:399:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):710:711 -> a
+    400:401:void setNeedsRegister(boolean):725:726 -> a
+    402:404:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1007:1009 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    405:405:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1009 -> a
+    406:408:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1010:1012 -> a
+    409:409:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    409:409:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1013 -> a
+    410:410:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1018:1018 -> a
+    411:411:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    411:411:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1009 -> a
+    412:434:boolean knownToBeBoolean(java.util.Set):1026:1048 -> a
+    435:435:void setValueRange(com.android.tools.r8.utils.LongInterval):1067:1067 -> a
+    436:436:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1104:1104 -> a
+    437:453:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1121:1137 -> a
+    454:454:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    454:454:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1140 -> a
+    455:461:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1142:1148 -> a
+    462:462:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    463:465:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1186:1188 -> a
+    466:474:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1186:1194 -> a
+    475:475:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    475:475:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1195 -> a
+    1:2:boolean usedInMonitorOperation():525:526 -> a0
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
-    1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):287:288 -> b
-    3:6:void linkTo(com.android.tools.r8.ir.code.Value):372:375 -> b
-    7:9:java.util.Set aliasedUsers():434:436 -> b
-    10:11:void removePhiUser(com.android.tools.r8.ir.code.Phi):558:559 -> b
-    12:13:void addDebugUser(com.android.tools.r8.ir.code.Instruction):568:569 -> b
-    14:20:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1056:1062 -> b
-    21:21:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1050:1050 -> b
-    21:21:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1063 -> b
-    22:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1089:1108 -> b
-    42:42:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
-    42:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1108 -> b
-    43:43:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> b
-    43:43:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1108 -> b
-    44:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1110:1112 -> b
-    1:2:boolean usedInMonitorOperation():519:520 -> b0
+    1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):286:287 -> b
+    3:6:void linkTo(com.android.tools.r8.ir.code.Value):371:374 -> b
+    7:8:java.util.Set aliasedUsers():433:434 -> b
+    9:10:void removePhiUser(com.android.tools.r8.ir.code.Phi):564:565 -> b
+    11:12:void addDebugUser(com.android.tools.r8.ir.code.Instruction):574:575 -> b
+    13:13:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1099:1099 -> b
+    14:20:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1173:1179 -> b
+    21:21:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> b
+    21:21:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1180 -> b
+    22:40:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1206:1224 -> b
+    41:41:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
+    41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1224 -> b
+    42:42:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable() -> b
+    42:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1224 -> b
+    43:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1226:1228 -> b
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> c
-    1:2:void addUser(com.android.tools.r8.ir.code.Instruction):528:529 -> c
-    3:4:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):563:564 -> c
-    5:17:void replaceUsers(com.android.tools.r8.ir.code.Value):618:630 -> c
-    18:18:com.android.tools.r8.graph.DexEncodedField getEnumField(com.android.tools.r8.graph.AppView):834:834 -> c
-    19:19:com.android.tools.r8.ir.code.Value getAliasedValue():258:258 -> c
-    19:19:com.android.tools.r8.graph.DexEncodedField getEnumField(com.android.tools.r8.graph.AppView):838 -> c
-    20:36:com.android.tools.r8.graph.DexEncodedField getEnumField(com.android.tools.r8.graph.AppView):839:855 -> c
-    1:1:int compareTo(java.lang.Object):41:41 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.ir.code.Value):758:758 -> compareTo
-    2:2:int compareTo(java.lang.Object):41 -> compareTo
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> c
+    1:1:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):514 -> c
+    2:5:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):515:518 -> c
+    6:10:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):497:501 -> c
+    11:11:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> c
+    11:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):501 -> c
+    12:16:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):504:508 -> c
+    17:18:void addUser(com.android.tools.r8.ir.code.Instruction):534:535 -> c
+    19:20:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):569:570 -> c
+    21:33:void replaceUsers(com.android.tools.r8.ir.code.Value):624:636 -> c
     com.android.tools.r8.ir.code.Phi asPhi() -> d
-    1:5:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):502:506 -> d
-    6:6:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> d
-    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):506 -> d
-    7:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):509:513 -> d
-    12:16:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):581:585 -> d
-    17:17:boolean lambda$getDynamicLowerBoundType$4(com.android.tools.r8.ir.code.Value):1134:1134 -> d
-    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):533:534 -> e
-    3:8:void clearUsers():543:548 -> e
-    9:9:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1090:1090 -> e
+    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):587:591 -> d
+    6:6:boolean lambda$getDynamicLowerBoundType$4(com.android.tools.r8.ir.code.Value):1250:1250 -> d
+    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):539:540 -> e
+    3:8:void clearUsers():549:554 -> e
+    9:9:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1207:1207 -> e
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> f
-    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):538:539 -> f
-    3:8:void clearUsersInfo():593:598 -> f
-    1:2:void computeNeedsRegister():724:725 -> g
-    1:1:java.util.Set debugUsers():466:466 -> h
-    1:1:int hashCode():763:763 -> hashCode
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():454:455 -> i
-    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():258:258 -> j
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():801:802 -> k
-    1:7:java.util.List getDebugLocalEnds():339:345 -> l
-    1:7:java.util.List getDebugLocalStarts():326:332 -> m
-    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():239:240 -> n
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():709:709 -> o
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():300:300 -> p
-    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():405:405 -> q
-    1:1:int getNumber():292:292 -> r
-    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():409:409 -> s
-    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():398 -> s
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1082:1082 -> t
-    1:8:java.lang.String toString():768:775 -> toString
+    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):544:545 -> f
+    3:8:void clearUsersInfo():599:604 -> f
+    1:2:void computeNeedsRegister():730:731 -> g
+    1:1:java.util.Set debugUsers():461:461 -> h
+    1:1:int hashCode():764:764 -> hashCode
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():449:450 -> i
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> j
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():802:803 -> k
+    1:7:java.util.List getDebugLocalEnds():338:344 -> l
+    1:7:java.util.List getDebugLocalStarts():325:331 -> m
+    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():238:239 -> n
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():715:715 -> o
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():299:299 -> p
+    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():404:404 -> q
+    1:1:int getNumber():291:291 -> r
+    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():408:408 -> s
+    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():397 -> s
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1199:1199 -> t
+    1:8:java.lang.String toString():769:776 -> toString
     9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
-    9:9:java.lang.String toString():776 -> toString
-    10:27:java.lang.String toString():776:793 -> toString
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():966:976 -> u
-    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():258:258 -> v
-    1:1:boolean hasAliasedValue():244 -> v
-    1:1:boolean hasLocalInfo():304:304 -> w
-    1:1:boolean hasUsersInfo():589:589 -> x
-    1:1:boolean hasValueRange():954:954 -> y
-    1:8:boolean internalComputeNeedsRegister():729:736 -> z
+    9:9:java.lang.String toString():777 -> toString
+    10:27:java.lang.String toString():777:794 -> toString
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():1083:1093 -> u
+    1:1:boolean hasLocalInfo():303:303 -> v
+    1:1:boolean hasUsersInfo():595:595 -> w
+    1:1:boolean hasValueRange():1071:1071 -> x
+    1:8:boolean internalComputeNeedsRegister():735:742 -> y
+    1:1:boolean isArgument():1003:1003 -> z
 com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.D.b.z1:
     java.util.Map users -> b
     com.android.tools.r8.graph.DebugLocalInfo local -> a
-    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):148:148 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):146:149 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):147:147 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):145:148 -> <init>
 com.android.tools.r8.ir.code.Value$DebugUse -> com.android.tools.r8.D.b.A1:
     com.android.tools.r8.ir.code.Value$DebugUse START -> b
     com.android.tools.r8.ir.code.Value$DebugUse[] $VALUES -> e
@@ -27060,9 +27070,9 @@
     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:2:void <clinit>():156:157 -> <clinit>
-    3:3:void <clinit>():156:156 -> <clinit>
-    1:1:void <init>(java.lang.String,int):156:156 -> <init>
+    1:2:void <clinit>():155:156 -> <clinit>
+    3:3:void <clinit>():155:155 -> <clinit>
+    1:1:void <init>(java.lang.String,int):155:155 -> <init>
 com.android.tools.r8.ir.code.ValueNumberGenerator -> com.android.tools.r8.D.b.C1:
     int nextValueNumber -> a
     1:2:void <init>():6:7 -> <init>
@@ -27151,8 +27161,8 @@
     long decodedValue() -> a
 com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.D.b.G1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -27165,8 +27175,8 @@
     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.Xor asXor() -> t0
-    boolean isXor() -> w2
-    int opcode() -> z2
+    boolean isXor() -> v2
+    int opcode() -> y2
 com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.D.c.c:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
@@ -27191,58 +27201,71 @@
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1):17:17 -> <init>
 com.android.tools.r8.ir.conversion.CallGraph -> com.android.tools.r8.D.c.e:
-    com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult cycleEliminationResult -> b
     java.util.Set nodes -> a
-    1:3:void <init>(java.util.Set,com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult):163:165 -> <init>
-    1:2:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):181:182 -> a
+    com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult cycleEliminationResult -> b
+    1:3:void <init>(java.util.Set,com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult):150:152 -> <init>
+    1:2:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):176:177 -> a
     3:3:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    3:3:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):183 -> a
+    3:3:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):178 -> a
 com.android.tools.r8.ir.conversion.CallGraph$Node -> com.android.tools.r8.D.c.d:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     java.util.Set callees -> c
     java.util.Set callers -> d
     boolean $assertionsDisabled -> e
     int numberOfCallSites -> b
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):49:49 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.DexEncodedMethod):41:50 -> <init>
-    1:7:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node,boolean):59:65 -> a
-    8:15:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node,boolean):62:69 -> a
-    16:18:void cleanCallersForRemoval():86:88 -> a
-    19:19:boolean hasCallee(com.android.tools.r8.ir.conversion.CallGraph$Node):105:105 -> a
-    1:1:java.util.Set getCalleesWithDeterministicOrder():97:97 -> b
-    2:2:boolean hasCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):109:109 -> b
-    1:2:void removeCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):74:75 -> c
-    3:3:java.util.Set getCallersWithDeterministicOrder():93:93 -> c
-    1:1:int compareTo(java.lang.Object):36:36 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.ir.conversion.CallGraph$Node):122:122 -> compareTo
-    2:2:int compareTo(java.lang.Object):36 -> compareTo
-    1:1:int getNumberOfCallSites():101:101 -> d
-    1:1:boolean isLeaf():117:117 -> e
-    1:30:java.lang.String toString():127:156 -> toString
-com.android.tools.r8.ir.conversion.CallGraphBuilder -> com.android.tools.r8.D.c.f:
-    boolean $assertionsDisabled -> e
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):22:22 -> <init>
-    1:5:void process(java.util.concurrent.ExecutorService):27:31 -> a
-    6:14:void process(java.util.concurrent.ExecutorService):30:38 -> a
-    15:15:java.lang.Object lambda$process$0(com.android.tools.r8.graph.DexProgramClass):33:33 -> a
-    1:1:void processClass(com.android.tools.r8.graph.DexProgramClass):42:42 -> b
-    2:4:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):46:48 -> b
-    5:5:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):47:47 -> b
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase -> com.android.tools.r8.D.c.k:
+    1:1:void <clinit>():37:37 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):50:50 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.DexEncodedMethod):42:51 -> <init>
+    1:7:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node,boolean):60:66 -> a
+    8:15:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node,boolean):63:70 -> a
+    16:18:void cleanForRemoval():80:82 -> a
+    19:19:boolean hasCallee(com.android.tools.r8.ir.conversion.CallGraph$Node):99:99 -> a
+    1:1:java.util.Set getCalleesWithDeterministicOrder():91:91 -> b
+    2:2:boolean hasCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):103:103 -> b
+    1:2:void removeCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):75:76 -> c
+    3:3:java.util.Set getCallersWithDeterministicOrder():87:87 -> c
+    1:1:int compareTo(java.lang.Object):37:37 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.ir.conversion.CallGraph$Node):112:112 -> compareTo
+    2:2:int compareTo(java.lang.Object):37 -> compareTo
+    1:1:int getNumberOfCallSites():95:95 -> d
+    1:1:boolean isLeaf():107:107 -> e
+    1:27:java.lang.String toString():117:143 -> toString
+com.android.tools.r8.ir.conversion.CallGraphBuilder -> com.android.tools.r8.D.c.j:
     java.util.Map nodes -> b
     java.util.Map possibleTargetsCache -> c
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():45:45 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):51:51 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView):47:52 -> <init>
-    void process(java.util.concurrent.ExecutorService) -> a
-    1:1:java.util.Map access$000(com.android.tools.r8.ir.conversion.CallGraphBuilderBase):45:45 -> a
-    2:4:com.android.tools.r8.ir.conversion.CallGraph$Node getOrCreateNode(com.android.tools.r8.graph.DexEncodedMethod):74:76 -> a
-    5:5:com.android.tools.r8.ir.conversion.CallGraph$Node lambda$getOrCreateNode$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):75:75 -> a
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator -> com.android.tools.r8.D.c.i:
+    1:1:void <clinit>():48:48 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):55:55 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):51:56 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.CallGraphBuilder):48:48 -> a
+    2:2:com.android.tools.r8.ir.conversion.CallGraph$Node access$100(com.android.tools.r8.ir.conversion.CallGraphBuilder,com.android.tools.r8.graph.DexEncodedMethod):48:48 -> a
+    3:7:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):60:64 -> a
+    8:18:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):63:73 -> a
+    19:19:boolean verifyAllMethodsWithCodeExists():104:104 -> a
+    19:19:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73 -> a
+    20:20:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    20:20:boolean verifyAllMethodsWithCodeExists():105 -> a
+    20:20:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73 -> a
+    21:22:boolean verifyAllMethodsWithCodeExists():105:106 -> a
+    21:22:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73 -> a
+    23:23:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    23:23:boolean verifyAllMethodsWithCodeExists():105 -> a
+    23:23:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73 -> a
+    24:26:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):75:77 -> a
+    27:27:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet():405:405 -> a
+    27:27:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.lang.Iterable):430 -> a
+    27:27:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):77 -> a
+    28:28:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.lang.Iterable):431:431 -> a
+    28:28:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):77 -> a
+    29:35:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):78:84 -> a
+    36:36:java.lang.Object lambda$build$0(com.android.tools.r8.graph.DexProgramClass):66:66 -> a
+    37:39:com.android.tools.r8.ir.conversion.CallGraph$Node getOrCreateNode(com.android.tools.r8.graph.DexEncodedMethod):98:100 -> a
+    40:40:com.android.tools.r8.ir.conversion.CallGraph$Node lambda$getOrCreateNode$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):99:99 -> a
+    1:1:java.util.Map access$200(com.android.tools.r8.ir.conversion.CallGraphBuilder):48:48 -> b
+    2:2:void processClass(com.android.tools.r8.graph.DexProgramClass):88:88 -> b
+    3:4:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):92:93 -> b
+com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator -> com.android.tools.r8.D.c.h:
     java.util.Deque stack -> c
     boolean $assertionsDisabled -> i
     java.util.Collection nodes -> a
@@ -27252,103 +27275,102 @@
     int maxDepth -> h
     int currentDepth -> g
     java.util.Map removedEdges -> f
-    1:1:void <clinit>():277:277 -> <clinit>
-    1:1:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):336:336 -> <init>
-    2:23:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):322:343 -> <init>
-    1:8:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles():348:355 -> a
-    9:14:void reset():362:367 -> a
-    9:14:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles():357 -> a
-    15:15:boolean edgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):514:514 -> a
-    16:16:void recordEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):518:518 -> a
-    17:19:java.util.Collection reorderNodes(java.util.List):529:531 -> a
-    1:1:java.util.Set lambda$recordEdgeRemoval$0(com.android.tools.r8.ir.conversion.CallGraph$Node):518:518 -> b
-    1:7:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):371:377 -> c
-    8:10:void push(com.android.tools.r8.ir.conversion.CallGraph$Node):474:476 -> c
-    8:10:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):382 -> c
-    11:91:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):386:466 -> c
-    92:110:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):406:424 -> c
-    111:118:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):420:427 -> c
-    119:123:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):487:491 -> c
-    119:123:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):430 -> c
-    124:125:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):432:433 -> c
-    126:134:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):496:504 -> c
-    126:134:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):439 -> c
-    135:147:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):444:456 -> c
-    148:148:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):451:451 -> c
-    149:151:void recoverStack(java.util.LinkedList):522:524 -> c
-    149:151:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):461 -> c
-    152:152:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):508:508 -> c
-    152:152:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):439 -> c
+    1:1:void <clinit>():302:302 -> <clinit>
+    1:1:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):361:361 -> <init>
+    2:23:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):347:368 -> <init>
+    1:8:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():373:380 -> a
+    9:14:void reset():387:392 -> a
+    9:14:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():382 -> a
+    15:15:boolean edgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):539:539 -> a
+    16:16:void recordEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):543:543 -> a
+    17:19:java.util.Collection reorderNodes(java.util.List):554:556 -> a
+    1:1:java.util.Set lambda$recordEdgeRemoval$0(com.android.tools.r8.ir.conversion.CallGraph$Node):543:543 -> b
+    1:7:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):396:402 -> c
+    8:10:void push(com.android.tools.r8.ir.conversion.CallGraph$Node):499:501 -> c
+    8:10:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):407 -> c
+    11:91:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):411:491 -> c
+    92:110:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):431:449 -> c
+    111:118:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):445:452 -> c
+    119:123:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):512:516 -> c
+    119:123:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):455 -> c
+    124:125:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):457:458 -> c
+    126:134:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):521:529 -> c
+    126:134:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    135:147:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):469:481 -> c
+    148:148:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):476:476 -> c
+    149:151:void recoverStack(java.util.LinkedList):547:549 -> c
+    149:151:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):486 -> c
+    152:152:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533:533 -> c
+    152:152:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
     153:153:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
-    153:153:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):508 -> c
-    153:153:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):439 -> c
-    154:154:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):508:508 -> c
-    154:154:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):439 -> c
-    155:158:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):480:483 -> c
-    155:158:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):469 -> c
-    159:159:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):470:470 -> c
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge -> com.android.tools.r8.D.c.g:
+    153:153:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533 -> c
+    153:153:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    154:154:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533:533 -> c
+    154:154:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    155:158:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):505:508 -> c
+    155:158:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):494 -> c
+    159:159:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):495:495 -> c
+com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge -> com.android.tools.r8.D.c.f:
     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):287:289 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$100(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge):282:282 -> a
-    2:2:void remove():293:293 -> a
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$200(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge):282:282 -> b
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult -> com.android.tools.r8.D.c.h:
+    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):312:314 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$300(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):307:307 -> a
+    2:2:void remove():318:318 -> a
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$400(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):307:307 -> b
+com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult -> com.android.tools.r8.D.c.g:
     java.util.Map removedEdges -> a
-    1:2:void <init>(java.util.Map):301:302 -> <init>
-    1:1:void forEachRemovedCaller(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Consumer):306:306 -> a
-    2:3:int numberOfRemovedEdges():311:312 -> a
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase$InvokeExtractor -> com.android.tools.r8.D.c.j:
-    com.android.tools.r8.ir.conversion.CallGraphBuilderBase this$0 -> e
-    boolean $assertionsDisabled -> f
-    java.util.function.Predicate targetTester -> d
+    1:2:void <init>(java.util.Map):326:327 -> <init>
+    1:1:void forEachRemovedCaller(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Consumer):331:331 -> a
+    2:3:int numberOfRemovedEdges():336:337 -> a
+com.android.tools.r8.ir.conversion.CallGraphBuilder$InvokeExtractor -> com.android.tools.r8.D.c.i:
+    com.android.tools.r8.ir.conversion.CallGraphBuilder this$0 -> d
+    boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.conversion.CallGraph$Node caller -> c
-    1:1:void <clinit>():81:81 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilderBase,com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Predicate):86:89 -> <init>
-    1:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexClass):93:95 -> a
-    4:18:void addTarget(com.android.tools.r8.graph.DexEncodedMethod,boolean):108:122 -> a
-    19:41:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):126:148 -> a
-    42:43:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):134:135 -> a
-    44:44:void lambda$processInvoke$0(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):135:135 -> a
-    45:48:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):175:178 -> a
-    49:49:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
-    49:49:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):178 -> a
-    50:50:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    51:51:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):241:241 -> a
-    52:52:void registerCallSite(com.android.tools.r8.graph.DexCallSite):272:272 -> a
-    1:32:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):156:187 -> b
-    33:33:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):223:223 -> b
-    34:34:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):235:235 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):217:217 -> c
-    2:3:boolean registerNewInstance(com.android.tools.r8.graph.DexType):247:248 -> c
-    4:4:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):255:255 -> c
+    1:1:void <clinit>():112:112 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilder,com.android.tools.r8.ir.conversion.CallGraph$Node):116:118 -> <init>
+    1:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexClass):122:124 -> a
+    4:15:void addTarget(com.android.tools.r8.graph.DexEncodedMethod,boolean):137:148 -> a
+    16:38:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):152:174 -> a
+    39:40:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):160:161 -> a
+    41:41:void lambda$processInvoke$0(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):161:161 -> a
+    42:45:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):200:203 -> a
+    46:46:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
+    46:46:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):203 -> a
+    47:47:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):236:236 -> a
+    48:48:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):266:266 -> a
+    49:49:void registerCallSite(com.android.tools.r8.graph.DexCallSite):297:297 -> a
+    1:32:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):181:212 -> b
+    33:33:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):248:248 -> b
+    34:34:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):260:260 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):242:242 -> c
+    2:3:boolean registerNewInstance(com.android.tools.r8.graph.DexType):272:273 -> c
+    4:4:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):280:280 -> c
     boolean registerTypeReference(com.android.tools.r8.graph.DexType) -> d
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):229:229 -> d
-    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):261:261 -> d
-    1:4:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):100:103 -> e
-    5:8:void processFieldAccess(com.android.tools.r8.graph.DexField):195:198 -> e
-    9:9:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):205:205 -> e
-com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.D.c.n:
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):254:254 -> d
+    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):286:286 -> d
+    1:4:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):129:132 -> e
+    5:8:void processFieldAccess(com.android.tools.r8.graph.DexField):220:223 -> e
+    9:9:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):230:230 -> e
+com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.D.c.m:
     1:1:void <init>():14:14 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation empty():27:27 -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.DexMethod) -> b
-com.android.tools.r8.ir.conversion.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.D.c.l:
+com.android.tools.r8.ir.conversion.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.D.c.k:
     java.util.Set singleCallSite -> a
     java.util.Set doubleCallSite -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):50:50 -> <init>
     2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):47:70 -> <init>
     1:1:boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod):94:94 -> a
     1:1:boolean hasSingleCallSite(com.android.tools.r8.graph.DexMethod):83:83 -> b
-com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.D.c.m:
+com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.D.c.l:
     com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation EMPTY_INFO -> a
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>():30:30 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod) -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.DexMethod) -> b
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation access$000():30:30 -> b
-com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.D.c.q:
+com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.D.c.p:
     com.android.tools.r8.ir.code.Position currentPosition -> h
     java.util.Map newInstanceLabels -> q
     java.util.List thisInitializers -> p
@@ -27376,25 +27398,25 @@
     21:23:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):133:135 -> a
     24:26:void rewriteNots():222:224 -> a
     24:26:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    27:27:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next() -> a
+    27:27:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     27:27:void rewriteNots():225 -> a
     27:27:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     28:32:void rewriteNots():226:230 -> a
     28:32:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    33:33:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    33:33:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     33:33:void rewriteNots():233 -> a
     33:33:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     34:34:void rewriteNots():234:234 -> a
     34:34:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     35:35:void rewriteNots():234 -> a
     35:35:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     36:38:void rewriteNots():235:237 -> a
     36:38:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    39:39:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    39:39:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     39:39:void rewriteNots():238 -> a
     39:39:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    40:40:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    40:40:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     40:40:void rewriteNots():239 -> a
     40:40:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     41:42:void rewriteNots():242:243 -> a
@@ -27404,41 +27426,41 @@
     44:64:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):137:157 -> a
     65:68:void rewriteIincPatterns():358:361 -> a
     65:68:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    69:69:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    69:69:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     69:69:void rewriteIincPatterns():362 -> a
     69:69:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     70:76:void rewriteIincPatterns():363:369 -> a
     70:76:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    77:77:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    77:77:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     77:77:void rewriteIincPatterns():370 -> a
     77:77:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     78:78:void rewriteIincPatterns():370:370 -> a
     78:78:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    79:79:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    79:79:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     79:79:void rewriteIincPatterns():372 -> a
     79:79:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     80:81:void rewriteIincPatterns():372:373 -> a
     80:81:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    82:82:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    82:82:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     82:82:void rewriteIincPatterns():375 -> a
     82:82:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     83:83:void rewriteIincPatterns():375:375 -> a
     83:83:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    84:84:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    84:84:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     84:84:void rewriteIincPatterns():376 -> a
     84:84:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     85:85:void rewriteIincPatterns():376:376 -> a
     85:85:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    86:86:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    86:86:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     86:86:void rewriteIincPatterns():378 -> a
     86:86:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    87:87:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    87:87:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     87:87:void rewriteIincPatterns():379 -> a
     87:87:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    88:88:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    88:88:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     88:88:void rewriteIincPatterns():380 -> a
     88:88:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    89:89:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    89:89:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     89:89:void rewriteIincPatterns():381 -> a
     89:89:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     90:99:void rewriteIincPatterns():386:395 -> a
@@ -27451,30 +27473,30 @@
     102:102:int getLocalRegister(com.android.tools.r8.ir.code.Value):638:638 -> a
     102:102:void rewriteIincPatterns():395 -> a
     102:102:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    103:103:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    103:103:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     103:103:void rewriteIincPatterns():396 -> a
     103:103:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     104:110:void rewriteIincPatterns():399:405 -> a
     104:110:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    111:111:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    111:111:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     111:111:void rewriteIincPatterns():406 -> a
     111:111:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     112:112:void rewriteIincPatterns():407:407 -> a
     112:112:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    113:113:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    113:113:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     113:113:void rewriteIincPatterns():408 -> a
     113:113:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     114:114:void rewriteIincPatterns():409:409 -> a
     114:114:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    115:115:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    115:115:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     115:115:void rewriteIincPatterns():410 -> a
     115:115:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     116:119:void rewriteIincPatterns():411:414 -> a
     116:119:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    120:120:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    120:120:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     120:120:void rewriteIincPatterns():392 -> a
     120:120:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    121:121:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    121:121:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     121:121:void rewriteIincPatterns():387 -> a
     121:121:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     122:123:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):162:163 -> a
@@ -27568,8 +27590,8 @@
     28:33:void updateLocals(com.android.tools.r8.cf.code.CfLabel):509:514 -> b
     34:37:boolean localsChanged():518:521 -> b
     38:38:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):634:634 -> b
-com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.D.c.o:
-com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.D.c.p:
+com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.D.c.n:
+com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.D.c.o:
     int height -> b
     boolean $assertionsDisabled -> c
     int maxHeight -> a
@@ -27577,7 +27599,7 @@
     1:3:void <init>():100:102 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):100:100 -> <init>
     1:3:void push(com.android.tools.r8.ir.code.Value):109:111 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.D.c.t:
+com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.D.c.s:
     int currentInstructionIndex -> o
     com.android.tools.r8.graph.CfCode code -> h
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo currentBlockInfo -> a
@@ -27616,7 +27638,7 @@
     10:10:java.util.List com.android.tools.r8.graph.CfCode.getInstructions():131:131 -> a
     10:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297 -> a
     11:13:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297:299 -> a
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     14:14:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299 -> a
     15:16:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:300 -> a
     17:43:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:325 -> a
@@ -27771,16 +27793,20 @@
     41:41:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> i
     41:41:void setLocalVariableLists():681 -> i
     42:42:void setLocalVariableLists():681:681 -> i
-com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.D.c.r:
+com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.D.c.q:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap locals -> c
     int endOffset -> b
     int startOffset -> a
+    1:1:void <clinit>():136:136 -> <clinit>
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> <clinit>
+    2:2:void <clinit>():136 -> <clinit>
+    3:3:void <clinit>():136:136 -> <clinit>
     1:4:void <init>(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap):142:145 -> <init>
     1:18:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):155:172 -> a
     19:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> a
     19:19:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):173 -> a
     20:20:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):173:173 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.D.c.s:
+com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.D.c.r:
     java.util.List guards -> c
     boolean $assertionsDisabled -> e
     int endOffset -> b
@@ -27796,7 +27822,7 @@
     7:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.<init>():104:104 -> a
     7:7:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):100 -> a
     8:36:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):102:130 -> a
-com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.D.c.E:
+com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.D.c.D:
     com.android.tools.r8.ir.conversion.CfState$Snapshot current -> a
     com.android.tools.r8.ir.code.Position position -> b
     boolean $assertionsDisabled -> c
@@ -27830,8 +27856,8 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():190:190 -> c
     1:2:com.android.tools.r8.ir.conversion.CfState$Slot pop():176:177 -> d
     1:1:java.lang.String toString():225:225 -> toString
-com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.D.c.u:
-com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.D.c.v:
+com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.D.c.t:
+com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.D.c.u:
     com.android.tools.r8.ir.conversion.CfState$SlotType[] locals -> c
     com.android.tools.r8.ir.conversion.CfState$SlotType[] stack -> d
     boolean $assertionsDisabled -> e
@@ -27856,7 +27882,7 @@
     5:5:com.android.tools.r8.ir.conversion.CfState$Slot peek():366:366 -> c
     1:1:int stackHeight():350:350 -> d
     1:15:java.lang.String toString():395:409 -> toString
-com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.D.c.w:
+com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.D.c.v:
     int stackHeight -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():452:452 -> <clinit>
@@ -27865,7 +27891,7 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():475:475 -> c
     1:1:int stackHeight():464:464 -> d
     1:1:java.lang.String toString():480:480 -> toString
-com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.D.c.x:
+com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.D.c.w:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():413:413 -> <clinit>
@@ -27878,7 +27904,7 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():435:435 -> c
     1:1:int stackHeight():425:425 -> d
     1:1:java.lang.String toString():448:448 -> toString
-com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.D.c.y:
+com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.D.c.x:
     com.android.tools.r8.ir.conversion.CfState$SlotType slotType -> d
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> e
@@ -27893,24 +27919,24 @@
     1:2:int stackPosition():252:253 -> b
     1:2:int access$500(com.android.tools.r8.ir.conversion.CfState$Slot):228 -> b
     1:3:java.lang.String toString():258:260 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.D.c.B:
+com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.D.c.A:
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.CfState$1):14:14 -> <init>
     com.android.tools.r8.ir.code.ValueType getImprecise() -> a
     com.android.tools.r8.graph.DexType getPrecise() -> b
-com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.D.c.z:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.D.c.y:
     com.android.tools.r8.ir.code.ValueType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):47:48 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():58:58 -> a
     com.android.tools.r8.graph.DexType getPrecise() -> b
     1:1:java.lang.String toString():63:63 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.D.c.A:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.D.c.z:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):23:24 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():34:34 -> a
     1:1:com.android.tools.r8.graph.DexType getPrecise():29:29 -> b
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.D.c.C:
+com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.D.c.B:
     com.android.tools.r8.ir.conversion.CfState$Snapshot parent -> a
     int updates -> b
     1:1:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,int,com.android.tools.r8.ir.conversion.CfState$1):264:264 -> <init>
@@ -27922,7 +27948,7 @@
     2:2:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):282:282 -> b
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():286:286 -> c
     1:1:int stackHeight():274:274 -> d
-com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.D.c.D:
+com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.D.c.C:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():484:484 -> <clinit>
@@ -27931,7 +27957,7 @@
     2:3:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):506:507 -> a
     1:1:int maxLocal():496:496 -> b
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.D.c.P:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.D.c.O:
     boolean hasBackwardsBranch -> m
     boolean $assertionsDisabled -> o
     int outRegisterCount -> l
@@ -27974,10 +28000,10 @@
     109:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     109:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
     110:123:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):429:442 -> a
-    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     124:124:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):443 -> a
     125:153:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):445:473 -> a
-    154:154:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):479:479 -> a
+    154:154:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> a
     154:154:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):474 -> a
     155:166:void rewriteIfs():490:501 -> a
     155:166:com.android.tools.r8.graph.DexCode build():184 -> a
@@ -27995,7 +28021,7 @@
     214:214:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
     214:214:com.android.tools.r8.graph.DexCode build():226 -> a
     215:225:com.android.tools.r8.graph.DexCode build():227:237 -> a
-    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1334:1334 -> a
+    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1329:1329 -> a
     226:226:com.android.tools.r8.graph.DexCode build():237 -> a
     227:245:com.android.tools.r8.graph.DexCode build():238:256 -> a
     246:246:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
@@ -28087,7 +28113,7 @@
     4:4:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):668:668 -> c
     5:5:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():881:881 -> c
     1:1:boolean isBuildingForComparison():156:156 -> d
-com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.D.c.F:
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.D.c.E:
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1050:1050 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -28095,11 +28121,11 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.D.c.G:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.D.c.F:
     com.android.tools.r8.code.FillArrayData dex -> b
     com.android.tools.r8.ir.code.NewArrayFilledData ir -> a
     1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):1525:1527 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.D.c.H:
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.D.c.G:
     com.android.tools.r8.code.Instruction instruction -> e
     1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):957:958 -> <init>
     1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):978:978 -> a
@@ -28111,7 +28137,7 @@
     1:1:int getSize():963:963 -> d
     1:1:int maxSize():973:973 -> e
     1:1:int minSize():968:968 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.D.c.I:
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.D.c.H:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1083:1083 -> <clinit>
@@ -28139,7 +28165,7 @@
     1:2:int getSize():1097:1098 -> d
     1:1:int maxSize():1109:1109 -> e
     1:1:int minSize():1103:1103 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.D.c.J:
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.D.c.I:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1214:1214 -> <clinit>
@@ -28263,7 +28289,7 @@
     1:1:int getSize():1347:1347 -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.D.c.K:
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.D.c.J:
     com.android.tools.r8.ir.code.Instruction ir -> a
     int offset -> b
     int maxOffset -> c
@@ -28283,7 +28309,7 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.D.c.L:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.D.c.K:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1361:1361 -> <clinit>
@@ -28338,7 +28364,7 @@
     1:2:int getSize():1473:1474 -> d
     1:1:int maxSize():1467:1467 -> e
     1:1:int minSize():1461:1461 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.D.c.M:
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.D.c.L:
     int size -> f
     com.android.tools.r8.code.Instruction[] instructions -> e
     1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):1001:1007 -> <init>
@@ -28351,11 +28377,11 @@
     1:1:int getSize():1037:1037 -> d
     1:1:int maxSize():1032:1032 -> e
     1:1:int minSize():1027:1027 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.D.c.N:
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.D.c.M:
     com.android.tools.r8.ir.code.IntSwitch ir -> a
     com.android.tools.r8.code.Format31t dex -> b
     1:3:void <init>(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):1514:1516 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.D.c.O:
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.D.c.N:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> a
     int start -> b
     int end -> c
@@ -28364,7 +28390,7 @@
     1:1:int compareTo(java.lang.Object):1491:1491 -> compareTo
     2:2:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1505:1505 -> compareTo
     2:2:int compareTo(java.lang.Object):1491 -> compareTo
-com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.D.c.Q:
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.D.c.P:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.Position currentPosition -> i
     com.android.tools.r8.graph.DexMethod originalMethod -> l
@@ -28464,7 +28490,7 @@
     1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):453:453 -> i
     2:2:boolean inTryRange(com.android.tools.r8.graph.DexCode$Try,int):448:448 -> i
     2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):454 -> i
-com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.D.c.Y:
+com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.D.c.X:
     com.android.tools.r8.ir.conversion.SourceCode source -> v
     java.util.Queue ssaWorklist -> f
     int currentInstructionOffset -> j
@@ -28509,849 +28535,849 @@
     5:5:boolean verifyMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense):468:468 -> a
     6:7:void addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):492:493 -> a
     8:26:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):509:527 -> a
-    27:29:void markIndexProcessed(int):2369:2371 -> a
+    27:29:void markIndexProcessed(int):2365:2367 -> a
     27:29:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):532 -> a
-    30:31:void ensureSubroutineProcessedInstructions():2379:2380 -> a
-    30:31:void markIndexProcessed(int):2374 -> a
+    30:31:void ensureSubroutineProcessedInstructions():2375:2376 -> a
+    30:31:void markIndexProcessed(int):2370 -> a
     30:31:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):532 -> a
-    32:32:void markIndexProcessed(int):2375:2375 -> a
+    32:32:void markIndexProcessed(int):2371:2371 -> a
     32:32:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):532 -> a
     33:43:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):533:543 -> a
-    44:44:void ensureNormalSuccessorBlock(int,int):2400:2400 -> a
+    44:44:void ensureNormalSuccessorBlock(int,int):2396:2396 -> a
     44:44:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):544 -> a
     45:47:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):550:552 -> a
     48:48:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):498:498 -> a
     48:48:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):552 -> a
     49:54:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):553:558 -> a
-    55:60:void processWorklist():749:754 -> a
+    55:60:void processWorklist():745:750 -> a
     55:60:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
     61:61:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):498:498 -> a
-    61:61:void processWorklist():754 -> a
+    61:61:void processWorklist():750 -> a
     61:61:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    62:66:void processWorklist():755:759 -> a
+    62:66:void processWorklist():751:755 -> a
     62:66:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    67:72:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):800:805 -> a
-    67:72:void processWorklist():759 -> a
+    67:72:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):796:801 -> a
+    67:72:void processWorklist():755 -> a
     67:72:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
     73:73:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    73:73:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):805 -> a
-    73:73:void processWorklist():759 -> a
+    73:73:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):801 -> a
+    73:73:void processWorklist():755 -> a
     73:73:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    74:92:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):806:824 -> a
-    74:92:void processWorklist():759 -> a
+    74:92:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):802:820 -> a
+    74:92:void processWorklist():755 -> a
     74:92:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    93:98:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):823:828 -> a
-    93:98:void processWorklist():759 -> a
+    93:98:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):819:824 -> a
+    93:98:void processWorklist():755 -> a
     93:98:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    99:106:void processWorklist():760:767 -> a
+    99:106:void processWorklist():756:763 -> a
     99:106:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    107:117:void processWorklist():766:776 -> a
+    107:117:void processWorklist():762:772 -> a
     107:117:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    118:118:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    118:118:void processWorklist():776 -> a
+    118:118:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    118:118:void processWorklist():772 -> a
     118:118:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    119:128:void processWorklist():780:789 -> a
+    119:128:void processWorklist():776:785 -> a
     119:128:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    129:132:void closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2445:2448 -> a
-    129:132:void processWorklist():789 -> a
+    129:132:void closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2441:2444 -> a
+    129:132:void processWorklist():785 -> a
     129:132:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    133:134:void processWorklist():792:793 -> a
+    133:134:void processWorklist():788:789 -> a
     133:134:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    135:135:void processWorklist():749:749 -> a
+    135:135:void processWorklist():745:745 -> a
     135:135:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
     136:141:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):562:567 -> a
-    142:143:boolean verifyFilledPredecessors():688:689 -> a
+    142:143:boolean verifyFilledPredecessors():684:685 -> a
     142:143:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    144:149:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):695:700 -> a
-    144:149:boolean verifyFilledPredecessors():689 -> a
+    144:149:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):691:696 -> a
+    144:149:boolean verifyFilledPredecessors():685 -> a
     144:149:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
     150:150:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():297:297 -> a
-    150:150:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    150:150:boolean verifyFilledPredecessors():689 -> a
+    150:150:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    150:150:boolean verifyFilledPredecessors():685 -> a
     150:150:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    151:158:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):717:724 -> a
-    151:158:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    151:158:boolean verifyFilledPredecessors():689 -> a
+    151:158:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):713:720 -> a
+    151:158:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    151:158:boolean verifyFilledPredecessors():685 -> a
     151:158:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    159:162:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):740:743 -> a
-    159:162:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):724 -> a
-    159:162:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    159:162:boolean verifyFilledPredecessors():689 -> a
+    159:162:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):736:739 -> a
+    159:162:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):720 -> a
+    159:162:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    159:162:boolean verifyFilledPredecessors():685 -> a
     159:162:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    163:163:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):741:741 -> a
-    163:163:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):724 -> a
-    163:163:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    163:163:boolean verifyFilledPredecessors():689 -> a
+    163:163:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):737:737 -> a
+    163:163:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):720 -> a
+    163:163:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    163:163:boolean verifyFilledPredecessors():685 -> a
     163:163:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    164:171:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):728:735 -> a
-    164:171:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    164:171:boolean verifyFilledPredecessors():689 -> a
+    164:171:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):724:731 -> a
+    164:171:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    164:171:boolean verifyFilledPredecessors():685 -> a
     164:171:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    172:178:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700:706 -> a
-    172:178:boolean verifyFilledPredecessors():689 -> a
+    172:178:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696:702 -> a
+    172:178:boolean verifyFilledPredecessors():685 -> a
     172:178:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    179:179:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):703:703 -> a
-    179:179:boolean verifyFilledPredecessors():689 -> a
+    179:179:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):699:699 -> a
+    179:179:boolean verifyFilledPredecessors():685 -> a
     179:179:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    180:186:void insertDebugPositions():657:663 -> a
+    180:186:void insertDebugPositions():653:659 -> a
     180:186:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    187:187:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    187:187:void insertDebugPositions():664 -> a
+    187:187:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    187:187:void insertDebugPositions():660 -> a
     187:187:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    188:200:void insertDebugPositions():665:677 -> a
+    188:200:void insertDebugPositions():661:673 -> a
     188:200:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    201:201:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    201:201:void insertDebugPositions():678 -> a
+    201:201:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    201:201:void insertDebugPositions():674 -> a
     201:201:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    202:202:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    202:202:void insertDebugPositions():679 -> a
+    202:202:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    202:202:void insertDebugPositions():675 -> a
     202:202:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    203:203:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    203:203:void insertDebugPositions():680 -> a
+    203:203:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    203:203:void insertDebugPositions():676 -> a
     203:203:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
     204:205:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):573:574 -> a
     206:206:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     206:206:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
     207:209:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575:577 -> a
-    210:210:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    210:210:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     210:210:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):577 -> a
     211:216:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):578:583 -> a
-    217:217:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    217:217:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     217:217:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):584 -> a
     218:219:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):591:592 -> a
-    220:250:void joinPredecessorsWithIdenticalPhis():2533:2563 -> a
+    220:250:void joinPredecessorsWithIdenticalPhis():2529:2559 -> a
     220:250:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     251:251:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    251:251:void joinPredecessorsWithIdenticalPhis():2563 -> a
+    251:251:void joinPredecessorsWithIdenticalPhis():2559 -> a
     251:251:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    252:252:void joinPredecessorsWithIdenticalPhis():2563:2563 -> a
+    252:252:void joinPredecessorsWithIdenticalPhis():2559:2559 -> a
     252:252:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    253:267:void joinPredecessorsWithIdenticalPhis():2562:2576 -> a
+    253:267:void joinPredecessorsWithIdenticalPhis():2558:2572 -> a
     253:267:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     268:279:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):506:517 -> a
-    268:279:void joinPredecessorsWithIdenticalPhis():2580 -> a
+    268:279:void joinPredecessorsWithIdenticalPhis():2576 -> a
     268:279:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    280:280:void joinPredecessorsWithIdenticalPhis():2581:2581 -> a
+    280:280:void joinPredecessorsWithIdenticalPhis():2577:2577 -> a
     280:280:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    281:281:void joinPredecessorsWithIdenticalPhis():2539:2539 -> a
+    281:281:void joinPredecessorsWithIdenticalPhis():2535:2535 -> a
     281:281:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     282:282:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    282:282:void joinPredecessorsWithIdenticalPhis():2539 -> a
+    282:282:void joinPredecessorsWithIdenticalPhis():2535 -> a
     282:282:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    283:327:void joinPredecessorsWithIdenticalPhis():2539:2583 -> a
+    283:327:void joinPredecessorsWithIdenticalPhis():2535:2579 -> a
     283:327:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     328:335:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):600:607 -> a
-    336:336:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1089:1089 -> a
+    336:336:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1085:1085 -> a
     336:336:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):610 -> a
     337:345:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):611:619 -> a
     346:346:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
     347:347:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619:619 -> a
-    348:365:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):616:633 -> a
-    366:366:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1081:1081 -> a
-    366:366:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):633 -> a
-    367:367:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634:634 -> a
-    368:379:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):124:135 -> a
-    368:379:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    368:379:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    380:380:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793:793 -> a
-    380:380:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):135 -> a
-    380:380:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    380:380:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    381:389:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):144:152 -> a
-    381:389:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    381:389:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    390:390:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793:793 -> a
-    390:390:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):152 -> a
-    390:390:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    390:390:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    391:395:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):165:169 -> a
-    391:395:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    391:395:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    396:396:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110:110 -> a
-    396:396:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    397:397:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo.builder(com.android.tools.r8.graph.DexItemFactory):268:268 -> a
-    397:397:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):175 -> a
-    397:397:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):111 -> a
-    397:397:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    398:400:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):175:177 -> a
-    398:400:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):111 -> a
-    398:400:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    401:402:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):116:117 -> a
-    401:402:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    403:407:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):637:641 -> a
-    408:408:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):646:646 -> a
-    409:409:void resolveAndBuildSwitch(int,int,int):833:833 -> a
-    410:410:void add(com.android.tools.r8.ir.code.Instruction):847:847 -> a
-    411:411:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    411:411:void add(com.android.tools.r8.ir.code.Instruction):848 -> a
-    412:412:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):880:880 -> a
-    413:413:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    413:413:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):882 -> a
-    414:417:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):883:886 -> a
-    418:418:void addBooleanNonThisArgument(int):891:891 -> a
-    419:419:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    419:419:void addBooleanNonThisArgument(int):893 -> a
-    420:423:void addBooleanNonThisArgument(int):894:897 -> a
-    424:425:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):902:903 -> a
-    426:426:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    426:426:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):905 -> a
-    427:427:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):906:906 -> a
-    428:431:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):915:918 -> a
-    432:432:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    432:432:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):920 -> a
-    433:436:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):921:924 -> a
-    437:441:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):962:966 -> a
-    442:442:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():573:573 -> a
-    442:442:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):938 -> a
-    442:442:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):967 -> a
-    443:443:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):938:938 -> a
-    443:443:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):967 -> a
-    444:444:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):968:968 -> a
-    445:451:void addDebugPosition(com.android.tools.r8.ir.code.Position):973:979 -> a
-    452:452:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    452:452:void addDebugPosition(com.android.tools.r8.ir.code.Position):979 -> a
-    453:456:void addDebugPosition(com.android.tools.r8.ir.code.Position):981:984 -> a
-    457:457:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    457:457:void addDebugPosition(com.android.tools.r8.ir.code.Position):984 -> a
-    458:459:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1028:1029 -> a
-    460:480:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):151:171 -> a
-    460:480:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    481:481:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):166:166 -> a
-    481:481:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    482:486:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):160:164 -> a
-    482:486:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    487:487:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):162:162 -> a
-    487:487:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    488:488:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):158:158 -> a
-    488:488:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    489:502:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):156:169 -> a
-    489:502:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    503:506:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1031:1034 -> a
-    507:510:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):650:653 -> a
-    507:510:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1035 -> a
-    511:511:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1037:1037 -> a
-    512:516:void addArrayLength(int,int):1041:1045 -> a
-    517:519:void addCheckCast(int,com.android.tools.r8.graph.DexType):1060:1062 -> a
-    520:520:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    520:520:void addCheckCast(int,com.android.tools.r8.graph.DexType):1062 -> a
-    521:524:void addCheckCast(int,com.android.tools.r8.graph.DexType):1063:1066 -> a
-    525:528:void addConst(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int,long):1079:1082 -> a
-    529:537:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1115:1123 -> a
-    538:538:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    538:538:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1122 -> a
-    539:541:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1124:1126 -> a
-    542:542:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1116:1116 -> a
-    543:551:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1130:1138 -> a
-    552:552:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    552:552:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1137 -> a
-    553:555:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1139:1141 -> a
-    556:556:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1131:1131 -> a
-    557:558:void addConstString(int,com.android.tools.r8.graph.DexString):1151:1152 -> a
-    559:559:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1145:1145 -> a
-    559:559:void addConstString(int,com.android.tools.r8.graph.DexString):1153 -> a
-    560:560:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    560:560:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1145 -> a
-    560:560:void addConstString(int,com.android.tools.r8.graph.DexString):1153 -> a
-    561:562:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1146:1147 -> a
-    561:562:void addConstString(int,com.android.tools.r8.graph.DexString):1153 -> a
-    563:563:void addConstString(int,com.android.tools.r8.graph.DexString):1154:1154 -> a
-    564:566:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1159:1161 -> a
-    567:567:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1145:1145 -> a
-    567:567:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1162 -> a
-    568:568:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    568:568:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1145 -> a
-    568:568:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1162 -> a
-    569:570:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1146:1147 -> a
-    569:570:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1162 -> a
-    571:572:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1163:1164 -> a
-    573:575:com.android.tools.r8.ir.code.Monitor addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1191:1193 -> a
-    576:577:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1202:1203 -> a
-    578:578:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    578:578:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1205 -> a
-    579:581:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1206:1208 -> a
-    582:582:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    582:582:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1208 -> a
-    583:583:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1212:1212 -> a
-    584:590:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1309:1315 -> a
-    591:591:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1323:1323 -> a
-    592:595:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1336:1339 -> a
-    592:595:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1321 -> a
-    596:599:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1336:1339 -> a
-    600:604:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1344:1348 -> a
-    605:605:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    605:605:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1348 -> a
-    606:606:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1348:1348 -> a
-    607:611:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1346:1350 -> a
-    612:612:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    612:612:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1352 -> a
-    613:615:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1356:1358 -> a
-    616:616:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    616:616:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1360 -> a
-    617:626:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1372:1381 -> a
-    627:658:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1375:1406 -> a
-    659:663:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1416:1420 -> a
-    664:667:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1419:1422 -> a
-    668:685:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1449:1466 -> a
-    686:690:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1471:1475 -> a
-    691:694:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1474:1477 -> a
-    695:718:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1488:1511 -> a
-    719:735:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1515:1531 -> a
-    736:760:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1552:1576 -> a
-    761:775:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1580:1594 -> a
-    776:776:boolean lambda$addMoveException$1(com.android.tools.r8.ir.code.BasicBlock):1607:1607 -> a
-    777:779:void addNewArrayFilledData(int,int,long,short[]):1679:1681 -> a
-    780:780:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    780:780:void addNewArrayFilledData(int,int,long,short[]):1683 -> a
-    781:781:void addReturn():1708:1708 -> a
-    782:784:void addReturn(com.android.tools.r8.ir.code.Return):1713:1715 -> a
-    782:784:void addReturn():1708 -> a
-    785:788:void addStaticGet(int,com.android.tools.r8.graph.DexField):1719:1722 -> a
-    789:789:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    789:789:void addStaticGet(int,com.android.tools.r8.graph.DexField):1722 -> a
-    790:790:void addStaticGet(int,com.android.tools.r8.graph.DexField):1722:1722 -> a
-    791:795:void addStaticGet(int,com.android.tools.r8.graph.DexField):1720:1724 -> a
-    796:796:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    796:796:void addStaticGet(int,com.android.tools.r8.graph.DexField):1726 -> a
-    797:840:void addSwitch(int,int[],int,int[]):1758:1801 -> a
+    348:361:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):616:629 -> a
+    362:362:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1076:1076 -> a
+    362:362:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):629 -> a
+    363:363:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630:630 -> a
+    364:375:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):124:135 -> a
+    364:375:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    364:375:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    376:376:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793:793 -> a
+    376:376:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):135 -> a
+    376:376:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    376:376:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    377:385:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):144:152 -> a
+    377:385:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    377:385:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    386:386:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793:793 -> a
+    386:386:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):152 -> a
+    386:386:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    386:386:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    387:391:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):165:169 -> a
+    387:391:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    387:391:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    392:392:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110:110 -> a
+    392:392:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    393:393:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo.builder(com.android.tools.r8.graph.DexItemFactory):268:268 -> a
+    393:393:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):175 -> a
+    393:393:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):111 -> a
+    393:393:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    394:396:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):175:177 -> a
+    394:396:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):111 -> a
+    394:396:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    397:398:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):116:117 -> a
+    397:398:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    399:403:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):633:637 -> a
+    404:404:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):642:642 -> a
+    405:405:void resolveAndBuildSwitch(int,int,int):829:829 -> a
+    406:406:void add(com.android.tools.r8.ir.code.Instruction):843:843 -> a
+    407:407:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    407:407:void add(com.android.tools.r8.ir.code.Instruction):844 -> a
+    408:408:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):876:876 -> a
+    409:409:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    409:409:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):878 -> a
+    410:413:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):879:882 -> a
+    414:414:void addBooleanNonThisArgument(int):887:887 -> a
+    415:415:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    415:415:void addBooleanNonThisArgument(int):889 -> a
+    416:419:void addBooleanNonThisArgument(int):890:893 -> a
+    420:421:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):898:899 -> a
+    422:422:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    422:422:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):901 -> a
+    423:423:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):902:902 -> a
+    424:427:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):911:914 -> a
+    428:428:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    428:428:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):916 -> a
+    429:432:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):917:920 -> a
+    433:437:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):958:962 -> a
+    438:438:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():579:579 -> a
+    438:438:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):934 -> a
+    438:438:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):963 -> a
+    439:439:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):934:934 -> a
+    439:439:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):963 -> a
+    440:440:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):964:964 -> a
+    441:447:void addDebugPosition(com.android.tools.r8.ir.code.Position):969:975 -> a
+    448:448:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    448:448:void addDebugPosition(com.android.tools.r8.ir.code.Position):975 -> a
+    449:452:void addDebugPosition(com.android.tools.r8.ir.code.Position):977:980 -> a
+    453:453:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    453:453:void addDebugPosition(com.android.tools.r8.ir.code.Position):980 -> a
+    454:455:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1024:1025 -> a
+    456:476:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):151:171 -> a
+    456:476:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    477:477:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):166:166 -> a
+    477:477:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    478:482:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):160:164 -> a
+    478:482:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    483:483:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):162:162 -> a
+    483:483:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    484:484:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):158:158 -> a
+    484:484:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    485:498:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):156:169 -> a
+    485:498:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    499:502:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1027:1030 -> a
+    503:506:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):646:649 -> a
+    503:506:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1031 -> a
+    507:507:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1033:1033 -> a
+    508:512:void addArrayLength(int,int):1037:1041 -> a
+    513:515:void addCheckCast(int,com.android.tools.r8.graph.DexType):1056:1058 -> a
+    516:516:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    516:516:void addCheckCast(int,com.android.tools.r8.graph.DexType):1058 -> a
+    517:520:void addCheckCast(int,com.android.tools.r8.graph.DexType):1059:1062 -> a
+    521:524:void addConst(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int,long):1075:1078 -> a
+    525:533:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1111:1119 -> a
+    534:534:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    534:534:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1118 -> a
+    535:537:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1120:1122 -> a
+    538:538:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1112:1112 -> a
+    539:547:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1126:1134 -> a
+    548:548:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    548:548:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1133 -> a
+    549:551:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1135:1137 -> a
+    552:552:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1127:1127 -> a
+    553:554:void addConstString(int,com.android.tools.r8.graph.DexString):1147:1148 -> a
+    555:555:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141:1141 -> a
+    555:555:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
+    556:556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    556:556:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
+    556:556:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
+    557:558:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
+    557:558:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
+    559:559:void addConstString(int,com.android.tools.r8.graph.DexString):1150:1150 -> a
+    560:562:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1155:1157 -> a
+    563:563:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141:1141 -> a
+    563:563:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
+    564:564:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    564:564:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
+    564:564:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
+    565:566:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
+    565:566:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
+    567:568:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1159:1160 -> a
+    569:571:com.android.tools.r8.ir.code.Monitor addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1187:1189 -> a
+    572:573:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1198:1199 -> a
+    574:574:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    574:574:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1201 -> a
+    575:577:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1202:1204 -> a
+    578:578:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    578:578:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1204 -> a
+    579:579:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1208:1208 -> a
+    580:586:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1305:1311 -> a
+    587:587:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1319:1319 -> a
+    588:591:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1332:1335 -> a
+    588:591:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1317 -> a
+    592:595:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1332:1335 -> a
+    596:600:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1340:1344 -> a
+    601:601:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    601:601:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1344 -> a
+    602:602:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1344:1344 -> a
+    603:608:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1342:1347 -> a
+    609:609:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    609:609:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1348 -> a
+    610:613:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1352:1355 -> a
+    614:614:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    614:614:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1356 -> a
+    615:624:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1368:1377 -> a
+    625:656:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1371:1402 -> a
+    657:661:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1412:1416 -> a
+    662:665:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1415:1418 -> a
+    666:683:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1445:1462 -> a
+    684:688:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1467:1471 -> a
+    689:692:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1470:1473 -> a
+    693:716:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1484:1507 -> a
+    717:733:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1511:1527 -> a
+    734:758:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1548:1572 -> a
+    759:773:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1576:1590 -> a
+    774:774:boolean lambda$addMoveException$1(com.android.tools.r8.ir.code.BasicBlock):1603:1603 -> a
+    775:778:void addNewArrayFilledData(int,int,long,short[]):1675:1678 -> a
+    779:779:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    779:779:void addNewArrayFilledData(int,int,long,short[]):1679 -> a
+    780:780:void addReturn():1704:1704 -> a
+    781:783:void addReturn(com.android.tools.r8.ir.code.Return):1709:1711 -> a
+    781:783:void addReturn():1704 -> a
+    784:787:void addStaticGet(int,com.android.tools.r8.graph.DexField):1715:1718 -> a
+    788:788:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    788:788:void addStaticGet(int,com.android.tools.r8.graph.DexField):1718 -> a
+    789:789:void addStaticGet(int,com.android.tools.r8.graph.DexField):1718:1718 -> a
+    790:795:void addStaticGet(int,com.android.tools.r8.graph.DexField):1716:1721 -> a
+    796:796:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    796:796:void addStaticGet(int,com.android.tools.r8.graph.DexField):1722 -> a
+    797:840:void addSwitch(int,int[],int,int[]):1754:1797 -> a
     841:841:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
     841:841:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    841:841:void addSwitch(int,int[],int,int[]):1806 -> a
+    841:841:void addSwitch(int,int[],int,int[]):1802 -> a
     842:842:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
     842:842:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    842:842:void addSwitch(int,int[],int,int[]):1807 -> a
-    843:847:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1814:1818 -> a
-    843:847:void addSwitch(int,int[],int,int[]):1808 -> a
-    848:848:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> a
-    848:848:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1820 -> a
-    848:848:void addSwitch(int,int[],int,int[]):1808 -> a
-    849:872:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1821:1844 -> a
-    849:872:void addSwitch(int,int[],int,int[]):1808 -> a
-    873:873:void addSwitch(int,int[],int,int[]):1809:1809 -> a
-    874:875:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014:2015 -> a
-    876:895:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2030:2049 -> a
-    876:895:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    896:896:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095:2095 -> a
-    896:896:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    896:896:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    842:842:void addSwitch(int,int[],int,int[]):1803 -> a
+    843:847:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1810:1814 -> a
+    843:847:void addSwitch(int,int[],int,int[]):1804 -> a
+    848:848:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
+    848:848:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1816 -> a
+    848:848:void addSwitch(int,int[],int,int[]):1804 -> a
+    849:872:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1817:1840 -> a
+    849:872:void addSwitch(int,int[],int,int[]):1804 -> a
+    873:873:void addSwitch(int,int[],int,int[]):1805:1805 -> a
+    874:875:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2010:2011 -> a
+    876:895:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2026:2045 -> a
+    876:895:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    896:896:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2091:2091 -> a
+    896:896:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    896:896:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     897:897:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
-    897:897:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
-    897:897:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    897:897:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    898:898:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095:2095 -> a
-    898:898:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    898:898:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    897:897:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2091 -> a
+    897:897:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    897:897:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    898:898:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2091:2091 -> a
+    898:898:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    898:898:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     899:899:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
-    899:899:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
-    899:899:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    899:899:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    899:899:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2091 -> a
+    899:899:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    899:899:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     900:900:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
-    900:900:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2097 -> a
-    900:900:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    900:900:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    901:901:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2098:2098 -> a
-    901:901:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    901:901:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    900:900:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2093 -> a
+    900:900:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    900:900:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    901:901:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2094:2094 -> a
+    901:901:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    901:901:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     902:912:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():161:171 -> a
-    902:912:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
-    902:912:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    902:912:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    902:912:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
+    902:912:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    902:912:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     913:913:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():167:167 -> a
-    913:913:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
-    913:913:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    913:913:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    913:913:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
+    913:913:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    913:913:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     914:914:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():165:165 -> a
-    914:914:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
-    914:914:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    914:914:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    914:914:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
+    914:914:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    914:914:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     915:915:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():163:163 -> a
-    915:915:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
-    915:915:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    915:915:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    916:934:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2100:2118 -> a
-    916:934:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    916:934:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    915:915:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
+    915:915:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    915:915:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    916:934:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2096:2114 -> a
+    916:934:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    916:934:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     935:935:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
-    935:935:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2097 -> a
-    935:935:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    935:935:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    936:938:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2086:2088 -> a
-    936:938:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2056 -> a
-    936:938:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    939:963:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2057:2081 -> a
-    939:963:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    964:964:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    964:964:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):989 -> a
-    965:965:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    965:965:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):990 -> a
-    966:966:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):991:991 -> a
-    967:967:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> a
-    967:967:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):991 -> a
-    968:968:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):992:992 -> a
-    969:969:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    969:969:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):994 -> a
-    970:970:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    970:970:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1070 -> a
-    971:971:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    971:971:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1071 -> a
-    972:975:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1072:1075 -> a
-    976:976:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    976:976:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1970 -> a
-    977:977:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1971:1971 -> a
-    978:978:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> a
-    978:978:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1971 -> a
-    979:979:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1972:1972 -> a
-    980:980:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    980:980:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1974 -> a
-    981:981:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    981:981:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1646 -> a
-    982:982:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1647:1647 -> a
-    983:983:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> a
-    983:983:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1647 -> a
-    984:984:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1648:1648 -> a
-    985:985:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    985:985:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1650 -> a
-    986:989:com.android.tools.r8.ir.code.Value readIntLiteral(long):2143:2146 -> a
-    990:992:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2153:2155 -> a
-    993:993:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2182:2182 -> a
-    993:993:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1980 -> a
-    994:998:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1981:1985 -> a
-    999:999:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():573:573 -> a
-    999:999:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1985 -> a
-    1000:1010:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1986:1996 -> a
-    1011:1015:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1994:1998 -> a
-    1016:1016:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2182:2182 -> a
-    1016:1016:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2160 -> a
-    1017:1017:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    1017:1017:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2161 -> a
-    1018:1019:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2173:2174 -> a
-    1020:1020:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256:2256 -> a
-    1021:1023:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2288:2290 -> a
-    1021:1023:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256 -> a
-    1024:1030:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2288:2294 -> a
-    1024:1030:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256 -> a
-    1031:1031:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2291:2291 -> a
-    1031:1031:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256 -> a
-    1032:1057:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2257:2282 -> a
-    1058:1062:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2271:2275 -> a
-    1063:1069:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2273:2279 -> a
-    1070:1070:boolean isOffsetProcessed(int):2357:2357 -> a
-    1070:1070:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2350 -> a
-    1070:1070:void ensureSuccessorBlock(int,int,boolean):2386 -> a
-    1071:1073:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2351:2353 -> a
-    1071:1073:void ensureSuccessorBlock(int,int,boolean):2386 -> a
-    1074:1077:int getBlockStartOffset(int):2341:2344 -> a
-    1074:1077:void ensureSuccessorBlock(int,int,boolean):2387 -> a
-    1078:1078:void ensureSuccessorBlock(int,int,boolean):2388:2388 -> a
+    935:935:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2093 -> a
+    935:935:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    935:935:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    936:938:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2082:2084 -> a
+    936:938:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2052 -> a
+    936:938:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    939:963:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2053:2077 -> a
+    939:963:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    964:964:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    964:964:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):985 -> a
+    965:965:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    965:965:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):986 -> a
+    966:966:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):987:987 -> a
+    967:967:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
+    967:967:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):987 -> a
+    968:968:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):988:988 -> a
+    969:969:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    969:969:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):990 -> a
+    970:970:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    970:970:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1066 -> a
+    971:971:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    971:971:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1067 -> a
+    972:975:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1068:1071 -> a
+    976:976:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    976:976:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1966 -> a
+    977:977:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967:1967 -> a
+    978:978:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
+    978:978:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967 -> a
+    979:979:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1968:1968 -> a
+    980:980:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    980:980:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1970 -> a
+    981:981:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    981:981:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1642 -> a
+    982:982:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643:1643 -> a
+    983:983:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
+    983:983:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643 -> a
+    984:984:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1644:1644 -> a
+    985:985:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    985:985:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1646 -> a
+    986:989:com.android.tools.r8.ir.code.Value readIntLiteral(long):2139:2142 -> a
+    990:992:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2149:2151 -> a
+    993:993:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
+    993:993:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1976 -> a
+    994:998:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1977:1981 -> a
+    999:999:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():579:579 -> a
+    999:999:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1981 -> a
+    1000:1010:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1982:1992 -> a
+    1011:1015:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1990:1994 -> a
+    1016:1016:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
+    1016:1016:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2156 -> a
+    1017:1017:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    1017:1017:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2157 -> a
+    1018:1019:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2169:2170 -> a
+    1020:1020:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252:2252 -> a
+    1021:1023:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2286 -> a
+    1021:1023:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1024:1030:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2290 -> a
+    1024:1030:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1031:1031:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2287:2287 -> a
+    1031:1031:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1032:1057:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2253:2278 -> a
+    1058:1062:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2267:2271 -> a
+    1063:1069:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2269:2275 -> a
+    1070:1070:boolean isOffsetProcessed(int):2353:2353 -> a
+    1070:1070:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2346 -> a
+    1070:1070:void ensureSuccessorBlock(int,int,boolean):2382 -> a
+    1071:1073:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2347:2349 -> a
+    1071:1073:void ensureSuccessorBlock(int,int,boolean):2382 -> a
+    1074:1077:int getBlockStartOffset(int):2337:2340 -> a
+    1074:1077:void ensureSuccessorBlock(int,int,boolean):2383 -> a
+    1078:1078:void ensureSuccessorBlock(int,int,boolean):2384:2384 -> a
     1079:1079:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):280:280 -> a
-    1079:1079:void ensureSuccessorBlock(int,int,boolean):2390 -> a
+    1079:1079:void ensureSuccessorBlock(int,int,boolean):2386 -> a
     1080:1080:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):276:276 -> a
-    1080:1080:void ensureSuccessorBlock(int,int,boolean):2391 -> a
+    1080:1080:void ensureSuccessorBlock(int,int,boolean):2387 -> a
     1081:1081:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):293:293 -> a
-    1081:1081:void ensureSuccessorBlock(int,int,boolean):2393 -> a
+    1081:1081:void ensureSuccessorBlock(int,int,boolean):2389 -> a
     1082:1082:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> a
-    1082:1082:void ensureSuccessorBlock(int,int,boolean):2394 -> a
-    1083:1083:void ensureSuccessorBlock(int,int,boolean):2396:2396 -> a
-    1084:1084:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> a
-    1084:1084:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1280 -> a
-    1085:1085:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> a
-    1085:1085:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1281 -> a
-    1086:1091:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1282:1287 -> a
-    1092:1095:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435:2438 -> a
-    1096:1096:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2437:2437 -> a
-    1097:1099:void generateSplitEdgeBlocks():2452:2454 -> a
-    1097:1099:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1100:1100:int getOffset(com.android.tools.r8.ir.code.BasicBlock):2422:2422 -> a
-    1100:1100:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2414 -> a
-    1100:1100:void generateSplitEdgeBlocks():2454 -> a
-    1100:1100:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2410:2410 -> a
-    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2414 -> a
-    1101:1101:void generateSplitEdgeBlocks():2454 -> a
-    1101:1101:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1102:1102:void generateSplitEdgeBlocks():2455:2455 -> a
-    1102:1102:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
+    1082:1082:void ensureSuccessorBlock(int,int,boolean):2390 -> a
+    1083:1083:void ensureSuccessorBlock(int,int,boolean):2392:2392 -> a
+    1084:1084:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
+    1084:1084:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1276 -> a
+    1085:1085:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
+    1085:1085:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1277 -> a
+    1086:1091:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1278:1283 -> a
+    1092:1095:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2431:2434 -> a
+    1096:1096:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2433:2433 -> a
+    1097:1099:void generateSplitEdgeBlocks():2448:2450 -> a
+    1097:1099:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1100:1100:int getOffset(com.android.tools.r8.ir.code.BasicBlock):2418:2418 -> a
+    1100:1100:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
+    1100:1100:void generateSplitEdgeBlocks():2450 -> a
+    1100:1100:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
+    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
+    1101:1101:void generateSplitEdgeBlocks():2450 -> a
+    1101:1101:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1102:1102:void generateSplitEdgeBlocks():2451:2451 -> a
+    1102:1102:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
     1103:1104:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():308:309 -> a
-    1103:1104:void generateSplitEdgeBlocks():2456 -> a
-    1103:1104:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1105:1105:void generateSplitEdgeBlocks():2459:2459 -> a
-    1105:1105:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1106:1106:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2410:2410 -> a
-    1106:1106:void generateSplitEdgeBlocks():2460 -> a
-    1106:1106:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
+    1103:1104:void generateSplitEdgeBlocks():2452 -> a
+    1103:1104:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1105:1105:void generateSplitEdgeBlocks():2455:2455 -> a
+    1105:1105:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1106:1106:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
+    1106:1106:void generateSplitEdgeBlocks():2456 -> a
+    1106:1106:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
     1107:1107:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():297:297 -> a
-    1107:1107:void generateSplitEdgeBlocks():2461 -> a
-    1107:1107:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1108:1118:void generateSplitEdgeBlocks():2464:2474 -> a
-    1108:1118:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1119:1127:void generateSplitEdgeBlocks():2471:2479 -> a
-    1119:1127:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1128:1133:com.android.tools.r8.ir.code.BasicBlock createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2495:2500 -> a
-    1128:1133:void generateSplitEdgeBlocks():2479 -> a
-    1128:1133:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1134:1144:void generateSplitEdgeBlocks():2480:2490 -> a
-    1134:1144:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
+    1107:1107:void generateSplitEdgeBlocks():2457 -> a
+    1107:1107:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1108:1118:void generateSplitEdgeBlocks():2460:2470 -> a
+    1108:1118:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1119:1127:void generateSplitEdgeBlocks():2467:2475 -> a
+    1119:1127:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1128:1133:com.android.tools.r8.ir.code.BasicBlock createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2491:2496 -> a
+    1128:1133:void generateSplitEdgeBlocks():2475 -> a
+    1128:1133:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1134:1144:void generateSplitEdgeBlocks():2476:2486 -> a
+    1134:1144:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
     1145:1147:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():301:303 -> a
-    1145:1147:void generateSplitEdgeBlocks():2490 -> a
-    1145:1147:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1148:1148:void generateSplitEdgeBlocks():2490:2490 -> a
-    1148:1148:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1149:1149:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    1149:1149:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2440 -> a
-    1150:1150:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2441:2441 -> a
-    1151:1151:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2589:2589 -> a
-    1:2:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):870:871 -> b
-    3:3:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> b
-    3:3:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):872 -> b
-    4:5:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):873:874 -> b
-    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    6:6:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):874 -> b
-    7:8:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):875:876 -> b
-    9:9:void addConstantOrUnusedArgument(int):910:910 -> b
-    10:12:void flushArgumentInstructions():929:931 -> b
-    13:26:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):942:955 -> b
-    27:29:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):954:956 -> b
-    30:30:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    30:30:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):957 -> b
-    31:31:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):998:998 -> b
-    32:32:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> b
-    32:32:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):999 -> b
-    33:34:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1000:1001 -> b
-    35:35:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> b
-    35:35:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1001 -> b
-    36:36:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1002:1002 -> b
-    37:37:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    37:37:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1004 -> b
-    38:42:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1049:1053 -> b
-    43:46:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):650:653 -> b
-    43:46:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1054 -> b
-    47:47:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1056:1056 -> b
-    48:53:void addConstClass(int,com.android.tools.r8.graph.DexType):1106:1111 -> b
-    54:57:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1364:1367 -> b
-    58:58:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1535:1535 -> b
-    59:59:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> b
-    59:59:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1535 -> b
-    60:66:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1535:1541 -> b
-    67:70:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1668:1671 -> b
+    1145:1147:void generateSplitEdgeBlocks():2486 -> a
+    1145:1147:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1148:1148:void generateSplitEdgeBlocks():2486:2486 -> a
+    1148:1148:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1149:1149:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    1149:1149:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2436 -> a
+    1150:1150:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2437:2437 -> a
+    1151:1151:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2585:2585 -> a
+    1:2:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):866:867 -> b
+    3:3:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> b
+    3:3:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):868 -> b
+    4:5:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):869:870 -> b
+    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    6:6:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):870 -> b
+    7:8:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):871:872 -> b
+    9:9:void addConstantOrUnusedArgument(int):906:906 -> b
+    10:12:void flushArgumentInstructions():925:927 -> b
+    13:26:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):938:951 -> b
+    27:29:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):950:952 -> b
+    30:30:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    30:30:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):953 -> b
+    31:31:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):994:994 -> b
+    32:32:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> b
+    32:32:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):995 -> b
+    33:34:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):996:997 -> b
+    35:35:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> b
+    35:35:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):997 -> b
+    36:36:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):998:998 -> b
+    37:37:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    37:37:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1000 -> b
+    38:42:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1045:1049 -> b
+    43:46:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):646:649 -> b
+    43:46:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1050 -> b
+    47:47:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1052:1052 -> b
+    48:53:void addConstClass(int,com.android.tools.r8.graph.DexType):1102:1107 -> b
+    54:57:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1360:1363 -> b
+    58:58:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1531 -> b
+    59:59:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    59:59:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531 -> b
+    60:66:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1537 -> b
+    67:70:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1664:1667 -> b
     71:71:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> b
-    71:71:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1671 -> b
-    72:73:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1672:1673 -> b
-    74:74:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    74:74:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1675 -> b
-    75:78:void addStaticPut(int,com.android.tools.r8.graph.DexField):1730:1733 -> b
-    79:79:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> b
-    79:79:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1654 -> b
-    80:80:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1655:1655 -> b
-    81:81:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> b
-    81:81:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1655 -> b
-    82:85:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1657:1660 -> b
-    86:89:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2127:2130 -> b
-    86:89:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1660 -> b
-    90:93:com.android.tools.r8.ir.code.Value readLongLiteral(long):2136:2139 -> b
-    90:93:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2131 -> b
-    90:93:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1660 -> b
-    94:96:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1661:1663 -> b
-    97:97:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    97:97:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1664 -> b
-    98:98:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    99:99:void ensureExceptionalSuccessorBlock(int,int):2404:2404 -> b
-    100:100:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2593:2593 -> b
+    71:71:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1667 -> b
+    72:74:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1668:1670 -> b
+    75:75:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    75:75:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1671 -> b
+    76:79:void addStaticPut(int,com.android.tools.r8.graph.DexField):1726:1729 -> b
+    80:80:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> b
+    80:80:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1650 -> b
+    81:81:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651:1651 -> b
+    82:82:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> b
+    82:82:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651 -> b
+    83:86:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1653:1656 -> b
+    87:90:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2123:2126 -> b
+    87:90:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
+    91:94:com.android.tools.r8.ir.code.Value readLongLiteral(long):2132:2135 -> b
+    91:94:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2127 -> b
+    91:94:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
+    95:97:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1657:1659 -> b
+    98:98:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    98:98:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1660 -> b
+    99:99:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    100:100:void ensureExceptionalSuccessorBlock(int,int):2400:2400 -> b
+    101:101:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2589:2589 -> b
     1:2:java.util.List getArgumentValues():482:483 -> c
-    3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1008:1008 -> c
-    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> c
-    4:4:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1009 -> c
-    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> c
-    5:5:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1010 -> c
-    6:6:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1011:1011 -> c
-    7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> c
-    7:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1011 -> c
-    8:8:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1012:1012 -> c
-    9:9:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> c
-    9:9:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1014 -> c
-    10:10:void addNewInstance(int,com.android.tools.r8.graph.DexType):1688:1688 -> c
+    3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1004:1004 -> c
+    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> c
+    4:4:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1005 -> c
+    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> c
+    5:5:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1006 -> c
+    6:6:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1007:1007 -> c
+    7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> c
+    7:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1007 -> c
+    8:8:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1008:1008 -> c
+    9:9:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
+    9:9:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1010 -> c
+    10:10:void addNewInstance(int,com.android.tools.r8.graph.DexType):1684:1684 -> c
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> c
-    11:11:void addNewInstance(int,com.android.tools.r8.graph.DexType):1688 -> c
-    12:13:void addNewInstance(int,com.android.tools.r8.graph.DexType):1689:1690 -> c
-    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> c
-    14:14:void addNewInstance(int,com.android.tools.r8.graph.DexType):1692 -> c
-    15:17:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2003:2005 -> c
-    18:35:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2299:2316 -> c
-    36:36:void ensureNormalSuccessorBlock(int,int):2400:2400 -> c
-    37:37:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> c
-    37:37:void addGoto(int):1258 -> c
-    38:41:void addGoto(int):1259:1262 -> c
+    11:11:void addNewInstance(int,com.android.tools.r8.graph.DexType):1684 -> c
+    12:14:void addNewInstance(int,com.android.tools.r8.graph.DexType):1685:1687 -> c
+    15:15:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
+    15:15:void addNewInstance(int,com.android.tools.r8.graph.DexType):1688 -> c
+    16:18:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):1999:2001 -> c
+    19:36:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2295:2312 -> c
+    37:37:void ensureNormalSuccessorBlock(int,int):2396:2396 -> c
+    38:38:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> c
+    38:38:void addGoto(int):1254 -> c
+    39:42:void addGoto(int):1255:1258 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getCFG():478:478 -> d
     2:2:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):576:576 -> d
-    3:3:void resolveAndBuildNewArrayFilledData(int,int):838:838 -> d
-    4:4:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1018:1018 -> d
-    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> d
-    5:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1019 -> d
-    6:7:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1020:1021 -> d
-    8:8:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> d
-    8:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1021 -> d
-    9:9:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1022:1022 -> d
-    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> d
-    10:10:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1024 -> d
-    11:16:void addMoveException(int):1606:1611 -> d
-    17:22:boolean verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1615:1620 -> d
-    17:22:void addMoveException(int):1611 -> d
+    3:3:void resolveAndBuildNewArrayFilledData(int,int):834:834 -> d
+    4:4:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1014:1014 -> d
+    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> d
+    5:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1015 -> d
+    6:7:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1016:1017 -> d
+    8:8:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> d
+    8:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1017 -> d
+    9:9:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1018:1018 -> d
+    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> d
+    10:10:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1020 -> d
+    11:16:void addMoveException(int):1602:1607 -> d
+    17:22:boolean verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1611:1616 -> d
+    17:22:void addMoveException(int):1607 -> d
     1:1:com.android.tools.r8.ir.code.Value getReceiverValue():487:487 -> e
-    2:2:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1168:1168 -> e
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> e
-    3:3:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1169 -> e
-    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> e
-    4:4:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1170 -> e
-    5:5:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1172:1172 -> e
-    6:6:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> e
-    6:6:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1171 -> e
-    7:9:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1173:1175 -> e
-    10:10:void addTrivialIf(int,int):1266:1266 -> e
-    11:11:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> e
-    11:11:void addTrivialIf(int,int):1270 -> e
-    12:15:void addTrivialIf(int,int):1273:1276 -> e
-    16:19:void addMoveResult(int):1626:1629 -> e
+    2:2:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1164:1164 -> e
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> e
+    3:3:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1165 -> e
+    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> e
+    4:4:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1166 -> e
+    5:5:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1168:1168 -> e
+    6:6:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> e
+    6:6:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1167 -> e
+    7:9:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1169:1171 -> e
+    10:10:void addTrivialIf(int,int):1262:1262 -> e
+    11:11:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> e
+    11:11:void addTrivialIf(int,int):1266 -> e
+    12:15:void addTrivialIf(int,int):1269:1272 -> e
+    16:19:void addMoveResult(int):1622:1625 -> e
     20:20:boolean com.android.tools.r8.ir.code.Invoke.instructionTypeCanThrow():0:0 -> e
-    20:20:void addMoveResult(int):1629 -> e
-    21:25:void addMoveResult(int):1630:1634 -> e
-    26:33:void addMoveResult(int):1633:1640 -> e
+    20:20:void addMoveResult(int):1625 -> e
+    21:25:void addMoveResult(int):1626:1630 -> e
+    26:33:void addMoveResult(int):1629:1636 -> e
     34:34:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> e
-    34:34:void addMoveResult(int):1640 -> e
-    35:36:void addMoveResult(int):1641:1642 -> e
+    34:34:void addMoveResult(int):1636 -> e
+    35:36:void addMoveResult(int):1637:1638 -> e
     1:1:boolean isDebugMode():474:474 -> f
-    2:2:void addNullConst(int):1102:1102 -> f
-    3:4:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1179:1180 -> f
-    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> f
-    5:5:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1181 -> f
-    6:8:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1182:1184 -> f
-    9:9:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> f
-    9:9:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1183 -> f
-    10:12:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1185:1187 -> f
-    13:13:void checkInvokeArgumentRegisters(int,int):1599:1599 -> f
+    2:2:void addNullConst(int):1098:1098 -> f
+    3:4:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1175:1176 -> f
+    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> f
+    5:5:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1177 -> f
+    6:8:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1178:1180 -> f
+    9:9:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> f
+    9:9:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1179 -> f
+    10:12:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1181:1183 -> f
+    13:13:void checkInvokeArgumentRegisters(int,int):1595:1595 -> f
     14:14:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> f
-    14:14:void checkInvokeArgumentRegisters(int,int):1599 -> f
-    15:15:void checkInvokeArgumentRegisters(int,int):1599:1599 -> f
-    1:8:void addReturn(int):1696:1703 -> g
-    9:11:void addReturn(com.android.tools.r8.ir.code.Return):1713:1715 -> g
-    9:11:void addReturn(int):1703 -> g
-    12:12:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> g
-    12:12:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1216 -> g
-    13:13:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> g
-    13:13:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1217 -> g
-    14:14:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1218:1218 -> g
-    15:15:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> g
-    15:15:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1218 -> g
-    16:16:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1219:1219 -> g
-    17:17:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> g
-    17:17:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1221 -> g
-    18:19:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2426:2427 -> g
+    14:14:void checkInvokeArgumentRegisters(int,int):1595 -> f
+    15:15:void checkInvokeArgumentRegisters(int,int):1595:1595 -> f
+    1:8:void addReturn(int):1692:1699 -> g
+    9:11:void addReturn(com.android.tools.r8.ir.code.Return):1709:1711 -> g
+    9:11:void addReturn(int):1699 -> g
+    12:12:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> g
+    12:12:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1212 -> g
+    13:13:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> g
+    13:13:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1213 -> g
+    14:14:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1214:1214 -> g
+    15:15:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> g
+    15:15:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1214 -> g
+    16:16:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1215:1215 -> g
+    17:17:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> g
+    17:17:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1217 -> g
+    18:19:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2422:2423 -> g
     20:20:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):498:498 -> g
-    20:20:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2428 -> g
-    21:23:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2429:2431 -> g
-    1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo getRemovedArgumentInfo():852:857 -> h
-    7:9:void addThisArgument(int):862:864 -> h
+    20:20:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2424 -> g
+    21:23:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2425:2427 -> g
+    1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo getRemovedArgumentInfo():848:853 -> h
+    7:9:void addThisArgument(int):858:860 -> h
     10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> h
-    10:10:void addThisArgument(int):865 -> h
-    11:11:void addThisArgument(int):866:866 -> h
-    12:12:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1225:1225 -> h
-    13:13:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> h
-    13:13:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1226 -> h
-    14:15:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1227:1228 -> h
-    16:16:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> h
-    16:16:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1228 -> h
-    17:17:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1229:1229 -> h
-    18:18:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> h
-    18:18:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1231 -> h
-    1:5:void addThrow(int):1848:1852 -> i
-    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> i
-    6:6:void addThrow(int):1852 -> i
-    7:7:void addThrow(int):1853:1853 -> i
-    8:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1857:1857 -> i
-    9:9:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> i
-    9:9:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1858 -> i
-    10:10:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> i
-    10:10:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1859 -> i
-    11:11:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1860:1860 -> i
-    12:12:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> i
-    12:12:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1860 -> i
-    13:13:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1861:1861 -> i
-    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> i
-    14:14:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1863 -> i
-    1:1:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1867:1867 -> j
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> j
-    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1868 -> j
-    3:4:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1869:1870 -> j
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> j
-    5:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1870 -> j
-    6:6:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1871:1871 -> j
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> j
-    7:7:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1873 -> j
-    8:9:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2323:2324 -> j
-    10:10:boolean isOffsetProcessed(int):2357:2357 -> j
-    10:10:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2327 -> j
-    11:14:int getBlockStartOffset(int):2341:2344 -> j
-    11:14:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2328 -> j
-    15:16:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2329:2330 -> j
+    10:10:void addThisArgument(int):861 -> h
+    11:11:void addThisArgument(int):862:862 -> h
+    12:12:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1221:1221 -> h
+    13:13:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> h
+    13:13:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1222 -> h
+    14:15:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1223:1224 -> h
+    16:16:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> h
+    16:16:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1224 -> h
+    17:17:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1225:1225 -> h
+    18:18:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> h
+    18:18:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1227 -> h
+    1:5:void addThrow(int):1844:1848 -> i
+    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> i
+    6:6:void addThrow(int):1848 -> i
+    7:7:void addThrow(int):1849:1849 -> i
+    8:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1853:1853 -> i
+    9:9:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> i
+    9:9:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1854 -> i
+    10:10:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> i
+    10:10:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1855 -> i
+    11:11:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1856:1856 -> i
+    12:12:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> i
+    12:12:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1856 -> i
+    13:13:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1857:1857 -> i
+    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> i
+    14:14:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1859 -> i
+    1:1:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1863:1863 -> j
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> j
+    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1864 -> j
+    3:4:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1865:1866 -> j
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> j
+    5:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1866 -> j
+    6:6:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1867:1867 -> j
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> j
+    7:7:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1869 -> j
+    8:9:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2319:2320 -> j
+    10:10:boolean isOffsetProcessed(int):2353:2353 -> j
+    10:10:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2323 -> j
+    11:14:int getBlockStartOffset(int):2337:2340 -> j
+    11:14:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2324 -> j
+    15:16:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2325:2326 -> j
     17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:315 -> j
-    17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     19:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
     19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315 -> j
-    19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     21:26:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315:320 -> j
-    21:26:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    21:26:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     27:28:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):284:285 -> j
     27:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):321 -> j
-    27:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    27:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):323:324 -> j
-    29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     31:32:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
     31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324 -> j
-    31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     33:37:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324:328 -> j
-    33:37:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    33:37:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     38:38:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> j
     38:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):329 -> j
-    38:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    38:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
-    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     40:41:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):76:77 -> j
     40:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331 -> j
-    40:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    40:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     42:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
-    42:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    42:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:314 -> j
-    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
-    44:47:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2332:2335 -> j
-    1:1:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1235:1235 -> k
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> k
-    2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1236 -> k
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> k
-    3:3:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1237 -> k
-    4:4:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1239:1239 -> k
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> k
-    5:5:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1238 -> k
-    6:7:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1240:1241 -> k
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> k
-    8:8:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1242 -> k
-    9:10:void checkRegister(int):2193:2194 -> k
+    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    44:47:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2328:2331 -> j
+    1:1:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1231:1231 -> k
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> k
+    2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1232 -> k
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> k
+    3:3:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1233 -> k
+    4:4:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1235:1235 -> k
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> k
+    5:5:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1234 -> k
+    6:7:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1236:1237 -> k
+    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> k
+    8:8:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1238 -> k
+    9:10:void checkRegister(int):2189:2190 -> k
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> k
-    11:11:void checkRegister(int):2194 -> k
-    12:12:void checkRegister(int):2194:2194 -> k
-    13:13:void checkRegister(int):2191:2191 -> k
-    1:2:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1246:1247 -> l
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> l
-    3:3:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1248 -> l
-    4:6:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1249:1251 -> l
-    7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> l
-    7:7:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1250 -> l
-    8:9:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1252:1253 -> l
-    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> l
-    10:10:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1254 -> l
-    11:11:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> l
-    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1746:1746 -> m
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> m
-    2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1747 -> m
-    3:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1748:1749 -> m
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> m
-    5:5:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1749 -> m
-    6:6:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1752:1752 -> m
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> m
-    7:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1754 -> m
-    8:9:boolean isIndexProcessed(int):2361:2362 -> m
-    10:11:void ensureSubroutineProcessedInstructions():2379:2380 -> m
-    10:11:boolean isIndexProcessed(int):2364 -> m
-    12:12:boolean isIndexProcessed(int):2365:2365 -> m
-    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1877:1877 -> n
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> n
-    2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1878 -> n
-    3:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1879:1880 -> n
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> n
-    5:5:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1880 -> n
-    6:6:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1881:1881 -> n
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> n
-    7:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1883 -> n
-    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1887:1887 -> o
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> o
-    2:2:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1888 -> o
-    3:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1889:1890 -> o
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> o
-    5:5:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1890 -> o
-    6:6:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1891:1891 -> o
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> o
-    7:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1893 -> o
-    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1897:1897 -> p
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> p
-    2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1898 -> p
-    3:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1899:1900 -> p
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> p
-    5:5:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1900 -> p
-    6:6:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1901:1901 -> p
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> p
-    7:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1903 -> p
-    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1907:1907 -> q
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> q
-    2:2:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1908 -> q
-    3:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1909:1910 -> q
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> q
-    5:5:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1910 -> q
-    6:6:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1911:1911 -> q
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> q
-    7:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1913 -> q
-    1:1:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> r
-    1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1737 -> r
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> r
-    2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1738 -> r
-    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1739:1739 -> r
-    4:4:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> r
-    4:4:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1739 -> r
-    5:5:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1740:1740 -> r
-    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> r
-    6:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1742 -> r
-    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1917:1917 -> s
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> s
-    2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1918 -> s
-    3:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1919:1920 -> s
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> s
-    5:5:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1920 -> s
-    6:6:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1921:1921 -> s
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> s
-    7:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1923 -> s
-    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1927:1927 -> t
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> t
-    2:2:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1928 -> t
-    3:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1929:1930 -> t
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> t
-    5:5:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1930 -> t
-    6:6:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1931:1931 -> t
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> t
-    7:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1933 -> t
-    1:7:java.lang.String toString():2602:2608 -> toString
-    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1937:1937 -> u
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> u
-    2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1938 -> u
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> u
-    3:3:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1939 -> u
-    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1940:1940 -> u
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> u
-    5:5:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1940 -> u
-    6:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1942:1949 -> u
-    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> u
-    14:14:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1950 -> u
-    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1954:1954 -> v
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> v
-    2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1955 -> v
-    3:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1957:1958 -> v
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> v
-    5:5:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1958 -> v
-    6:9:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1959:1962 -> v
-    10:10:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> v
-    10:10:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1962 -> v
-    11:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1963:1965 -> v
-    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> v
-    14:14:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1966 -> v
-com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.D.c.S:
+    11:11:void checkRegister(int):2190 -> k
+    12:12:void checkRegister(int):2190:2190 -> k
+    13:13:void checkRegister(int):2187:2187 -> k
+    1:2:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1242:1243 -> l
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> l
+    3:3:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1244 -> l
+    4:6:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1245:1247 -> l
+    7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> l
+    7:7:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1246 -> l
+    8:9:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1248:1249 -> l
+    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> l
+    10:10:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1250 -> l
+    11:11:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> l
+    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1742:1742 -> m
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> m
+    2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1743 -> m
+    3:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1744:1745 -> m
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> m
+    5:5:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1745 -> m
+    6:6:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1748:1748 -> m
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> m
+    7:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1750 -> m
+    8:9:boolean isIndexProcessed(int):2357:2358 -> m
+    10:11:void ensureSubroutineProcessedInstructions():2375:2376 -> m
+    10:11:boolean isIndexProcessed(int):2360 -> m
+    12:12:boolean isIndexProcessed(int):2361:2361 -> m
+    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1873:1873 -> n
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> n
+    2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1874 -> n
+    3:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1875:1876 -> n
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> n
+    5:5:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1876 -> n
+    6:6:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1877:1877 -> n
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> n
+    7:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1879 -> n
+    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1883:1883 -> o
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> o
+    2:2:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1884 -> o
+    3:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1885:1886 -> o
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> o
+    5:5:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1886 -> o
+    6:6:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1887:1887 -> o
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> o
+    7:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1889 -> o
+    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1893:1893 -> p
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> p
+    2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1894 -> p
+    3:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1895:1896 -> p
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> p
+    5:5:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1896 -> p
+    6:6:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1897:1897 -> p
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> p
+    7:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1899 -> p
+    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1903:1903 -> q
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> q
+    2:2:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1904 -> q
+    3:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1905:1906 -> q
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> q
+    5:5:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1906 -> q
+    6:6:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1907:1907 -> q
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> q
+    7:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1909 -> q
+    1:1:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> r
+    1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1733 -> r
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> r
+    2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1734 -> r
+    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1735:1735 -> r
+    4:4:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> r
+    4:4:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1735 -> r
+    5:5:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1736:1736 -> r
+    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> r
+    6:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1738 -> r
+    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1913:1913 -> s
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> s
+    2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1914 -> s
+    3:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1915:1916 -> s
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> s
+    5:5:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1916 -> s
+    6:6:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1917:1917 -> s
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> s
+    7:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1919 -> s
+    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1923:1923 -> t
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> t
+    2:2:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1924 -> t
+    3:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1925:1926 -> t
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> t
+    5:5:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1926 -> t
+    6:6:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1927:1927 -> t
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> t
+    7:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1929 -> t
+    1:7:java.lang.String toString():2598:2604 -> toString
+    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1933:1933 -> u
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> u
+    2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1934 -> u
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> u
+    3:3:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1935 -> u
+    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1936:1936 -> u
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> u
+    5:5:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1936 -> u
+    6:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1938:1945 -> u
+    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> u
+    14:14:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1946 -> u
+    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1950:1950 -> v
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> v
+    2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1951 -> v
+    3:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1953:1954 -> v
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> v
+    5:5:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1954 -> v
+    6:9:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1955:1958 -> v
+    10:10:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> v
+    10:10:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1958 -> v
+    11:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1959:1961 -> v
+    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> v
+    14:14:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1962 -> v
+com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.D.c.Q:
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> a
     1:1:void <clinit>():151:151 -> <clinit>
-com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.D.c.T:
+com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.D.c.S:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalPredecessors -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalSuccessors -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet normalPredecessors -> b
@@ -29359,7 +29385,7 @@
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:6:void <init>():268:273 -> <init>
     1:25:java.lang.String toString():337:361 -> toString
-com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.D.c.U:
+com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.D.c.T:
     com.android.tools.r8.graph.DexType guard -> d
     int targetOffset -> f
     int sourceOffset -> e
@@ -29368,7 +29394,7 @@
     1:1:int access$600(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):193:193 -> a
     1:1:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):193:193 -> b
     1:1:int access$800(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):193:193 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.D.c.V:
+com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.D.c.U:
     int sourceOffset -> d
     int targetOffset -> e
     com.android.tools.r8.ir.code.Position position -> f
@@ -29376,13 +29402,13 @@
     1:1:int access$200(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):207:207 -> a
     1:1:int access$300(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):207:207 -> b
     1:1:com.android.tools.r8.ir.code.Position access$500(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):207:207 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.D.c.W:
+com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.D.c.V:
     java.util.List values -> a
     1:3:void <init>():230:232 -> <init>
     1:3:com.android.tools.r8.ir.conversion.IRBuilder$ValueList fromPhis(java.util.List,int):238:240 -> a
     1:9:boolean equals(java.lang.Object):252:260 -> equals
     1:1:int hashCode():247:247 -> hashCode
-com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.D.c.X:
+com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.D.c.W:
     int firstInstructionIndex -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.code.BasicBlock block -> a
@@ -29391,7 +29417,7 @@
     2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):186:189 -> <init>
     1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> a
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> b
-com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.D.c.Z:
+com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.D.c.Y:
     java.util.List neverMergePrefixes -> Q
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> D
@@ -29440,353 +29466,322 @@
     com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> h
     1:1:void <clinit>():119:119 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):185:185 -> <init>
-    2:174: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):168:340 -> <init>
+    2:170: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):168:336 -> <init>
     boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):689 -> a
-    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):689:689 -> a
-    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685:685 -> a
+    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685 -> a
+    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685:685 -> a
+    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):681:681 -> a
     4:4:java.lang.String lambda$new$0(java.lang.String):205:205 -> a
-    5:8:java.util.Set getDesugaredCallSites():344:347 -> a
-    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):448:455 -> a
-    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):388:389 -> a
-    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):457 -> a
-    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):395:397 -> a
-    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458 -> a
-    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459:459 -> a
-    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):419:420 -> a
-    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459 -> a
-    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):428:429 -> a
-    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):460 -> a
-    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):435:436 -> a
-    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):461 -> a
-    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):441:442 -> a
-    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):462 -> a
-    31:32:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):914:915 -> a
-    31:32:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):463 -> a
-    33:36:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):465:468 -> a
-    37:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):472:478 -> a
-    44:45:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):503:504 -> a
-    44:45:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):479 -> a
-    46:53:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):106:113 -> a
-    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):505 -> a
-    46:53:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):479 -> a
-    54:54:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):505:505 -> a
-    54:54:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):479 -> a
-    55:59:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):541:545 -> a
-    60:62:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):560:562 -> a
-    63:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):626:634 -> a
-    72:73:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):894:895 -> a
-    72:73:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):635 -> a
-    74:75:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):409:410 -> a
-    74:75:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):636 -> a
-    76:84:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):645:653 -> a
-    85:85:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):169:169 -> a
-    85:85:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    85:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    86:87:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):56:57 -> a
-    86:87:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    86:87:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    86:87:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    88:88:boolean com.android.tools.r8.ir.conversion.CallGraphBuilder.verifyAllMethodsWithCodeExists():54:54 -> a
-    88:88:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57 -> a
-    88:88:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    88:88:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    88:88:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    89:89:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    89:89:boolean com.android.tools.r8.ir.conversion.CallGraphBuilder.verifyAllMethodsWithCodeExists():55 -> a
-    89:89:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57 -> a
-    89:89:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    89:89:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    89:89:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    90:91:boolean com.android.tools.r8.ir.conversion.CallGraphBuilder.verifyAllMethodsWithCodeExists():55:56 -> a
-    90:91:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57 -> a
-    90:91:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    90:91:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    90:91:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    92:92:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    92:92:boolean com.android.tools.r8.ir.conversion.CallGraphBuilder.verifyAllMethodsWithCodeExists():55 -> a
-    92:92:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57 -> a
-    92:92:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    92:92:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    92:92:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    93:95:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):59:61 -> a
-    93:95:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    93:95:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    93:95:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    96:96:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet():405:405 -> a
-    96:96:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.lang.Iterable):430 -> a
-    96:96:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):61 -> a
-    96:96:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    96:96:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    96:96:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    97:97:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.lang.Iterable):431:431 -> a
-    97:97:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):61 -> a
-    97:97:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    97:97:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    97:97:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    98:104:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):62:68 -> a
-    98:104:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    98:104:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    98:104:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    105:105:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):176:176 -> a
-    105:105:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    106:158:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654:706 -> a
-    159:159:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    159:159:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):706 -> a
-    160:160:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):707:707 -> a
-    161:162:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):403:404 -> a
-    161:162:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):708 -> a
-    163:170:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):709:716 -> a
-    171:173:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):395:397 -> a
-    171:173:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):717 -> a
-    174:175:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719:720 -> a
-    176:177:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):419:420 -> a
-    176:177:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):720 -> a
-    178:178:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722:722 -> a
-    179:180:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):428:429 -> a
-    179:180:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):723 -> a
-    181:182:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):435:436 -> a
-    181:182:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):724 -> a
-    183:185:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):725:727 -> a
-    186:187: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):905:906 -> a
-    186:187:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):728 -> a
-    188:188:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):730:730 -> a
-    189:190:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):914:915 -> a
-    189:190:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731 -> a
-    191:193:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):733:735 -> a
-    194:212:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):734:752 -> a
-    213:215:com.android.tools.r8.graph.DexType computeOutlineClassType():956:958 -> a
-    213:215:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752 -> a
-    216:216:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    216:216:com.android.tools.r8.graph.DexType computeOutlineClassType():958 -> a
-    216:216:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752 -> a
-    217:219:com.android.tools.r8.graph.DexType computeOutlineClassType():959:961 -> a
-    217:219:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752 -> a
-    220:275:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752:807 -> a
-    276:283:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):801:808 -> a
-    284:284:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    284:284:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    285:285:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):664:664 -> a
-    286:286:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):660:660 -> a
-    287:288:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):749:750 -> a
-    289:292:void waveStart(java.util.Collection):812:815 -> a
-    293:293:void addWaveDoneAction(com.android.tools.r8.utils.Action):826:826 -> a
-    294:294:boolean isInWave():836:836 -> a
-    294:294:void addWaveDoneAction(com.android.tools.r8.utils.Action):829 -> a
-    295:295:void addWaveDoneAction(com.android.tools.r8.utils.Action):832:832 -> a
-    296:296:void addWaveDoneAction(com.android.tools.r8.utils.Action):830:830 -> a
-    297:297:void addWaveDoneAction(com.android.tools.r8.utils.Action):827:827 -> a
-    298:298:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):840:840 -> a
-    299:304:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):850:855 -> a
-    305:323:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):854:872 -> a
-    324:335:java.lang.Object lambda$forEachSelectedOutliningMethod$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):857:868 -> a
-    336:336:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):877:877 -> a
-    337:337:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    337:337:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):878 -> a
-    338:340:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):878:880 -> a
-    341:352:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):879:890 -> a
-    353:353:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    353:353:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):878 -> a
-    354:354:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):924:924 -> a
-    355:358:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):968:971 -> a
-    359:364:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):977:982 -> a
-    365:370:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):986:991 -> a
-    371:371:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    371:371:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):992 -> a
-    372:372:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):992:992 -> a
-    373:373:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):988:988 -> a
-    374:376:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):1009:1011 -> a
-    377:377:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):1010:1010 -> a
-    378:378:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1013:1013 -> a
-    379:379:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    379:379:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1017 -> a
-    380:380:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1017:1017 -> a
-    381:381:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1013:1013 -> a
-    382:388:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1034:1040 -> a
-    389:391:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1082:1084 -> a
-    392:397:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1083:1088 -> a
-    398:398:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1025:1025 -> a
-    398:398:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1088 -> a
-    399:399:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1088:1088 -> a
-    400:413:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1087:1100 -> a
-    414:419:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1731:1736 -> a
-    414:419:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1103 -> a
-    420:426:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1104:1110 -> a
-    427:427:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1286:1286 -> a
-    427:427:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1110 -> a
-    428:442:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1111:1125 -> a
-    443:443:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():984:984 -> a
-    443:443:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1125 -> a
-    444:463:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1126:1145 -> a
-    464:464:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1484 -> a
-    464:464:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    465:465:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    465:465:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484 -> a
-    465:465:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    466:468:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1486 -> a
-    466:468:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    469:469:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    469:469:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1486 -> a
-    469:469:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    470:473:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1487:1490 -> a
-    470:473:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    474:488:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1154:1168 -> a
-    489:489:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
-    489:489:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1169 -> a
-    490:535:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1170:1215 -> a
-    536:536:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    536:536:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1215 -> a
-    537:591:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1220:1274 -> a
-    592:594:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1045:1047 -> a
-    592:594:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1275 -> a
-    595:603:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1278:1286 -> a
-    604:622:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1285:1303 -> a
-    623:623:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():984:984 -> a
-    623:623:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1303 -> a
-    624:647:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1304:1327 -> a
-    648:666:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1319:1337 -> a
-    667:667:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    667:667:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1320 -> a
-    668:717:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1340:1389 -> a
-    718:718:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    718:718:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1389 -> a
-    719:729:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1390:1400 -> a
-    730:735:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):894:899 -> a
-    730:735:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1400 -> a
-    736:784:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1401:1449 -> a
-    785:785:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1294:1294 -> a
-    785:785:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1449 -> a
-    786:793:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1450:1457 -> a
-    794:794:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
-    794:794:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1460 -> a
-    795:800:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1460:1465 -> a
-    801:801:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
-    801:801:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465 -> a
-    802:803:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1466 -> a
-    804:809:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1470 -> a
-    810:810:void lambda$rewriteCodeInternal$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1202:1202 -> a
-    811:811:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1329:1329 -> a
-    812:813:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1474:1475 -> a
-    814:814:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    814:814:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1475 -> a
-    815:819:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1494:1498 -> a
-    815:819:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
-    820:820:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1478:1478 -> a
-    821:821:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1503:1503 -> a
-    821:821:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    822:827:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1542:1547 -> a
-    822:827:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    822:827:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    828:828:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1319:1319 -> a
-    828:828:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1547 -> a
-    828:828:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    828:828:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    829:829:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548:1548 -> a
-    829:829:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    829:829:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    830:842:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3712:3724 -> a
-    830:842:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
-    830:842:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    830:842:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    843:843:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    843:843:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3725 -> a
-    843:843:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
-    843:843:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    843:843:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    844:845:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3725:3726 -> a
-    844:845:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
-    844:845:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    844:845:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    846:846:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3712:3712 -> a
-    846:846:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
-    846:846:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    846:846:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    847:856:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1550:1559 -> a
-    847:856:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    847:856:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    857:857:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1558:1558 -> a
-    857:857:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    857:857:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    858:858:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1506:1506 -> a
-    858:858:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    859:863:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> a
-    859:863:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507 -> a
-    859:863:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    864:866:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1508:1510 -> a
-    864:866:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    867:867:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1025:1025 -> a
-    867:867:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510 -> a
-    867:867:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    868:868:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510:1510 -> a
-    868:868:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    869:873:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1509:1513 -> a
-    869:873:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    874:874:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616:1616 -> a
-    875:875:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1270:1270 -> a
-    875:875:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616 -> a
-    876:887:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1619:1630 -> a
-    888:890:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1676:1678 -> a
-    888:890:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1631 -> a
-    891:891:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1634:1634 -> a
-    892:893:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1683:1684 -> a
-    892:893:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1635 -> a
-    894:895:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1688:1689 -> a
-    894:895:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1638 -> a
-    896:897:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641:1642 -> a
-    898:902:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1662:1666 -> a
-    898:902:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1643 -> a
-    903:908:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1644:1649 -> a
-    909:909: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):1698:1698 -> a
-    909:909:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
-    910:910:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    910:910: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):1698 -> a
+    5:8:java.util.Set getDesugaredCallSites():340:343 -> a
+    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):444:451 -> a
+    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):384:385 -> a
+    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):453 -> a
+    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):391:393 -> a
+    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):454 -> a
+    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455:455 -> a
+    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):415:416 -> a
+    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455 -> a
+    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):424:425 -> a
+    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):456 -> a
+    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):431:432 -> a
+    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):457 -> a
+    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):437:438 -> a
+    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458 -> a
+    31:32:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):901:902 -> a
+    31:32:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459 -> a
+    33:36:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):461:464 -> a
+    37:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):468:474 -> a
+    44:45:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):499:500 -> a
+    44:45:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    46:53:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):102:109 -> a
+    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):501 -> a
+    46:53:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    54:54:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):501:501 -> a
+    54:54:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    55:59:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):537:541 -> a
+    60:62:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):556:558 -> a
+    63:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):622:630 -> a
+    72:73:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):881:882 -> a
+    72:73:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):631 -> a
+    74:74:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    74:74:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):882 -> a
+    74:74:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):631 -> a
+    75:76:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):405:406 -> a
+    75:76:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):632 -> a
+    77:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):641:649 -> a
+    86:86:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):156:156 -> a
+    86:86:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170 -> a
+    86:86:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
+    87:88:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170:171 -> a
+    87:88:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
+    89:140:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):650:701 -> a
+    141:141:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    141:141:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):701 -> a
+    142:142:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):702:702 -> a
+    143:144:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):399:400 -> a
+    143:144:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):703 -> a
+    145:148:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):707:710 -> a
+    149:151:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):391:393 -> a
+    149:151:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):711 -> a
+    152:153:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):713:714 -> a
+    154:155:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):415:416 -> a
+    154:155:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):714 -> a
+    156:156:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716:716 -> a
+    157:158:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):424:425 -> a
+    157:158:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):717 -> a
+    159:160:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):431:432 -> a
+    159:160:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):718 -> a
+    161:163:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719:721 -> a
+    164:165: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):892:893 -> a
+    164:165:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722 -> a
+    166:166:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):724:724 -> a
+    167:168:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):901:902 -> a
+    167:168:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):725 -> a
+    169:171:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):727:729 -> a
+    172:187:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):728:743 -> a
+    188:190:com.android.tools.r8.graph.DexType computeOutlineClassType():943:945 -> a
+    188:190:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    191:191:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    191:191:com.android.tools.r8.graph.DexType computeOutlineClassType():945 -> a
+    191:191:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    192:194:com.android.tools.r8.graph.DexType computeOutlineClassType():946:948 -> a
+    192:194:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    195:247:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743:795 -> a
+    248:255:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):789:796 -> a
+    256:256:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    256:256:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
+    257:257:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):660:660 -> a
+    258:258:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):656:656 -> a
+    259:260:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):740:741 -> a
+    261:264:void waveStart(java.util.Collection):800:803 -> a
+    265:265:void addWaveDoneAction(com.android.tools.r8.utils.Action):814:814 -> a
+    266:266:boolean isInWave():824:824 -> a
+    266:266:void addWaveDoneAction(com.android.tools.r8.utils.Action):817 -> a
+    267:267:void addWaveDoneAction(com.android.tools.r8.utils.Action):820:820 -> a
+    268:268:void addWaveDoneAction(com.android.tools.r8.utils.Action):818:818 -> a
+    269:269:void addWaveDoneAction(com.android.tools.r8.utils.Action):815:815 -> a
+    270:270:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):828:828 -> a
+    271:276:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):838:843 -> a
+    277:294:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):842:859 -> a
+    295:305:java.lang.Object lambda$forEachSelectedOutliningMethod$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):845:855 -> a
+    306:306:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):864:864 -> a
+    307:307:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    307:307:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):865 -> a
+    308:310:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):865:867 -> a
+    311:322:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):866:877 -> a
+    323:323:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    323:323:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):865 -> a
+    324:324:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):911:911 -> a
+    325:328:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):955:958 -> a
+    329:334:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):964:969 -> a
+    335:340:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):973:978 -> a
+    341:341:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
+    341:341:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):979 -> a
+    342:342:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):979:979 -> a
+    343:343:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):975:975 -> a
+    344:346:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):996:998 -> a
+    347:347:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):997:997 -> a
+    348:348:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1000:1000 -> a
+    349:349:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
+    349:349:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1004 -> a
+    350:350:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1004:1004 -> a
+    351:351:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1000:1000 -> a
+    352:358:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1021:1027 -> a
+    359:361:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1069:1071 -> a
+    362:367:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1070:1075 -> a
+    368:368:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    368:368:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075 -> a
+    369:369:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075:1075 -> a
+    370:383:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1074:1087 -> a
+    384:389:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1731:1736 -> a
+    384:389:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1090 -> a
+    390:396:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1091:1097 -> a
+    397:397:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1281:1281 -> a
+    397:397:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1097 -> a
+    398:412:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1098:1112 -> a
+    413:413:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
+    413:413:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1112 -> a
+    414:428:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1113:1127 -> a
+    429:429:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1484 -> a
+    429:429:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    430:430:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    430:430:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484 -> a
+    430:430:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    431:433:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1486 -> a
+    431:433:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    434:434:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    434:434:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1486 -> a
+    434:434:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    435:438:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1487:1490 -> a
+    435:438:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    439:453:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1136:1150 -> a
+    454:454:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
+    454:454:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1151 -> a
+    455:500:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1152:1197 -> a
+    501:501:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    501:501:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1197 -> a
+    502:555:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1202:1255 -> a
+    556:558:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1032:1034 -> a
+    556:558:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1256 -> a
+    559:567:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1259:1267 -> a
+    568:586:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1266:1284 -> a
+    587:587:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
+    587:587:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1284 -> a
+    588:611:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1285:1308 -> a
+    612:630:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1300:1318 -> a
+    631:631:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    631:631:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1301 -> a
+    632:681:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1321:1370 -> a
+    682:682:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    682:682:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1370 -> a
+    683:693:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1371:1381 -> a
+    694:699:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):891:896 -> a
+    694:699:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1381 -> a
+    700:743:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1382:1425 -> a
+    744:748:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:193 -> a
+    744:748:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    749:755:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):205:211 -> a
+    749:755:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):196 -> a
+    749:755:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    756:759:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):198:201 -> a
+    756:759:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    760:776:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1426:1442 -> a
+    777:777:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:189 -> a
+    777:777:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    778:780:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1447:1449 -> a
+    781:781:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1289:1289 -> a
+    781:781:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1449 -> a
+    782:789:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1450:1457 -> a
+    790:790:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    790:790:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1460 -> a
+    791:796:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1460:1465 -> a
+    797:797:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    797:797:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465 -> a
+    798:799:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1466 -> a
+    800:805:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1470 -> a
+    806:806:void lambda$rewriteCodeInternal$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1184:1184 -> a
+    807:807:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1310:1310 -> a
+    808:809:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1474:1475 -> a
+    810:810:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    810:810:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1475 -> a
+    811:815:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1494:1498 -> a
+    811:815:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
+    816:816:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1478:1478 -> a
+    817:817:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1503:1503 -> a
+    817:817:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    818:823:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1542:1547 -> a
+    818:823:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    818:823:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    824:824:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1314:1314 -> a
+    824:824:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1547 -> a
+    824:824:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    824:824:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    825:825:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548:1548 -> a
+    825:825:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    825:825:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    826:838:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3680:3692 -> a
+    826:838:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    826:838:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    826:838:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    839:839:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    839:839:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3693 -> a
+    839:839:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    839:839:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    839:839:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    840:841:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3693:3694 -> a
+    840:841:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    840:841:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    840:841:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    842:842:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3680:3680 -> a
+    842:842:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    842:842:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    842:842:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    843:852:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1550:1559 -> a
+    843:852:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    843:852:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    853:853:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1558:1558 -> a
+    853:853:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    853:853:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    854:854:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1506:1506 -> a
+    854:854:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    855:859:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> a
+    855:859:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507 -> a
+    855:859:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    860:862:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1508:1510 -> a
+    860:862:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    863:863:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    863:863:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510 -> a
+    863:863:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    864:864:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510:1510 -> a
+    864:864:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    865:869:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1509:1513 -> a
+    865:869:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    870:870:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616:1616 -> a
+    871:871:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1265:1265 -> a
+    871:871:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616 -> a
+    872:883:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1619:1630 -> a
+    884:886:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1676:1678 -> a
+    884:886:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1631 -> a
+    887:887:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1634:1634 -> a
+    888:889:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1683:1684 -> a
+    888:889:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1635 -> a
+    890:891:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1688:1689 -> a
+    890:891:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1638 -> a
+    892:893:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641:1642 -> a
+    894:898:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1662:1666 -> a
+    894:898:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1643 -> a
+    899:904:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1644:1649 -> a
+    905:905: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):1698:1698 -> a
+    905:905:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    906:906:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    906:906: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):1698 -> a
+    906:906:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    907:909: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):1699:1701 -> a
+    907:909:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    910:910:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    910:910: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):1703 -> a
     910:910:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
-    911:913: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):1699:1701 -> a
-    911:913:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
-    914:914:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
-    914:914: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):1703 -> a
-    914:914:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
-    915:920: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):1704:1709 -> a
-    915:920:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
-    921:922:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1624:1625 -> a
-    923:923:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1623:1623 -> a
-    924:924:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1671:1671 -> a
-    925:925:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1747:1747 -> a
-    926:926:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    926:926:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1748 -> a
-    927:944:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1749:1766 -> a
-    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):484:489 -> b
-    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):487:498 -> b
-    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):549:558 -> b
-    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):568:596 -> b
+    911:916: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):1704:1709 -> a
+    911:916:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    917:918:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1624:1625 -> a
+    919:919:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1623:1623 -> a
+    920:920:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1671:1671 -> a
+    921:921:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1747:1747 -> a
+    922:922:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    922:922:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1748 -> a
+    923:940:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1749:1766 -> a
+    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):480:485 -> b
+    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):483:494 -> b
+    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):545:554 -> b
+    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):564:592 -> b
     58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
+    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
-    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:600 -> b
-    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> b
-    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):600 -> b
-    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):600:606 -> b
-    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603:603 -> b
+    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592 -> b
+    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592:596 -> b
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
+    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:602 -> b
+    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599:599 -> b
     74:74:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> b
-    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603 -> b
-    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603:608 -> b
-    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> b
-    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):608 -> b
+    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599 -> b
+    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599:604 -> b
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604 -> b
     82:86:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> b
-    82:86:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):609 -> b
-    87:89:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):758:760 -> b
-    90:90:boolean isInWave():836:836 -> b
-    91:93:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):1000:1002 -> b
-    94:102:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1058:1066 -> b
-    103:103:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1064:1064 -> b
+    82:86:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):605 -> b
+    87:89:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):749:751 -> b
+    90:90:boolean isInWave():824:824 -> b
+    91:93:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):987:989 -> b
+    94:102:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1045:1053 -> b
+    103:103:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1051:1051 -> b
     104:109:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1519:1524 -> b
     110:114:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1522:1526 -> b
     115:115:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1565:1565 -> b
-    116:116:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1307:1307 -> b
+    116:116:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1302:1302 -> b
     116:116:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1565 -> b
     117:121:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1569:1573 -> b
     122:122:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> b
@@ -29794,48 +29789,48 @@
     123:134:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1574:1585 -> b
     135:135:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1715:1715 -> b
     135:135:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
-    136:136:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> b
+    136:136:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> b
     136:136:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1715 -> b
     136:136:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
     137:139:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1716:1718 -> b
     137:139:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
-    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> b
+    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> b
     140:140:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1718 -> b
     140:140:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
     141:143:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1719:1721 -> b
     141:143:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
-    144:144:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> b
+    144:144:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
     144:144:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1722 -> b
     144:144:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
     145:147:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1724:1726 -> b
     145:147:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
-    148:148:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> b
+    148:148:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
     148:148:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1727 -> b
     148:148:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
     149:153:boolean lambda$workaroundForwardingInitializerBug$18(com.android.tools.r8.ir.code.Instruction):1587:1591 -> b
     154:155:void printPhase(java.lang.String):1741:1742 -> b
-    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):511:530 -> c
-    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):529:535 -> c
-    28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):129:142 -> c
-    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):535 -> c
-    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):535:535 -> c
-    43:43:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):841:841 -> c
+    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):507:526 -> c
+    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):525:531 -> c
+    28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):125:138 -> c
+    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):531 -> c
+    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):531:531 -> c
+    43:43:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):829:829 -> c
     44:44:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
-    44:44:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):842 -> c
-    45:45:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):842:842 -> c
-    46:46:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexEncodedMethod):842:842 -> c
-    47:47:void clearDexMethodCompilationState():920:920 -> c
+    44:44:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):830 -> c
+    45:45:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):830:830 -> c
+    46:46:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexEncodedMethod):830:830 -> c
+    47:47:void clearDexMethodCompilationState():907:907 -> c
     boolean lambda$convertMethod$5(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    1:7:boolean enableTryWithResourcesDesugaring():370:376 -> d
-    8:8:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):543:543 -> d
-    1:1:boolean enableTwrCloseResourceDesugaring():366:366 -> e
-    2:2:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):488:488 -> e
-    3:7:java.lang.Object lambda$forEachSynthesizedServiceLoaderMethod$14(com.android.tools.r8.graph.DexEncodedMethod):882:886 -> e
-    1:2:boolean removeLambdaDeserializationMethods():380:381 -> f
-    3:3:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):527:527 -> f
-    4:4:void lambda$waveStart$10(com.android.tools.r8.graph.DexEncodedMethod):815:815 -> f
-    1:3:void waveDone():820:822 -> g
-com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.D.c.b0:
+    1:7:boolean enableTryWithResourcesDesugaring():366:372 -> d
+    8:8:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):539:539 -> d
+    1:1:boolean enableTwrCloseResourceDesugaring():362:362 -> e
+    2:2:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):484:484 -> e
+    3:7:java.lang.Object lambda$forEachSynthesizedServiceLoaderMethod$14(com.android.tools.r8.graph.DexEncodedMethod):869:873 -> e
+    1:2:boolean removeLambdaDeserializationMethods():376:377 -> f
+    3:3:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):523:523 -> f
+    4:4:void lambda$waveStart$10(com.android.tools.r8.graph.DexEncodedMethod):803:803 -> f
+    1:3:void waveDone():808:810 -> g
+com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.D.c.a0:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> c
@@ -29850,10 +29845,10 @@
     19:39:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):484:504 -> a
     19:39:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):111 -> a
     40:41:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):114:115 -> a
-    42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     42:42:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):116 -> a
     43:58:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):117:132 -> a
-    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():984:984 -> a
+    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
     59:59:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
     60:63:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):133:136 -> a
     64:104:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:175 -> a
@@ -29872,10 +29867,10 @@
     226:226:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
     226:226:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):222 -> a
     227:237:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):222:232 -> a
-    238:238:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    238:238:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     238:238:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):233 -> a
     239:239:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):234:234 -> a
-    240:240:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    240:240:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     240:240:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):235 -> a
     241:244:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):236:239 -> a
     245:245:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
@@ -29885,9 +29880,9 @@
     248:248: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
     248:248:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):243 -> a
     249:261:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):244:256 -> a
-    262:262:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    262:262:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     262:262:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):256 -> a
-    263:263:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    263:263:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     263:263:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):258 -> a
     264:283:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):262:281 -> a
     284:293:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):280:289 -> a
@@ -29927,7 +29922,7 @@
     541:541:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):656:656 -> a
     542:559:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):660:677 -> a
     1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):375:375 -> b
-com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.D.c.a0:
+com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.D.c.Z:
     com.android.tools.r8.ir.code.Instruction current -> b
     java.util.Set affectedPhis -> d
     com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> e
@@ -29938,21 +29933,21 @@
     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):688:692 -> <init>
     1:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):697:710 -> a
     15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):707:707 -> a
-com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.D.c.c0:
+com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.D.c.b0:
     java.util.Deque waves -> b
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):35:37 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():41:41 -> a
-    2:25:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallSiteInformation):46:69 -> a
-    26:30:void lambda$createWaves$1(java.util.Set,com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.ir.conversion.CallGraph,java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):56:60 -> a
-    31:31:void lambda$createWaves$0(java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):61:61 -> a
-    32:42:void extractLeaves(java.util.Set,java.util.function.Consumer):81:91 -> a
-    43:50:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):106:113 -> a
-    51:59:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):112:120 -> a
-    60:60:java.lang.Object lambda$forEachMethod$2(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):115:115 -> a
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.D.c.d0:
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):34:36 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():40:40 -> a
+    2:25:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallSiteInformation):45:68 -> a
+    26:30:void lambda$createWaves$1(java.util.Set,com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.ir.conversion.CallGraph,java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):55:59 -> a
+    31:31:void lambda$createWaves$0(java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):60:60 -> a
+    32:42:void extractLeaves(java.util.Set,java.util.function.Consumer):74:84 -> a
+    43:50:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):99:106 -> a
+    51:59:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):105:113 -> a
+    60:60:java.lang.Object lambda$forEachMethod$2(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):108:108 -> a
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.D.c.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
@@ -29974,17 +29969,17 @@
     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.D.c.m0:
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.D.c.l0:
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     1:1:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):184 -> a
     1:1:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
     2:7:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):185:190 -> a
     2:7:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     8:8:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):184 -> a
     8:8:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.D.c.e0:
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.D.c.g0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.D.c.d0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.D.c.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
@@ -29995,7 +29990,7 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock access$002(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     1:1:com.android.tools.r8.ir.code.Phi access$100(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):587:587 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap access$300(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):587:587 -> c
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.D.c.f0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.D.c.e0:
     1:1:void <init>():589:589 -> <init>
     1:1:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping build(com.android.tools.r8.ir.code.BasicBlock):616:616 -> a
     2:2:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):628:628 -> a
@@ -30008,13 +30003,13 @@
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):658 -> a
     25:45:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):663:683 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     46:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):684 -> a
     47:62:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):685:700 -> a
     63:63:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):687:687 -> a
     64:64:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
     64:64:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):687 -> a
-    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     65:65:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):684 -> a
     66:66:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):675:675 -> a
     67:67:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
@@ -30023,7 +30018,7 @@
     83:83:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch):708:708 -> a
     84:84:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
     84:84:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch):708 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.D.c.i0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.D.c.h0:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
@@ -30032,7 +30027,7 @@
     1:29:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):273:301 -> a
     30:30:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
     30:30:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):301 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.D.c.h0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.D.c.g0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:1:void <clinit>():195:195 -> <clinit>
@@ -30046,7 +30041,7 @@
     15:16:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):216 -> a
     17:19:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):217:219 -> a
     20:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):218:244 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.D.c.k0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.D.c.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
@@ -30058,7 +30053,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$200(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):305:305 -> a
     2:2:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder builder(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):583:583 -> a
     1:1:com.android.tools.r8.ir.code.Value access$500(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):305:305 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.D.c.j0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.D.c.i0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.ir.code.Phi idValue -> c
     com.android.tools.r8.ir.code.Value stringValue -> d
@@ -30068,7 +30063,7 @@
     2:4:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):360:362 -> a
     5:23:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):404:422 -> a
     5:23:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
-    24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):423 -> a
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
     25:35:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):424:434 -> a
@@ -30078,7 +30073,7 @@
     36:36:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
     37:45:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):441:449 -> a
     37:45:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     46:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):423 -> a
     46:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
     47:48:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):364:365 -> a
@@ -30098,7 +30093,7 @@
     31:31:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):400:400 -> b
     32:32:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():0:0 -> b
     32:32:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):399 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.D.c.l0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.D.c.k0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():736:736 -> <clinit>
     1:2:com.android.tools.r8.ir.code.BasicBlock getTrueTarget(com.android.tools.r8.ir.code.If):739:740 -> a
@@ -30109,7 +30104,7 @@
     18:23:com.android.tools.r8.ir.code.Value getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):766:771 -> a
     24:25:com.android.tools.r8.ir.code.Value getStringHashValueFromSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.graph.DexItemFactory):779:780 -> a
     26:28:boolean isSameStringHashValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):797:799 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.D.c.n0:
+com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.D.c.m0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> b
     boolean $assertionsDisabled -> e
@@ -30119,10 +30114,10 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.IdentifierNameStringMarker):43:47 -> <init>
     1:21:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):51:71 -> a
     22:45:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):80:103 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     46:46:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):104 -> a
     47:52:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):104:109 -> a
-    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     53:53:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):110 -> a
     54:75:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):111:132 -> a
     76:88:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):129:141 -> a
@@ -30131,7 +30126,7 @@
     91:91:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
     91:91:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):141 -> a
     92:104:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):142:154 -> a
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.D.c.p0:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.D.c.o0:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -30152,13 +30147,13 @@
     2:2:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> b
     2:2:void addPayloadUser(com.android.tools.r8.code.Instruction):35 -> b
     3:7:void addPayloadUser(com.android.tools.r8.code.Instruction):36:40 -> b
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.D.c.o0:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.D.c.n0:
     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.D.c.q0:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.D.c.p0:
     java.util.Map unificationParents -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
@@ -30261,58 +30256,57 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):70:70 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):67:74 -> <init>
     1:1:void desugar(com.android.tools.r8.ir.code.IRCode):89:89 -> a
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     2:2:void desugar(com.android.tools.r8.ir.code.IRCode):93 -> a
-    3:17:void desugar(com.android.tools.r8.ir.code.IRCode):94:108 -> a
-    18:32:com.android.tools.r8.graph.DexEncodedMethod quickLookUp(com.android.tools.r8.graph.DexMethod):146:160 -> a
-    18:32:void desugar(com.android.tools.r8.ir.code.IRCode):108 -> a
-    33:59:void desugar(com.android.tools.r8.ir.code.IRCode):112:138 -> a
-    60:60:boolean hasRewrittenMethodPrefix(com.android.tools.r8.graph.DexType):178:178 -> a
-    61:67:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):183:189 -> a
-    68:68:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):169:169 -> a
-    68:68:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):191 -> a
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    69:69:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):170 -> a
-    69:69:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):191 -> a
-    70:70:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):171:171 -> a
-    70:70:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):191 -> a
-    71:124:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):192:245 -> a
-    125:125:boolean lambda$synthesizeUtilityClasses$0(com.android.tools.r8.graph.DexProgramClass):241:241 -> a
-    126:144:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):250:268 -> a
+    3:10:void desugar(com.android.tools.r8.ir.code.IRCode):94:101 -> a
+    11:29:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):199:217 -> a
+    11:29:void desugar(com.android.tools.r8.ir.code.IRCode):101 -> a
+    30:35:void desugar(com.android.tools.r8.ir.code.IRCode):106:111 -> a
+    36:36:boolean hasRewrittenMethodPrefix(com.android.tools.r8.graph.DexType):126:126 -> a
+    37:43:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132:138 -> a
+    44:44:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):117:117 -> a
+    44:44:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):140 -> a
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    45:45:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):118 -> a
+    45:45:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):140 -> a
+    46:46:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):119:119 -> a
+    46:46:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):140 -> a
+    47:100:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):141:194 -> a
+    101:101:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.DexProgramClass):190:190 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.D.d.b:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriter -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1320:1320 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1325:1326 -> <init>
+    1:1:void <clinit>():1246:1246 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1250:1251 -> <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):1332:1333 -> a
-    3:3:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1343:1343 -> a
-    4:4:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1348:1348 -> 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):1256:1257 -> a
+    3:3:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1267:1267 -> a
+    4:4:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1272:1272 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.D.d.c:
     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):1359:1359 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1363:1365 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1283:1283 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1287:1289 -> <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):1371:1372 -> 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):1371:1371 -> a
-    4:11:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1377:1384 -> a
-    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    12:12:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1384 -> a
-    13:13:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1385:1385 -> 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):1295:1296 -> 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):1295:1295 -> a
+    4:11:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1301:1308 -> a
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    12:12:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1308 -> a
+    13:13:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1309:1309 -> a
     14:14:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    14:14:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1390 -> a
-    15:15:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1390:1390 -> a
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    16:16:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1395 -> a
-    17:17:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1396:1396 -> a
-    18:18:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1402:1402 -> a
+    14:14:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1314 -> a
+    15:15:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1314:1314 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    16:16:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1319 -> a
+    17:17:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1320:1320 -> a
+    18:18:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1326:1326 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.D.d.d:
     void rewrite(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory) -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.D.d.e:
     com.android.tools.r8.graph.DexMethod method -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1264:1265 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1190:1191 -> <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
@@ -30321,87 +30315,85 @@
     com.android.tools.r8.graph.DexType newHolder -> b
     com.android.tools.r8.graph.DexMethod targetMethod -> c
     boolean isStatic -> d
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):1285:1287 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):1211:1213 -> <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):1293:1294 -> 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):1293:1293 -> a
-    4:10:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1299:1305 -> a
-    11:11:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1311:1311 -> 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):1219:1220 -> 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):1219:1219 -> a
+    4:10:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1225:1231 -> a
+    11:11:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1237:1237 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.D.d.g:
     java.util.Map rewritable -> a
-    java.util.Map virtualRewrites -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():271:271 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):280:280 -> <init>
-    2:35:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):274:307 -> <init>
-    1:1:boolean isEmpty():325:325 -> a
-    2:131:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):334:463 -> a
-    132:132:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1078:1078 -> a
-    133:136:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1213:1216 -> a
-    137:142:void warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1203:1208 -> a
-    137:142:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1218 -> a
-    143:143:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1220:1220 -> a
-    144:144:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1240:1240 -> a
-    144:144:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1221 -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():220:220 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):225:225 -> <init>
+    2:31:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):223:252 -> <init>
+    1:1:boolean isEmpty():257:257 -> a
+    2:131:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):266:395 -> a
+    132:132:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1010:1010 -> a
+    133:136:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1144:1147 -> a
+    137:142:void warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1134:1139 -> a
+    137:142:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1149 -> a
+    143:143:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1151:1151 -> a
+    144:144:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1167:1167 -> a
+    144:144:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1152 -> a
     145:145:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    145:145:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1241 -> a
-    145:145:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1221 -> a
-    146:151:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1241:1246 -> a
-    146:151:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1221 -> a
-    152:161:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1222:1231 -> a
-    162:162:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1229:1229 -> a
-    163:164:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1251:1252 -> a
-    165:165:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1256:1256 -> a
-    1:6:boolean matchesVirtualRewrite(com.android.tools.r8.graph.DexMethod):312:317 -> b
-    7:345:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):469:807 -> b
-    346:346:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1100:1100 -> b
+    145:145:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1168 -> a
+    145:145:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1152 -> a
+    146:151:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1168:1173 -> a
+    146:151:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1152 -> a
+    152:157:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1153:1158 -> a
+    158:158:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1156:1156 -> a
+    159:160:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1178:1179 -> a
+    161:161:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1183:1183 -> a
+    1:339:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):401:739 -> b
+    340:340:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1031:1031 -> b
     1:3: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:76 -> c
-    1:3:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c
+    1:3:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     4:4: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):76 -> c
-    4:4:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
+    4:4:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     5:7: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:79 -> c
-    5:7:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
-    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> c
+    5:7:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
+    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> c
     8:8: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 -> c
-    8:8:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
+    8:8:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     9:34: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):85:110 -> c
-    9:34:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
+    9:34:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     35:35: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
-    35:35:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
+    35:35:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     36:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):102:120 -> c
-    36:54:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
-    55:212:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):814:971 -> c
-    1:7:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1138:1144 -> d
-    1:98:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):978:1075 -> e
-    99:124:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1072:1097 -> e
-    125:149:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1094:1118 -> e
-    150:158:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1115:1123 -> e
-    159:159:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> e
-    159:159:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1124 -> e
-    160:166:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1125:1131 -> e
-    167:167:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> e
-    167:167:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1132 -> e
-    168:168:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1133:1133 -> e
-    1:12:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1151:1162 -> f
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f
-    13:13:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1163 -> f
-    14:28:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1163:1177 -> f
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f
-    29:29:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1180 -> f
-    30:30:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1180:1180 -> f
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f
-    31:31:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1181 -> f
-    32:32:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1181:1181 -> f
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f
-    33:33:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1182 -> f
-    34:49:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1182:1197 -> f
+    36:54:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
+    55:212:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):746:903 -> c
+    1:7:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1069:1075 -> d
+    1:98:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):910:1007 -> e
+    99:123:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1004:1028 -> e
+    124:148:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1025:1049 -> e
+    149:157:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1046:1054 -> e
+    158:158:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> e
+    158:158:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1055 -> e
+    159:165:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1056:1062 -> e
+    166:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> e
+    166:166:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1063 -> e
+    167:167:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1064:1064 -> e
+    1:12:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1082:1093 -> f
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
+    13:13:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1094 -> f
+    14:28:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1094:1108 -> f
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
+    29:29:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1111 -> f
+    30:30:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1111:1111 -> f
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
+    31:31:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1112 -> f
+    32:32:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1112:1112 -> f
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
+    33:33:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1113 -> f
+    34:49:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1113:1128 -> f
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.D.d.h:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType receiverType -> e
-    1:1:void <clinit>():1414:1414 -> <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):1420:1421 -> <init>
-    1:8:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1426:1433 -> a
+    1:1:void <clinit>():1338:1338 -> <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):1344:1345 -> <init>
+    1:8:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1350:1357 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.D.d.i:
     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.D.d.k:
@@ -30411,58 +30403,53 @@
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> c
     boolean $assertionsDisabled -> f
     java.util.Map createdMethods -> e
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):40:40 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):36:43 -> <init>
-    1:1:java.util.Set getForwardMethods():47:47 -> a
-    2:27:void process(com.android.tools.r8.graph.DexClass):51:76 -> a
-    28:29:void process(com.android.tools.r8.graph.DexClass):73:74 -> a
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):39:39 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):35:42 -> <init>
+    1:1:java.util.Set getForwardMethods():46:46 -> a
+    2:27:void process(com.android.tools.r8.graph.DexClass):50:75 -> a
+    28:29:void process(com.android.tools.r8.graph.DexClass):72:73 -> a
     30:30:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    30:30:void process(com.android.tools.r8.graph.DexClass):74 -> a
+    30:30:void process(com.android.tools.r8.graph.DexClass):73 -> a
     31:31:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     31:31:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    31:31:void process(com.android.tools.r8.graph.DexClass):74 -> a
-    32:45:void process(com.android.tools.r8.graph.DexClass):74:87 -> a
-    46:93:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):162:209 -> a
-    46:93:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    31:31:void process(com.android.tools.r8.graph.DexClass):73 -> a
+    32:45:void process(com.android.tools.r8.graph.DexClass):73:86 -> a
+    46:93:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):144:191 -> a
+    46:93:void process(com.android.tools.r8.graph.DexClass):96 -> a
     94:94:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
-    94:94:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):209 -> a
-    94:94:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    94:94:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
+    94:94:void process(com.android.tools.r8.graph.DexClass):96 -> a
     95:95:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
     95:95:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
-    95:95:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):209 -> a
-    95:95:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    95:95:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
+    95:95:void process(com.android.tools.r8.graph.DexClass):96 -> a
     96:96:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
     96:96:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
-    96:96:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):209 -> a
-    96:96:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    96:96:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
+    96:96:void process(com.android.tools.r8.graph.DexClass):96 -> a
     97:97:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
-    97:97:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):209 -> a
-    97:97:void process(com.android.tools.r8.graph.DexClass):97 -> a
-    98:109:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):212:223 -> a
-    98:109:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    97:97:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
+    97:97:void process(com.android.tools.r8.graph.DexClass):96 -> a
+    98:109:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):194:205 -> a
+    98:109:void process(com.android.tools.r8.graph.DexClass):96 -> a
     110:110:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    110:110:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):223 -> a
-    110:110:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    110:110:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):205 -> a
+    110:110:void process(com.android.tools.r8.graph.DexClass):96 -> a
     111:111:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     111:111:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    111:111:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):223 -> a
-    111:111:void process(com.android.tools.r8.graph.DexClass):97 -> a
-    112:169:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):223:280 -> a
-    112:169:void process(com.android.tools.r8.graph.DexClass):97 -> a
-    170:182:void process(com.android.tools.r8.graph.DexClass):98:110 -> a
-    183:191:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):114:122 -> a
-    192:199:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexMethod):146:153 -> a
-    192:199:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):123 -> a
-    200:200:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexMethod):151:151 -> a
-    200:200:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):123 -> a
-    201:212:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):126:137 -> a
-    213:217:void hideCandidates(java.util.List,java.util.List,java.util.List):290:294 -> a
-    218:218:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
-    218:218:void hideCandidates(java.util.List,java.util.List,java.util.List):294 -> a
-    219:232:void hideCandidates(java.util.List,java.util.List,java.util.List):296:309 -> a
-    233:233:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
-    233:233:void hideCandidates(java.util.List,java.util.List,java.util.List):294 -> a
+    111:111:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):205 -> a
+    111:111:void process(com.android.tools.r8.graph.DexClass):96 -> a
+    112:157:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):205:250 -> a
+    112:157:void process(com.android.tools.r8.graph.DexClass):96 -> a
+    158:170:void process(com.android.tools.r8.graph.DexClass):97:109 -> a
+    171:189:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):113:131 -> a
+    190:194:void hideCandidates(java.util.List,java.util.List,java.util.List):260:264 -> a
+    195:195:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    195:195:void hideCandidates(java.util.List,java.util.List,java.util.List):264 -> a
+    196:209:void hideCandidates(java.util.List,java.util.List,java.util.List):266:279 -> a
+    210:210:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    210:210:void hideCandidates(java.util.List,java.util.List,java.util.List):264 -> a
 com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.D.d.l:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
@@ -30530,16 +30517,16 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView):47:47 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView):44:44 -> <init>
     1:12:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):52:63 -> a
-    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     13:13:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):64 -> a
     14:22:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):65:73 -> a
-    23:23:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    23:23:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     23:23:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):74 -> a
     24:24:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):76:76 -> a
-    25:25:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    25:25:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     25:25:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):77 -> a
     26:29:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):78:81 -> a
-    30:30:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    30:30: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):40:40 -> a
     30:30:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):81 -> a
     31:35:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):80:84 -> a
     36:53:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):83:100 -> a
@@ -30598,115 +30585,112 @@
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map callBackMethods -> d
     com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> c
-    java.util.Set trackedCallBackAPIs -> e
-    java.util.Set trackedAPIs -> f
-    boolean $assertionsDisabled -> g
-    1:1:void <clinit>():60:60 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):71:71 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.AppView):67:80 -> <init>
-    1:1:void desugar(com.android.tools.r8.ir.code.IRCode):86:86 -> a
-    2:17:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):129:144 -> a
-    2:17:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
-    18:39:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):183:204 -> a
-    18:39:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):144 -> a
-    18:39:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
-    40:41:void addCallBackSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):209:210 -> a
-    40:41:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):205 -> a
-    40:41:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):144 -> a
-    40:41:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
-    42:46:void desugar(com.android.tools.r8.ir.code.IRCode):92:96 -> a
-    47:47:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    47:47:void desugar(com.android.tools.r8.ir.code.IRCode):97 -> a
-    48:64:void desugar(com.android.tools.r8.ir.code.IRCode):98:114 -> a
-    65:79: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):289:303 -> a
-    65:79:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    80:81:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):420:421 -> a
-    80:81: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):306 -> a
-    80:81:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    82:82:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444:444 -> a
-    82:82:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):421 -> a
-    82:82: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):306 -> a
-    82:82:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    83:83:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    83:83:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444 -> a
-    83:83:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):421 -> a
-    83:83: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):306 -> a
-    83:83:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    84:84:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    84:84:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444 -> a
-    84:84:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):421 -> a
-    84:84: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):306 -> a
-    84:84:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    85:87:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):422:424 -> a
-    85:87: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):306 -> a
-    85:87:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    88: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):309:332 -> a
-    88:111:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    112:115:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):411:414 -> a
-    112: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):334 -> a
-    112:115:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    116:116:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444:444 -> a
-    116:116:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):414 -> a
-    116:116: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):334 -> a
-    116:116:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    117:117:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    117:117:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444 -> a
-    117:117:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):414 -> a
-    117:117: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):334 -> a
-    117:117:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    118:118:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    118:118:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444 -> a
-    118:118:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):414 -> a
-    118:118: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):334 -> a
-    118:118:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    119:119:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):415:415 -> a
-    119:119: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):334 -> a
-    119:119:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    120:141: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):333:354 -> a
-    120:141:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    142:142: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
-    142:142: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):350 -> a
-    142:142:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    143:144: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):356:357 -> a
-    143:144:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    145:145: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):356:356 -> a
-    145:145:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    146:146:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    146:146: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):360 -> a
-    146:146:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    147:148: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):361:362 -> a
-    147:148:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    149:149:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    149:149: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):363 -> a
-    149:149:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    150:150: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):365:365 -> a
-    150:150:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    151:151:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    151:151:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):366 -> a
-    151:151:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    152:154: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):367:369 -> a
-    152:154:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    155:155:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    155:155: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):370 -> a
-    155:155:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    156:157: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):375:376 -> a
-    156:157:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    158:181:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):150:173 -> a
-    182:196: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):215:229 -> a
-    197:205:void generateWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):235:243 -> a
-    206:212:void generateTrackDesugaredAPIWarnings(java.util.Set,java.lang.String):248:254 -> a
-    213:217:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):258:262 -> a
-    218:218:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):278:278 -> a
-    219:219:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    219:219:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):279 -> a
-    220:220:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):279:279 -> a
-    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    221:221:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):279 -> a
-    222:222:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):280:280 -> a
-    223:240:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):385:402 -> a
-    241:251: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):430:440 -> a
-    252:252: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):439:439 -> a
-    253:254:boolean canConvert(com.android.tools.r8.graph.DexType):448:449 -> a
+    boolean $assertionsDisabled -> e
+    1:1:void <clinit>():59:59 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):68:68 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):66:71 -> <init>
+    1:1:void desugar(com.android.tools.r8.ir.code.IRCode):76:76 -> a
+    2:17:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):119:134 -> a
+    2:17:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    18:36:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):173:191 -> a
+    18:36:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):134 -> a
+    18:36:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    37:38:void addCallBackSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):196:197 -> a
+    37:38:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
+    37:38:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):134 -> a
+    37:38:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    39:43:void desugar(com.android.tools.r8.ir.code.IRCode):82:86 -> a
+    44:44:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    44:44:void desugar(com.android.tools.r8.ir.code.IRCode):87 -> a
+    45:61:void desugar(com.android.tools.r8.ir.code.IRCode):88:104 -> a
+    62:73: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):262:273 -> a
+    62:73:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    74:75:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):390:391 -> a
+    74:75: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):276 -> a
+    74:75:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    76:76:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414:414 -> a
+    76:76:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    76:76: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):276 -> a
+    76:76:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    77:77:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    77:77:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    77:77:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    77:77: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):276 -> a
+    77:77:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    78:78:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    78:78:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    78:78: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):276 -> a
+    78:78:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    79:81:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):392:394 -> a
+    79:81: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):276 -> a
+    79:81:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    82:105: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):279:302 -> a
+    82:105:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    106:109:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):381:384 -> a
+    106:109:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    106:109:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    110:110:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414:414 -> a
+    110:110:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    110:110:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    110:110:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    111:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    111:111:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    111:111:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    111: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):304 -> a
+    111:111:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    112:112:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    112:112:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> 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):304 -> a
+    112:112:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    113:113:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):385:385 -> a
+    113:113:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    113:113:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    114:135: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):303:324 -> a
+    114:135:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    136:136: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
+    136:136: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):320 -> a
+    136:136:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    137:138: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):326:327 -> a
+    137:138:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    139:139: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):326:326 -> a
+    139:139:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    140:140:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    140:140: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):330 -> a
+    140:140:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    141:142: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):331:332 -> a
+    141:142:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    143:143:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    143:143: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):333 -> a
+    143:143:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    144:144: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):335:335 -> a
+    144:144:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    145:145:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    145:145: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):336 -> a
+    145:145:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    146:148: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):337:339 -> a
+    146:148:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    149:149:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    149:149: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):340 -> a
+    149:149:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    150:151:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):345:346 -> a
+    150:151:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    152:175:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):140:163 -> a
+    176:190: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):202:216 -> a
+    191:195:void generateWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):222:226 -> a
+    196:200:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):231:235 -> a
+    201:201:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):251:251 -> a
+    202:202:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    202:202:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):252 -> a
+    203:203:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):252:252 -> a
+    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    204:204:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):252 -> a
+    205:205:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):253:253 -> a
+    206:223:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):355:372 -> a
+    224:234: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):400:410 -> a
+    235:235: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):409:409 -> a
+    236:237:boolean canConvert(com.android.tools.r8.graph.DexType):418:419 -> a
 com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.D.d.s:
     java.util.Map rewritePrefix -> b
     java.util.Map emulateLibraryInterface -> c
@@ -30747,12 +30731,12 @@
     7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addDontRewriteInvocation(java.lang.String):181:181 -> a
     8:8:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> a
     8:8:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):173 -> a
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     9:9:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> a
     9:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):173 -> a
     10:10:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> a
     10:10:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):174 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     11:11:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> a
     11:11:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):174 -> a
     12:12:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):175:175 -> a
@@ -30760,34 +30744,34 @@
     1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setLibraryCompilation():136:136 -> b
     2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
     2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):154 -> b
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     3:3:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):154 -> b
     4:4:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
     4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):155 -> b
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     5:5:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):155 -> b
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):156:156 -> b
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     8:8:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setProgramCompilation():131:131 -> c
     2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> c
     2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):147 -> c
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     3:3:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> c
     3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):147 -> c
     4:4:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> c
     4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):148 -> c
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     5:5:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> c
     5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):148 -> c
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):149:149 -> c
     1:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):161:165 -> d
     6:6:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> d
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):166 -> d
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> d
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> d
     7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):166 -> d
     8:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):167:168 -> d
@@ -30871,7 +30855,7 @@
     44:44:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
     45:45:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):156:156 -> a
     45:45:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     46:46:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):155 -> a
     46:46:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
     47:48:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):178:179 -> a
@@ -30962,369 +30946,362 @@
     12:12:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
     12:12:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160 -> a
     13:15:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160:162 -> a
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     16:16:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):161 -> a
     17:24:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):159:166 -> a
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     25:25:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):165 -> a
     26:26:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:163 -> a
     27:36:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):177:186 -> a
-    37:37:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    37:37:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     37:37:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):187 -> a
-    38:65:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):189:216 -> a
-    66:66:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):524:524 -> a
-    66:66:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):217 -> a
-    67:71:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):228:232 -> a
-    72:72:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
-    72:72:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233 -> a
-    73:73:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):234:234 -> a
-    74:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):232:240 -> a
-    83:83:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
-    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
-    84:84:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    84:84:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> a
-    84:84:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
-    85:85:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
-    85:85:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
-    86:86:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
-    87:118:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:271 -> a
-    119:120:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
-    119:120:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):270 -> a
-    121:121:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:272 -> a
-    122:122:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    122:122:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
-    123:123:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    123:123:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    123:123:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
-    124:125:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):275:276 -> a
-    126:144:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:290 -> a
-    145:146:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
-    145:146:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289 -> a
-    147:147:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:291 -> a
-    148:148:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    148:148:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
-    149:149:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    149:149:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    149:149:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
-    150:150:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293:293 -> a
-    151:189:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:329 -> a
-    190:190:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    190:190:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
-    191:191:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    191:191:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    191:191:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
-    192:192:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331:331 -> a
-    193:202:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):329:338 -> a
-    203:203:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> a
-    203:203:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
-    204:204:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> a
-    204:204:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> a
-    204:204:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
-    205:205:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):340:340 -> a
-    206:206:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):338:338 -> a
-    207:209:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):312:314 -> a
-    210:210:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    210:210:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    210:210:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314 -> a
-    211:259:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:362 -> a
-    260:260:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    260:260:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362 -> a
-    261:273:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:374 -> a
-    274:274:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):236:236 -> a
-    275:276:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):386:387 -> a
-    277:278:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):537:538 -> a
-    277:278: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):387 -> a
-    279:280: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):388:389 -> a
-    281:283: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):629:631 -> a
-    281:283: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):391 -> a
-    284:284: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):628:628 -> a
-    284:284: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):391 -> a
-    285:286: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):392:393 -> a
-    287:287: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):389:389 -> a
-    288:292:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):464:468 -> a
-    293:324:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):472:503 -> a
-    325:325:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    325:325:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
-    326:326:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    326:326:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    326:326:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
-    327:341:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503:517 -> a
-    342:342:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    342:342:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
-    343:343:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    343:343:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    343:343:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
-    344:344:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517:517 -> a
-    345:345:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:528 -> a
-    346:346:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    346:346:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528 -> a
-    347:351:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:532 -> a
-    352:370:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):587:605 -> a
-    371:380:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):755:764 -> a
-    381:382:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:777 -> a
-    383:383:java.lang.String getCompanionClassDescriptor(java.lang.String):771:771 -> a
-    383:383:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):778 -> a
-    384:384:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    384:384:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):779 -> a
-    385:389:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):788:792 -> a
-    390:390:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    390:390:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):792 -> a
-    391:400:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):837:846 -> a
-    401:401:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):843:843 -> a
-    402:402:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    403:403:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    404:404:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    404:404:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    405:407:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):926:928 -> a
-    408:408:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964:964 -> a
-    409:409:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    409:409:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964 -> a
-    410:413:java.util.Map processEmulatedInterfaceHierarchy():575:578 -> a
-    410:413:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):556 -> a
-    410:413:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    414:421:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):557:564 -> a
-    414:421:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    422:422:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:636 -> a
-    422:422:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    422:422:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    423:423:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    423:423:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
-    423:423:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    423:423:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    424:428:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637:641 -> a
-    424:428:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    424:428:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    429:435:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
-    429:435:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    429:435:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    436:436:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    436:436:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
-    436:436:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    436:436:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    437:437:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
-    437:437:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    437:437:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    438:457:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:666 -> a
-    438:457:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    438:457:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    458:466:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):612:620 -> a
-    458:466:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
-    458:466:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    458:466:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    467:471:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
-    467:471:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    467:471:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    472:474:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1284:1286 -> a
-    472:474:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
-    472:474:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    472:474:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    475:475:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
-    475:475:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    475:475:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    476:476:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
-    476:476:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    476:476:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    477:477:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
-    477:477:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    477:477:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    478:478:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1284:1284 -> a
-    478:478:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
-    478:478:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    478:478:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    479:485:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:686 -> a
-    479:485:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    479:485:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    486:486:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    486:486:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
-    486:486:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    486:486:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    487:487:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
-    487:487:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    487:487:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    488:490:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1284:1286 -> a
-    488:490:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
-    488:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    488:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    491:491:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
+    38:81:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):189:232 -> a
+    82:82:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
+    82:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233 -> a
+    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):234:234 -> a
+    84:92:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):232:240 -> a
+    93:93:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
+    93:93:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    94:94:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    94:94:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> a
+    94:94:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    95:95:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
+    95:95:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    96:96:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    97:128:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:271 -> a
+    129:130:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
+    129:130:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):270 -> a
+    131:131:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:272 -> a
+    132:132:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    132:132:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
+    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    133:133:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
+    134:135:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):275:276 -> a
+    136:154:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:290 -> a
+    155:156:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
+    155:156:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289 -> a
+    157:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:291 -> a
+    158:158:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
+    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    159:159:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
+    160:160:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293:293 -> a
+    161:199:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:329 -> a
+    200:200:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    200:200:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
+    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    201:201:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
+    202:202:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331:331 -> a
+    203:212:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):329:338 -> a
+    213:213:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> a
+    213:213:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
+    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> a
+    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> a
+    214:214:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
+    215:215:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):340:340 -> a
+    216:216:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):338:338 -> a
+    217:219:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):312:314 -> a
+    220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    220:220:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314 -> a
+    221:269:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:362 -> a
+    270:270:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    270:270:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362 -> a
+    271:283:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:374 -> a
+    284:284:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):236:236 -> a
+    285:286: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):386:387 -> a
+    287:288:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):537:538 -> a
+    287:288: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):387 -> a
+    289:290: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):388:389 -> a
+    291:293: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):629:631 -> a
+    291:293: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):391 -> a
+    294:294: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):628:628 -> a
+    294:294: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):391 -> a
+    295:296: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):392:393 -> a
+    297:297: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):389:389 -> a
+    298:302:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):464:468 -> a
+    303:334:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):472:503 -> a
+    335:335:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    335:335:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
+    336:336:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    336:336:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    336:336:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
+    337:351:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503:517 -> a
+    352:352:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    352:352:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
+    353:353:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    353:353:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    353:353:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
+    354:354:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517:517 -> a
+    355:355:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):524:524 -> a
+    356:374:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):587:605 -> a
+    375:384:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):755:764 -> a
+    385:386:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:777 -> a
+    387:387:java.lang.String getCompanionClassDescriptor(java.lang.String):771:771 -> a
+    387:387:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):778 -> a
+    388:388:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    388:388:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):779 -> a
+    389:393:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):788:792 -> a
+    394:394:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    394:394:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):792 -> a
+    395:404:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):837:846 -> a
+    405:405:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):843:843 -> a
+    406:406:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    407:407:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    408:408:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    408:408:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    409:411:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):926:928 -> a
+    412:412:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964:964 -> a
+    413:413:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    413:413:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964 -> a
+    414:417:java.util.Map processEmulatedInterfaceHierarchy():575:578 -> a
+    414:417:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):556 -> a
+    414:417:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    418:425:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):557:564 -> a
+    418:425:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    426:426:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:636 -> a
+    426:426:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    426:426:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    427:427:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    427:427:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
+    427:427:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    427:427:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    428:432:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637:641 -> a
+    428:432:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    428:432:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    433:439:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
+    433:439:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    433:439:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    440:440:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    440:440:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
+    440:440:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    440:440:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    441:441:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
+    441:441:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    441:441:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    442:461:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:666 -> a
+    442:461:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    442:461:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    462:470:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):612:620 -> a
+    462:470:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    462:470:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    462:470:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    471:475:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
+    471:475:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    471:475:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    476:478:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1266 -> a
+    476:478:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
+    476:478:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    476:478:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    479:479:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
+    479:479:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    479:479:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    480:480:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
+    480:480:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    480:480:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    481:481:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
+    481:481:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    481:481:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    482:482:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1264 -> a
+    482:482:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
+    482:482:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    482:482:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    483:489:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:686 -> a
+    483:489:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    483:489:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    490:490:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    490:490:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
+    490:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    490:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    491:491:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
     491:491:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     491:491:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    492:492:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
-    492:492:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    492:492:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    493:493:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
-    493:493:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    493:493:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    494:494:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1284:1284 -> a
-    494:494:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
-    494:494:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    494:494:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    495:495:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
+    492:494:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1266 -> a
+    492:494:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
+    492:494:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    492:494:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    495:495:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
     495:495:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     495:495:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    496:498: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):629:631 -> a
-    496:498:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
-    496:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    496:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    499:499: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):628:628 -> a
-    499:499:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    496:496:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
+    496:496:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    496:496:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    497:497:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
+    497:497:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    497:497:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    498:498:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1264 -> a
+    498:498:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
+    498:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    498:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    499:499:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
     499:499:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     499:499:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    500:500:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
-    500:500:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    500:500:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    501:501:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
-    501:501:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    501:501:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    502:543:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
-    502:543:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    502:543:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    544:544:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
-    544:544:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566 -> a
-    544:544:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    545:546:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566:567 -> a
-    545:546:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    547:547:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    547:547:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
-    547:547:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    547:547:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    548:556:void duplicateEmulatedInterfaces():936:944 -> a
-    548:556:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    557:557:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    557:557:void duplicateEmulatedInterfaces():946 -> a
-    557:557:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    558:558:void duplicateEmulatedInterfaces():946:946 -> a
-    558:558:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    559:561:void duplicateEmulatedInterfaces():945:947 -> a
-    559:561:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    562:562:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    562:562:void duplicateEmulatedInterfaces():947 -> a
+    500:502: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):629:631 -> a
+    500:502:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    500:502:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    500:502:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    503:503: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):628:628 -> a
+    503:503:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    503:503:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    503:503:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    504:504:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
+    504:504:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    504:504:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    505:505:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
+    505:505:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    505:505:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    506:547:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
+    506:547:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    506:547:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    548:548:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
+    548:548:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566 -> a
+    548:548:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    549:550:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566:567 -> a
+    549:550:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    551:551:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    551:551:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
+    551:551:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    551:551:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    552:560:void duplicateEmulatedInterfaces():936:944 -> a
+    552:560:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    561:561:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    561:561:void duplicateEmulatedInterfaces():946 -> a
+    561:561:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    562:562:void duplicateEmulatedInterfaces():946:946 -> a
     562:562:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    563:564:void duplicateEmulatedInterfaces():947:948 -> a
-    563:564:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    565:565:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    565:565:void duplicateEmulatedInterfaces():948 -> a
-    565:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    566:568:void duplicateEmulatedInterfaces():948:950 -> a
-    566:568:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    569:569:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:971 -> a
-    570:571:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1026:1027 -> a
-    570:571:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    572:573:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
-    572:573:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1028 -> a
-    572:573:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    574:577:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1029:1032 -> a
-    574:577:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    578:584:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:977 -> a
-    585:587:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1009:1011 -> a
-    585:587:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
-    588:589:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
-    588:589:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1012 -> a
-    588:589:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
-    590:599:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1013:1022 -> a
-    590:599:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
-    600:604:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978:982 -> a
-    605:605:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
-    605:605:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    606:610:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982:986 -> a
-    611:611:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    611:611:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
-    612:613:void renameEmulatedInterfaces():881:882 -> a
-    612:613:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    614:622:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):894:902 -> a
-    614:622:void renameEmulatedInterfaces():883 -> a
-    614:622:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    623:624:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):913:914 -> a
-    623:624:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
-    623:624:void renameEmulatedInterfaces():883 -> a
-    623:624:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    625:625:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    625:625:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):915 -> a
-    625:625:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
-    625:625:void renameEmulatedInterfaces():883 -> a
-    625:625:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    626:627:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):915:916 -> a
-    626:627:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
-    626:627:void renameEmulatedInterfaces():883 -> a
-    626:627:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    628:628:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    628:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):916 -> a
-    628:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
-    628:628:void renameEmulatedInterfaces():883 -> a
-    628:628:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    629:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904:906 -> a
-    629:631:void renameEmulatedInterfaces():883 -> a
-    629:631:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    632:634:void renameEmulatedInterfaces():884:886 -> a
-    632:634:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    635:635:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    635:635:void renameEmulatedInterfaces():886 -> a
-    635:635:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    636:636:void renameEmulatedInterfaces():886:886 -> a
-    636:636:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    637:639:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):920:922 -> a
-    637:639:void renameEmulatedInterfaces():887 -> a
-    637:639:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    640:640:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):990:990 -> a
-    641:643:void clear():997:999 -> a
-    641:643:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):993 -> a
-    644:658:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1036:1050 -> a
-    659:659:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1043:1043 -> a
-    660:660:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067:1067 -> a
-    661:661:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
-    661:661:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067 -> a
-    662:665:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1070:1073 -> a
-    666:666: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):1089:1089 -> a
-    667:668:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1102:1103 -> a
-    667:668: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):1093 -> a
-    669:670:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1059:1060 -> a
-    669:670: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):1105 -> a
-    669:670: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):1093 -> a
-    671:673: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):1106:1108 -> a
-    671:673: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):1093 -> a
-    674:674:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):524:524 -> a
-    674:674: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):1114 -> a
-    674:674: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):1093 -> a
-    675:681: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):1119:1125 -> a
-    675:681: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):1093 -> a
-    682:682:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
-    682:682: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):1125 -> a
-    682:682: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):1093 -> a
-    683:683:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    683:683:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
-    683:683: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):1125 -> a
-    683:683: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):1093 -> a
-    684:684:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    684:684:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
-    684:684: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):1125 -> a
-    684:684: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):1093 -> a
-    685:685:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
-    685:685: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):1125 -> a
-    685:685: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):1093 -> a
-    686:702: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):1129:1145 -> a
-    686:702: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):1093 -> a
-    703:703: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):1094:1094 -> a
-    704:706: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):1109:1111 -> a
-    704:706: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):1093 -> a
-    707:707:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    707:707: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):1111 -> a
-    707:707: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):1093 -> a
-    708:708: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):1111:1111 -> a
-    708:708: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):1093 -> a
+    563:565:void duplicateEmulatedInterfaces():945:947 -> a
+    563:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    566:566:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    566:566:void duplicateEmulatedInterfaces():947 -> a
+    566:566:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    567:568:void duplicateEmulatedInterfaces():947:948 -> a
+    567:568:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    569:569:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    569:569:void duplicateEmulatedInterfaces():948 -> a
+    569:569:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    570:572:void duplicateEmulatedInterfaces():948:950 -> a
+    570:572:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    573:573:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:971 -> a
+    574:575:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1026:1027 -> a
+    574:575:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    576:577:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
+    576:577:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1028 -> a
+    576:577:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    578:581:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1029:1032 -> a
+    578:581:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    582:588:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:977 -> a
+    589:591:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1009:1011 -> a
+    589:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    592:593:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
+    592:593:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1012 -> a
+    592:593:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    594:603:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1013:1022 -> a
+    594:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    604:608:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978:982 -> a
+    609:609:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
+    609:609:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    610:614:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982:986 -> a
+    615:615:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    615:615:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
+    616:617:void renameEmulatedInterfaces():881:882 -> a
+    616:617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    618:626:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):894:902 -> a
+    618:626:void renameEmulatedInterfaces():883 -> a
+    618:626:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    627:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):913:914 -> a
+    627:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    627:628:void renameEmulatedInterfaces():883 -> a
+    627:628:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    629:629:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    629:629:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):915 -> a
+    629:629:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    629:629:void renameEmulatedInterfaces():883 -> a
+    629:629:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    630:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):915:916 -> a
+    630:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    630:631:void renameEmulatedInterfaces():883 -> a
+    630:631:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    632:632:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):916 -> a
+    632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    632:632:void renameEmulatedInterfaces():883 -> a
+    632:632:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    633:635:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904:906 -> a
+    633:635:void renameEmulatedInterfaces():883 -> a
+    633:635:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    636:638:void renameEmulatedInterfaces():884:886 -> a
+    636:638:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    639:639:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    639:639:void renameEmulatedInterfaces():886 -> a
+    639:639:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    640:640:void renameEmulatedInterfaces():886:886 -> a
+    640:640:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    641:643:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):920:922 -> a
+    641:643:void renameEmulatedInterfaces():887 -> a
+    641:643:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    644:644:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):990:990 -> a
+    645:647:void clear():997:999 -> a
+    645:647:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):993 -> a
+    648:662:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1036:1050 -> a
+    663:663:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1043:1043 -> a
+    664:664:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067:1067 -> a
+    665:665:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
+    665:665:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067 -> a
+    666:669:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1070:1073 -> a
+    670:670: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):1089:1089 -> a
+    671:672:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1102:1103 -> a
+    671:672: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):1093 -> a
+    673:674:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1059:1060 -> a
+    673:674: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):1105 -> a
+    673:674: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):1093 -> a
+    675:694:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1106:1125 -> a
+    675:694:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    695:695:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
+    695:695:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    695:695:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    696:696:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    696:696:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
+    696:696:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    696:696:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    697:697:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    697:697:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
+    697:697:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    697:697:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    698:698:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
+    698:698: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):1125 -> a
+    698:698: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):1093 -> a
+    699:715: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):1129:1145 -> a
+    699:715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    716:716: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):1094:1094 -> a
+    717:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1109:1111 -> a
+    717:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    720:720:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    720:720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1111 -> a
+    720:720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    721:721: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):1111:1111 -> a
+    721:721: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):1093 -> a
     1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):171:171 -> b
-    2:3:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
-    4:4:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):742:742 -> b
-    4:4:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750 -> b
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
-    5:5:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):751 -> b
-    6:6:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> b
-    7:7:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> b
-    7:7:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> b
+    2:2:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:528 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
+    3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528 -> b
+    4:8:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:532 -> b
+    9:10:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
+    11:11:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):742:742 -> b
+    11:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750 -> b
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
+    12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):751 -> b
+    13:13:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> b
+    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> b
+    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> b
     1:1:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807:807 -> c
     2:2:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> c
     2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807 -> c
     3:6:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807:810 -> c
     7:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):809:809 -> c
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     8:8:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811 -> c
     9:9:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> c
     10:10:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> c
@@ -31430,7 +31407,7 @@
     2:40: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):65:103 -> <init>
     41:47: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):101:107 -> <init>
     1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):113:133 -> a
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     22: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):133 -> a
     23:23:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():137:137 -> a
     24:25:com.android.tools.r8.graph.DexField getCaptureField(int):184:185 -> a
@@ -31613,7 +31590,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):437:437 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):435:435 -> 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
@@ -31623,12 +31600,12 @@
     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():513:513 -> 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():335:335 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513 -> a
     64:64:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     65:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:522 -> a
     65:65:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522 -> a
     66:66:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     67:77:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:532 -> a
@@ -31640,7 +31617,7 @@
     95:112:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
     113:113:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     113:113:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):437:437 -> a
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):435:435 -> a
     114:114:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     114:114:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
     115:156:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
@@ -31707,7 +31684,7 @@
     3:18:void synthesizeLambdaClassesFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.LensCodeRewriter):110:125 -> a
     19:19:void synthesizeLambdaClassesFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.LensCodeRewriter):123:123 -> a
     20:26:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):144:150 -> a
-    27:27:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next() -> a
+    27:27:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     27:27:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):151 -> a
     28:38:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):152:162 -> a
     39:40:com.android.tools.r8.ir.desugar.LambdaClass getKnownLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):333:334 -> a
@@ -31718,20 +31695,20 @@
     55:55:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     55:55: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):388 -> a
     55:55:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
-    56:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    56:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     56:56: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):387 -> a
     56:56:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
     57:90: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):390:423 -> a
     57:90:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
-    91:91:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    91:91: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):40:40 -> a
     91:91: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):423 -> a
     91:91:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
-    92:92:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    92:92:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     92:92: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):425 -> a
     92:92:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
     93:96: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):426:429 -> a
     93:96:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
-    97:97:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    97:97:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     97:97: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):435 -> a
     97:97:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
     98:112: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):436:450 -> a
@@ -31745,73 +31722,73 @@
     119:119:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     119:119:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
     120:122:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175:177 -> a
-    123:129:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):185:191 -> a
-    130:135:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):470:475 -> a
-    130:135:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    136:136:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    136:136:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):475 -> a
-    136:136:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> 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.TypeLatticeElement):1012:1012 -> a
-    137:137:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):474 -> a
-    137:137:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    138:155:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):480:497 -> a
-    138:155:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    156:157:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
-    156:157:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499 -> a
-    156:157:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    158:159:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499:500 -> a
-    158:159:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    160:162:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):200:202 -> a
-    163:163:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):201:201 -> a
-    164:172:boolean removeLambdaDeserializationMethods(java.lang.Iterable):210:218 -> a
-    173:173:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
-    173:173:boolean removeLambdaDeserializationMethods(java.lang.Iterable):218 -> a
-    174:176:boolean removeLambdaDeserializationMethods(java.lang.Iterable):219:221 -> a
-    177:183:void adjustAccessibility():237:243 -> a
-    184:184:void adjustAccessibility():242:242 -> a
-    185:186:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):252:253 -> a
-    187:196:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):259:268 -> a
-    197:197:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):265:265 -> a
-    198:202:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):287:291 -> a
-    203:209:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
-    203:209:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
-    210:210:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290:290 -> a
-    211:211:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
-    211:211:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
-    212:216:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):301:305 -> a
-    217:223:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
-    217:223:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
-    224:228:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306:310 -> a
-    229:229:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    229:229:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):310 -> a
-    230:237:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):311:318 -> a
-    238:238:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    238:238:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):338 -> a
-    238:238:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    239:239:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    239:239:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):339 -> a
-    239:239:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    240:240:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):340:340 -> a
-    240:240:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    241:241:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    241:241:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):341 -> a
-    241:241:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    242:248:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):342:348 -> a
-    242:248:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    249:249:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):347:347 -> a
-    249:249:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    250:250:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    250:250:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):346 -> a
-    250:250:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    251:251:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):344:344 -> a
-    251:251:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    252:252:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
-    252:252:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
-    253:253:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325:325 -> a
-    254:254:boolean isInMainDexList(com.android.tools.r8.graph.DexType):295:295 -> a
-    254:254:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):326 -> a
-    255:255:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):327:327 -> a
-    256:258:java.lang.Object getKnown(java.util.Map,java.lang.Object):352:354 -> a
+    123:130:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):185:192 -> a
+    131:141:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):465:475 -> a
+    131:141:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    142:142:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    142:142:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):475 -> a
+    142:142:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    143:143:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    143:143:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):474 -> a
+    143:143:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    144:161:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):480:497 -> a
+    144:161:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    162:163:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    162:163:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499 -> a
+    162:163:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    164:165:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499:500 -> a
+    164:165:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    166:168:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):200:202 -> a
+    169:169:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):201:201 -> a
+    170:178:boolean removeLambdaDeserializationMethods(java.lang.Iterable):210:218 -> a
+    179:179:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    179:179:boolean removeLambdaDeserializationMethods(java.lang.Iterable):218 -> a
+    180:182:boolean removeLambdaDeserializationMethods(java.lang.Iterable):219:221 -> a
+    183:189:void adjustAccessibility():237:243 -> a
+    190:190:void adjustAccessibility():242:242 -> a
+    191:192:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):252:253 -> a
+    193:202:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):259:268 -> a
+    203:203:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):265:265 -> a
+    204:208:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):287:291 -> a
+    209:215:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
+    209:215:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
+    216:216:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290:290 -> a
+    217:217:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
+    217:217:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
+    218:222:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):301:305 -> a
+    223:229:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
+    223:229:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    230:234:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306:310 -> a
+    235:235:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    235:235:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):310 -> a
+    236:243:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):311:318 -> a
+    244:244:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    244:244:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):338 -> a
+    244:244:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    245:245:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    245:245:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):339 -> a
+    245:245:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    246:246:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):340:340 -> a
+    246:246:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    247:247:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    247:247:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):341 -> a
+    247:247:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    248:254:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):342:348 -> a
+    248:254:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    255:255:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):347:347 -> a
+    255:255:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    256:256:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    256:256:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):346 -> a
+    256:256:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    257:257:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):344:344 -> a
+    257:257:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    258:258:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
+    258:258:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    259:259:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325:325 -> a
+    260:260:boolean isInMainDexList(com.android.tools.r8.graph.DexType):295:295 -> a
+    260:260:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):326 -> a
+    261:261:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):327:327 -> a
+    262:264:java.lang.Object getKnown(java.util.Map,java.lang.Object):352:354 -> a
     1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):91:91 -> b
     2:4:java.util.Set getDesugaredCallSites():273:275 -> b
 com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.D.d.L:
@@ -31859,33 +31836,33 @@
     61:66:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):301:306 -> a
     67:68:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):219:220 -> a
     67:68:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    69:69: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):1298:1298 -> a
+    69:69: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):1278:1278 -> a
     69:69:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     69:69:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     70:70:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    70:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1298 -> a
+    70:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278 -> a
     70:70:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     70:70:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    71:71: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):1298:1298 -> a
+    71:71: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):1278:1278 -> a
     71:71:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     71:71:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     72:72:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    72:72: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):1300 -> a
+    72:72: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):1280 -> a
     72:72:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     72:72:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    73:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1299:1302 -> a
+    73:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1279:1282 -> a
     73:76:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     73:76:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     77:77:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221:221 -> a
     77:77:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    78:78: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):1298:1298 -> a
+    78:78: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):1278:1278 -> a
     78:78:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     78:78:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     79:86:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):308:315 -> a
     87:89:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureInvokeBridge$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):318:320 -> a
     1:14:java.util.List extractNest(com.android.tools.r8.graph.DexClass):94:107 -> b
     15:16:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():148:149 -> b
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     17:17:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():149 -> b
     18:36:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():149:167 -> b
     37:37:void com.android.tools.r8.graph.DexProgramClass.<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):70:70 -> b
@@ -32042,8 +32019,8 @@
     2:4:void <init>(com.android.tools.r8.graph.AppView):34:36 -> <init>
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1055 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
     2:2:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44 -> a
     3:4:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:45 -> a
     5:5:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
@@ -32086,7 +32063,7 @@
     84:84:void <init>(com.android.tools.r8.graph.AppView):108:108 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory access$100(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> a
     2:6:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):117:121 -> a
-    7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     7:7:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
     8:25:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):123:140 -> a
     26:41:void rewriteMakeConcat(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):155:170 -> a
@@ -32160,13 +32137,13 @@
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     11:11:void desugar():342 -> a
     12:12:void desugar():343:343 -> 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.TypeLatticeElement):1012:1012 -> 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.TypeLatticeElement):1008:1008 -> a
     13:13:void desugar():343 -> a
     14:14:void desugar():344:344 -> a
     15:16:void appendInstruction(com.android.tools.r8.ir.code.Instruction):308:309 -> a
     15:16:void desugar():344 -> a
     17:18:void desugar():347:348 -> a
-    19:19:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    19:19: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):40:40 -> a
     19:19:void desugar():348 -> a
     20:21:void appendInstruction(com.android.tools.r8.ir.code.Instruction):308:309 -> a
     20:21:void desugar():347 -> a
@@ -32176,7 +32153,7 @@
     26:26:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):413:413 -> a
     26:26:void desugar():352 -> a
     27:36:void desugar():356:365 -> 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.TypeLatticeElement):1012:1012 -> 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.TypeLatticeElement):1008:1008 -> a
     37:37:void desugar():365 -> a
     38:39:void desugar():369:370 -> a
     40:70:void desugar():369:399 -> a
@@ -32195,7 +32172,7 @@
     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>
     1:2:com.android.tools.r8.ir.code.Value getOrCreateValue():443:444 -> a
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     3:3:com.android.tools.r8.ir.code.Value getOrCreateValue():444 -> a
     4:8:com.android.tools.r8.ir.code.Value getOrCreateValue():445:449 -> a
     9:9:com.android.tools.r8.ir.code.Value getOrCreateValue():445:445 -> a
@@ -32227,34 +32204,34 @@
     14:19:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):122:127 -> a
     20:38:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):237:255 -> a
     20:38:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     39:39: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):262 -> a
     39:39:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     40:40: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):262:262 -> a
     40:40:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     41:41: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):266 -> a
     41:41:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     42:42: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):266:266 -> a
     42:42:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     43:43: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):270 -> a
     43:43:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     44:44: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):270:270 -> a
     44:44:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     45:45: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):271 -> a
     45:45:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     46:47: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):271:272 -> a
     46:47:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     48:48:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):269:269 -> a
     48:48:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     49:49: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):280 -> a
     49:49:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     50:50: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):280:280 -> a
     50:50:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     51:51: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):282 -> a
     51:51:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     52:52: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):282:282 -> a
@@ -32263,27 +32240,27 @@
     53:55:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     56:62:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):279:285 -> a
     56:62:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     63:63: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):287 -> a
     63:63:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     64:64: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):287:287 -> a
     64:64:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     65:65: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):291 -> a
     65:65:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     66:66: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):291:291 -> a
     66:66:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     67:67: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):293 -> a
     67:67:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     68:68: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):293:293 -> a
     68:68:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     69:69:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):294 -> a
     69:69:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     70:70:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):294:294 -> a
     70:70:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     71:71: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):295 -> a
     71:71:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     72:72:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295:295 -> a
@@ -32292,27 +32269,27 @@
     73:77:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     78:78:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):290:290 -> a
     78:78:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     79:79: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):303 -> a
     79:79:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     80:80: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):303:303 -> a
     80:80:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     81:81: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):307 -> a
     81:81:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     82:82: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):307:307 -> a
     82:82:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     83:83: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):309 -> a
     83:83:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     84:84: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):309:309 -> a
     84:84:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     85:85: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):310 -> a
     85:85:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     86:86: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):310:310 -> a
     86:86:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     87:87: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):311 -> a
     87:87:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     88:88: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):311:311 -> a
@@ -32321,34 +32298,34 @@
     89:93:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     94:94:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):306:306 -> a
     94:94:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     95:95:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):320 -> a
     95:95:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     96:96: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):320:320 -> a
     96:96:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     97:97: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):322 -> a
     97:97:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     98:98: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):322:322 -> a
     98:98:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     99:99: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):327 -> a
     99:99:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     100:100: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):327:327 -> a
     100:100:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     101:101: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):328 -> a
     101:101:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     102:103: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):328:329 -> a
     102:103:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     104:104:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):326:326 -> a
     104:104:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     105:105: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):335 -> a
     105:105:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     106:106: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):335:335 -> a
     106:106:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     107:107: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):337 -> a
     107:107:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     108:108: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):337:337 -> a
@@ -32357,17 +32334,17 @@
     109:111:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     112:112:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):334:334 -> a
     112:112:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     113:113: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):343 -> a
     113:113:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     114:114: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):343:343 -> a
     114:114:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     115:115: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):345 -> a
     115:115:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     116:116:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):345:345 -> a
     116:116:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    117:117:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    117:117:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     117:117:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):346 -> a
     117:117:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     118:118: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):346:346 -> a
@@ -32376,17 +32353,17 @@
     119:122:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     123:130:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):342:349 -> a
     123:130:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     131:131: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):353 -> a
     131:131:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     132:132: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):353:353 -> a
     132:132:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     133:133: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):355 -> a
     133:133:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     134:134: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):355:355 -> a
     134:134:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     135:135: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):356 -> a
     135:135:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     136:136: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):356:356 -> a
@@ -32395,12 +32372,12 @@
     137:140:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     141:141:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):352:352 -> a
     141:141:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     142:142: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):362 -> a
     142:142:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     143:143: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):362:362 -> a
     143:143:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     144:144: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):364 -> a
     144:144:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     145:145:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):364:364 -> a
@@ -32409,22 +32386,22 @@
     146:148:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     149:149:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):361:361 -> a
     149:149:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     150:150: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):371 -> a
     150:150:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     151:151: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):371:371 -> a
     151:151:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     152:152: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):373 -> a
     152:152:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     153:153: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):373:373 -> a
     153:153:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     154:154: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):374 -> a
     154:154:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     155:155: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):374:374 -> a
     155:155:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     156:156: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):375 -> a
     156:156:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     157:157:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):375:375 -> a
@@ -32433,39 +32410,39 @@
     158:162:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     163:163:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):370:370 -> a
     163:163:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     164:164: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):382 -> a
     164:164:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     165:165: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):382:382 -> a
     165:165:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     166:166: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):384 -> a
     166:166:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     167:167: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):384:384 -> a
     167:167:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    168:168:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    168:168:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     168:168: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):389 -> a
     168:168:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     169:169: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):389:389 -> a
     169:169:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     170:170: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):390 -> a
     170:170:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     171:172: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):390:391 -> a
     171:172:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     173:178:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):388:393 -> a
     173:178:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    179:179:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    179:179:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     179:179: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):397 -> a
     179:179:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     180:180: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):397:397 -> a
     180:180:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     181:181: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):399 -> a
     181:181:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     182:182: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):399:399 -> a
     182:182:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    183:183:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    183:183:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     183:183: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):400 -> a
     183:183:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     184:184: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):400:400 -> a
@@ -32474,12 +32451,12 @@
     185:188:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     189:189:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):396:396 -> a
     189:189:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     190:190: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):407 -> a
     190:190:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     191:191: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):407:407 -> a
     191:191:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    192:192:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    192:192:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     192:192:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):409 -> a
     192:192:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     193:193:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):409:409 -> a
@@ -32488,17 +32465,17 @@
     194:196:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     197:197:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):406:406 -> a
     197:197:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     198:198: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):415 -> a
     198:198:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     199:199: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):415:415 -> a
     199:199:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     200:200: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):417 -> a
     200:200:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     201:201: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):417:417 -> a
     201:201:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     202:202: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):418 -> a
     202:202:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     203:203: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):418:418 -> a
@@ -32507,12 +32484,12 @@
     204:207:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     208:208:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):414:414 -> a
     208:208:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     209:209:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):424 -> a
     209:209:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     210:210:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):424:424 -> a
     210:210:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    211:211:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    211:211:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     211:211: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):426 -> a
     211:211:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     212:212:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):426:426 -> a
@@ -32521,22 +32498,22 @@
     213:215:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     216:216:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):423:423 -> a
     216:216:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     217:217: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):433 -> a
     217:217:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     218:218: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):433:433 -> a
     218:218:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     219:219: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):435 -> a
     219:219:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     220:220: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):435:435 -> a
     220:220:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     221:221: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):436 -> a
     221:221:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     222:222: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):436:436 -> a
     222:222:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    223:223:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    223:223:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     223:223: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):437 -> a
     223:223:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     224:224: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):437:437 -> a
@@ -32545,12 +32522,12 @@
     225:229:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     230:230:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):432:432 -> a
     230:230:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     231:231: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):448 -> a
     231:231:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     232:232:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):448:448 -> a
     232:232:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     233:233:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):450 -> a
     233:233:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     234:234: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):450:450 -> a
@@ -32561,37 +32538,37 @@
     238:238:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     239:239:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):259:259 -> a
     239:239:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     240:240: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):475 -> a
     240:240:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     241:243:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):474:476 -> a
     241:243:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     244:244: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):480 -> a
     244:244:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     245:246: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):480:481 -> a
     245:246:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    247:247:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    247:247:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     247:247: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):486 -> a
     247:247:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     248:250:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):485:487 -> a
     248:250:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     251:251: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):492 -> a
     251:251:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     252:254:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):491:493 -> a
     252:254:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    255:255:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    255:255:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     255:255:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):498 -> a
     255:255:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     256:258:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):497:499 -> a
     256:258:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    259:259:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    259:259:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     259:259: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):504 -> a
     259:259:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     260:263:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):503:506 -> a
     260:263:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    264:264:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    264:264:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     264:264: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):510 -> a
     264:264:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     265:266: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):510:511 -> a
@@ -32600,22 +32577,22 @@
     267:309:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     310:343:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):130:163 -> a
     344:344:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
-    345:345:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    345:345:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     345:345:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):78 -> a
     346:362:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):79:95 -> a
     363:367:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):94:98 -> a
 com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.D.d.f0.a:
     1:4:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1541:1544 -> A
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> A
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1561 -> A
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1561:1561 -> A
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> A
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1563 -> A
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1563:1563 -> A
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> A
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1564 -> A
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1564:1564 -> A
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> A
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1565 -> A
     12:12:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1565:1565 -> A
     13:17:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1562:1566 -> A
@@ -32623,16 +32600,16 @@
     19:42:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1548:1571 -> A
     1:19:com.android.tools.r8.graph.CfCode ShortMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4833:4851 -> A0
     1:5:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1575:1579 -> B
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> B
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     6:6:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1600 -> B
     7:7:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1600:1600 -> B
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> B
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     8:8:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1602 -> B
     9:9:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1602:1602 -> B
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> B
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     10:10:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1603 -> B
     11:11:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1603:1603 -> B
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> B
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     12:12:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1604 -> B
     13:13:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1604:1604 -> B
     14:18:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1601:1605 -> B
@@ -32643,356 +32620,356 @@
     1:16:com.android.tools.r8.graph.CfCode ShortMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4873:4888 -> C0
     1:18:com.android.tools.r8.graph.CfCode LongMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1717:1734 -> D
     1:12:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4892:4903 -> D0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     13:13:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4911 -> D0
     14:16:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4911:4913 -> D0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     17:17:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4917 -> D0
     18:18:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4917:4917 -> D0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     19:19:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4919 -> D0
     20:20:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4919:4919 -> D0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     21:21:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4920 -> D0
     22:22:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4920:4920 -> D0
     23:26:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4918:4921 -> D0
     27:27:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4916:4916 -> D0
-    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     28:28:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4925 -> D0
     29:29:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4925:4925 -> D0
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     30:30:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4930 -> D0
     31:31:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4930:4930 -> D0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     32:32:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4931 -> D0
     33:34:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4931:4932 -> D0
     35:35:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4929:4929 -> D0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     36:36:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4947 -> D0
     37:37:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4947:4947 -> D0
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     38:38:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4949 -> D0
     39:39:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4949:4949 -> D0
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     40:40:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4950 -> D0
     41:41:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4950:4950 -> D0
     42:45:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4948:4951 -> D0
     46:46:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4946:4946 -> D0
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     47:47:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4968 -> D0
     48:48:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4968:4968 -> D0
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     49:49:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4970 -> D0
     50:50:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4970:4970 -> D0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     51:51:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4971 -> D0
     52:52:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4971:4971 -> D0
     53:56:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4969:4972 -> D0
     57:57:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4967:4967 -> D0
-    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     58:58:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4983 -> D0
     59:59:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4983:4983 -> D0
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     60:60:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4985 -> D0
     61:61:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4985:4985 -> D0
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     62:62:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4986 -> D0
     63:63:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4986:4986 -> D0
     64:67:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4984:4987 -> D0
     68:68:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4982:4982 -> D0
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     69:69:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998 -> D0
     70:70:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998:4998 -> D0
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     71:71:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5000 -> D0
     72:72:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5000:5000 -> D0
     73:75:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4999:5001 -> D0
     76:76:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4997:4997 -> D0
     77:176:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4907:5006 -> D0
     1:3:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1738:1740 -> E
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     4:4:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1751 -> E
     5:5:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1751:1751 -> E
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     6:6:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1753 -> E
     7:7:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1753:1753 -> E
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     8:8:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1754 -> E
     9:9:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1754:1754 -> E
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     10:10:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1755 -> E
     11:11:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1755:1755 -> E
     12:16:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1752:1756 -> E
     17:17:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1750:1750 -> E
     18:35:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1744:1761 -> E
     1:11:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5010:5020 -> E0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     12:12:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5028 -> E0
     13:15:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5028:5030 -> E0
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     16:16:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5034 -> E0
     17:17:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5034:5034 -> E0
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     18:18:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036 -> E0
     19:19:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036:5036 -> E0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     20:20:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5037 -> E0
     21:21:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5037:5037 -> E0
     22:25:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5035:5038 -> E0
     26:26:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5033:5033 -> E0
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     27:27:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5042 -> E0
     28:28:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5042:5042 -> E0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     29:29:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047 -> E0
     30:30:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047:5047 -> E0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     31:31:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5048 -> E0
     32:33:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5048:5049 -> E0
     34:34:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5046:5046 -> E0
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     35:35:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5057 -> E0
     36:36:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5057:5057 -> E0
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     37:37:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5059 -> E0
     38:38:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5059:5059 -> E0
     39:41:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5058:5060 -> E0
     42:42:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5056:5056 -> E0
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     43:43:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5068 -> E0
     44:44:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5068:5068 -> E0
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     45:45:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5069 -> E0
     46:47:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5069:5070 -> E0
     48:48:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5067:5067 -> E0
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     49:49:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5079 -> E0
     50:50:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5079:5079 -> E0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     51:51:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5081 -> E0
     52:52:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5081:5081 -> E0
     53:55:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5080:5082 -> E0
     56:56:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5078:5078 -> E0
-    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     57:57:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5084 -> E0
     58:58:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5084:5084 -> E0
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     59:59:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5088 -> E0
     60:60:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5088:5088 -> E0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     61:61:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5090 -> E0
     62:62:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5090:5090 -> E0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     63:63:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5091 -> E0
     64:64:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5091:5091 -> E0
     65:68:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5089:5092 -> E0
     69:69:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5087:5087 -> E0
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     70:70:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5100 -> E0
     71:71:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5100:5100 -> E0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     72:72:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5101 -> E0
     73:74:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5101:5102 -> E0
     75:75:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5099:5099 -> E0
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     76:76:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5111 -> E0
     77:77:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5111:5111 -> E0
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     78:78:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5113 -> E0
     79:79:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5113:5113 -> E0
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     80:80:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5114 -> E0
     81:81:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5114:5114 -> E0
     82:85:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5112:5115 -> E0
     86:86:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5110:5110 -> E0
-    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     87:87:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5124 -> E0
     88:88:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5124:5124 -> E0
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     89:89:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5126 -> E0
     90:90:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5126:5126 -> E0
     91:93:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5125:5127 -> E0
     94:94:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5123:5123 -> E0
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     95:95:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5129 -> E0
     96:96:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5129:5129 -> E0
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     97:97:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5133 -> E0
     98:98:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5133:5133 -> E0
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     99:99:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5135 -> E0
     100:100:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5135:5135 -> E0
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     101:101:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5136 -> E0
     102:102:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5136:5136 -> E0
     103:106:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5134:5137 -> E0
     107:107:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5132:5132 -> E0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     108:108:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5146 -> E0
     109:109:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5146:5146 -> E0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     110:110:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5148 -> E0
     111:111:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5148:5148 -> E0
     112:114:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5147:5149 -> E0
     115:115:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5145:5145 -> E0
     116:246:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5024:5154 -> E0
     1:23:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1766:1788 -> F
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     24:24:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1798 -> F
     25:25:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1798:1798 -> F
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     26:26:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1799 -> F
     27:28:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1799:1800 -> F
     29:29:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1797:1797 -> F
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     30:30:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1807 -> F
     31:33:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1807:1809 -> F
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     34:34:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1813 -> F
     35:35:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1813:1813 -> F
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     36:36:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1815 -> F
     37:37:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1815:1815 -> F
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     38:38:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1816 -> F
     39:39:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1816:1816 -> F
     40:43:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1814:1817 -> F
     44:44:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1812:1812 -> F
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     45:45:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1828 -> F
     46:48:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1828:1830 -> F
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     49:49:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1835 -> F
     50:50:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1835:1835 -> F
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     51:51:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1837 -> F
     52:52:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1837:1837 -> F
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     53:53:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1838 -> F
     54:54:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1838:1838 -> F
     55:58:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1836:1839 -> F
     59:59:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1834:1834 -> F
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     60:60:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1844 -> F
     61:61:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1844:1844 -> F
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     62:62:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1846 -> F
     63:63:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1846:1846 -> F
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     64:64:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1847 -> F
     65:65:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1847:1847 -> F
     66:69:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1845:1848 -> F
     70:70:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1843:1843 -> F
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     71:71:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1853 -> F
     72:72:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1853:1853 -> F
-    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     73:73:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1855 -> F
     74:74:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1855:1855 -> F
-    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     75:75:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1856 -> F
     76:76:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1856:1856 -> F
     77:80:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1854:1857 -> F
     81:81:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1852:1852 -> F
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     82:82:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1867 -> F
     83:83:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1867:1867 -> F
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     84:84:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1869 -> F
     85:85:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1869:1869 -> F
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     86:86:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1870 -> F
     87:87:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1870:1870 -> F
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     88:88:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1871 -> F
     89:89:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1871:1871 -> F
     90:94:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1868:1872 -> F
     95:95:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1866:1866 -> F
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     96:96:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1881 -> F
     97:97:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1881:1881 -> F
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     98:98:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883 -> F
     99:99:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883:1883 -> F
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     100:100:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883 -> F
     101:101:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883:1883 -> F
     102:104:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1882:1884 -> F
     105:105:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1880:1880 -> F
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     106:106:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1913 -> F
     107:107:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1913:1913 -> F
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     108:108:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915 -> F
     109:109:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915:1915 -> F
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     110:110:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915 -> F
     111:111:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915:1915 -> F
     112:114:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1914:1916 -> F
     115:115:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1912:1912 -> F
-    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     116:116:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1922 -> F
     117:117:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1922:1922 -> F
-    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     118:118:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1924 -> F
     119:119:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1924:1924 -> F
-    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     120:120:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1925 -> F
     121:121:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1925:1925 -> F
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     122:122:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1926 -> F
     123:123:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1926:1926 -> F
     124:128:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1923:1927 -> F
     129:129:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1921:1921 -> F
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     130:130:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1935 -> F
     131:131:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1935:1935 -> F
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     132:132:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1941 -> F
     133:133:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1941:1941 -> F
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     134:134:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1943 -> F
     135:135:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1943:1943 -> F
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     136:136:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1944 -> F
     137:137:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1944:1944 -> F
     138:141:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1942:1945 -> F
     142:142:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1940:1940 -> F
-    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     143:143:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1969 -> F
     144:144:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1969:1969 -> F
-    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     145:145:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1971 -> F
     146:146:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1971:1971 -> F
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     147:147:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1972 -> F
     148:148:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1972:1972 -> F
-    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     149:149:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1973 -> F
     150:150:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1973:1973 -> F
     151:155:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1970:1974 -> F
     156:156:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1968:1968 -> F
-    157:157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    157:157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     157:157:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1979 -> F
     158:160:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1979:1981 -> F
-    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     161:161:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1986 -> F
     162:162:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1986:1986 -> F
-    163:163:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    163:163:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     163:163:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1988 -> F
     164:164:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1988:1988 -> F
-    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     165:165:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1989 -> F
     166:166:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1989:1989 -> F
     167:170:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1987:1990 -> F
     171:171:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1985:1985 -> F
-    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     172:172:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1995 -> F
     173:173:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1995:1995 -> F
-    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     174:174:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1997 -> F
     175:175:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1997:1997 -> F
-    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     176:176:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1998 -> F
     177:177:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1998:1998 -> F
     178:181:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1996:1999 -> F
@@ -33000,171 +32977,171 @@
     183:410:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1792:2019 -> F
     1:101:com.android.tools.r8.graph.CfCode LongMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2023:2123 -> G
     1:3:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2127:2129 -> H
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> H
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     4:4:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2140 -> H
     5:5:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2140:2140 -> H
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> H
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     6:6:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2142 -> H
     7:7:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2142:2142 -> H
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> H
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     8:8:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2143 -> H
     9:9:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2143:2143 -> H
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> H
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     10:10:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2144 -> H
     11:11:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2144:2144 -> H
     12:16:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2141:2145 -> H
     17:17:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2139:2139 -> H
     18:35:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2133:2150 -> H
     1:39:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2155:2193 -> I
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     40:40:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2206 -> I
     41:41:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2206:2206 -> I
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     42:42:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2208 -> I
     43:43:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2208:2208 -> I
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     44:44:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2209 -> I
     45:45:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2209:2209 -> I
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     46:46:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2210 -> I
     47:47:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2210:2210 -> I
     48:52:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2207:2211 -> I
     53:53:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2205:2205 -> I
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     54:54:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2226 -> I
     55:55:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2226:2226 -> I
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     56:56:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2244 -> I
     57:57:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2244:2244 -> I
-    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     58:58:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246 -> I
     59:59:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246:2246 -> I
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     60:60:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246 -> I
     61:61:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246:2246 -> I
     62:64:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2245:2247 -> I
     65:65:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2243:2243 -> I
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     66:66:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2267 -> I
     67:67:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2267:2267 -> I
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     68:68:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2269 -> I
     69:69:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2269:2269 -> I
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     70:70:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2270 -> I
     71:71:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2270:2270 -> I
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     72:72:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2271 -> I
     73:73:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2271:2271 -> I
     74:78:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2268:2272 -> I
     79:79:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2266:2266 -> I
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     80:80:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2311 -> I
     81:81:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2311:2311 -> I
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     82:82:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2313 -> I
     83:83:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2313:2313 -> I
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     84:84:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2314 -> I
     85:85:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2314:2314 -> I
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     86:86:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2315 -> I
     87:87:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2315:2315 -> I
     88:92:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2312:2316 -> I
     93:93:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2310:2310 -> I
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     94:94:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337 -> I
     95:95:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337:2337 -> I
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     96:96:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2339 -> I
     97:97:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2339:2339 -> I
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     98:98:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2340 -> I
     99:99:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2340:2340 -> I
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     100:100:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2341 -> I
     101:101:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2341:2341 -> I
     102:106:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2338:2342 -> I
     107:107:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2336:2336 -> I
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     108:108:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2366 -> I
     109:109:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2366:2366 -> I
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     110:110:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2368 -> I
     111:111:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2368:2368 -> I
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     112:112:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2369 -> I
     113:113:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2369:2369 -> I
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     114:114:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2370 -> I
     115:115:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2370:2370 -> I
     116:120:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2367:2371 -> I
     121:121:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2365:2365 -> I
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     122:122:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2382 -> I
     123:123:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2382:2382 -> I
-    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     124:124:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2393 -> I
     125:125:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2393:2393 -> I
-    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     126:126:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2395 -> I
     127:127:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2395:2395 -> I
-    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     128:128:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2396 -> I
     129:129:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2396:2396 -> I
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     130:130:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2397 -> I
     131:131:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2397:2397 -> I
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     132:132:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2398 -> I
     133:133:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2398:2398 -> I
     134:139:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2394:2399 -> I
     140:140:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2392:2392 -> I
     141:359:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2186:2404 -> I
     1:7:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2408:2414 -> J
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> J
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> J
     8:8:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2440 -> J
     9:9:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2440:2440 -> J
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> J
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> J
     10:10:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2445 -> J
     11:11:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2445:2445 -> J
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> J
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> J
     12:12:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2446 -> J
     13:14:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2446:2447 -> J
     15:15:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2444:2444 -> J
     16:50:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2418:2452 -> J
     1:10:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2456:2465 -> K
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> K
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> K
     11:11:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2504 -> K
     12:12:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2504:2504 -> K
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> K
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> K
     13:13:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2509 -> K
     14:14:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2509:2509 -> K
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> K
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> K
     15:15:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2510 -> K
     16:17:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2510:2511 -> K
     18:18:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2508:2508 -> K
     19:66:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2469:2516 -> K
     1:5:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2520:2524 -> L
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> L
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> L
     6:6:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2534 -> L
     7:7:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2534:2534 -> L
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> L
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> L
     8:8:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2539 -> L
     9:9:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2539:2539 -> L
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> L
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> L
     10:10:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2540 -> L
     11:12:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2540:2541 -> L
     13:13:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2538:2538 -> L
     14:37:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2528:2551 -> L
     1:5:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2555:2559 -> M
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> M
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> M
     6:6:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570 -> M
     7:7:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570:2570 -> M
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> M
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> M
     8:8:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2575 -> M
     9:9:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2575:2575 -> M
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> M
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> M
     10:10:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2576 -> M
     11:12:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2576:2577 -> M
     13:13:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2574:2574 -> M
@@ -33172,16 +33149,16 @@
     1:55:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2591:2645 -> N
     1:59:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2649:2707 -> O
     1:3:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2711:2713 -> P
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> P
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     4:4:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2725 -> P
     5:5:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2725:2725 -> P
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> P
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     6:6:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2727 -> P
     7:7:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2727:2727 -> P
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> P
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     8:8:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2728 -> P
     9:9:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2728:2728 -> P
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> P
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     10:10:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2729 -> P
     11:11:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2729:2729 -> P
     12:16:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2726:2730 -> P
@@ -33190,162 +33167,162 @@
     1:47:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2739:2785 -> Q
     1:51:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2789:2839 -> R
     1:3:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2843:2845 -> S
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> S
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     4:4:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2857 -> S
     5:5:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2857:2857 -> S
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> S
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     6:6:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2859 -> S
     7:7:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2859:2859 -> S
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> S
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     8:8:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2860 -> S
     9:9:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2860:2860 -> S
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> S
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     10:10:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2861 -> S
     11:11:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2861:2861 -> S
     12:16:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2858:2862 -> S
     17:17:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2856:2856 -> S
     18:37:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2849:2868 -> S
     1:5:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2872:2876 -> T
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> T
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> T
     6:6:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2886 -> T
     7:7:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2886:2886 -> T
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> T
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> T
     8:8:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2891 -> T
     9:9:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2891:2891 -> T
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> T
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> T
     10:10:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2892 -> T
     11:12:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2892:2893 -> T
     13:13:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2890:2890 -> T
     14:37:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2880:2903 -> T
     1:5:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2907:2911 -> U
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> U
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> U
     6:6:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2922 -> U
     7:7:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2922:2922 -> U
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> U
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> U
     8:8:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2927 -> U
     9:9:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2927:2927 -> U
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> U
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> U
     10:10:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2928 -> U
     11:12:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2928:2929 -> U
     13:13:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2926:2926 -> U
     14:38:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2915:2939 -> U
     1:7:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2943:2949 -> V
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> V
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> V
     8:8:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2975 -> V
     9:9:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2975:2975 -> V
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> V
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> V
     10:10:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2980 -> V
     11:11:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2980:2980 -> V
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> V
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> V
     12:12:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2981 -> V
     13:14:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2981:2982 -> V
     15:15:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2979:2979 -> V
     16:50:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2953:2987 -> V
     1:18:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2991:3008 -> W
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     19:19:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3019 -> W
     20:20:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3019:3019 -> W
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     21:21:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021 -> W
     22:22:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021:3021 -> W
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     23:23:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021 -> W
     24:24:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021:3021 -> W
     25:27:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3020:3022 -> W
     28:28:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3018:3018 -> W
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     29:29:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3031 -> W
     30:30:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3031:3031 -> W
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     31:31:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033 -> W
     32:32:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033:3033 -> W
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     33:33:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033 -> W
     34:34:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033:3033 -> W
     35:37:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3032:3034 -> W
     38:38:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3030:3030 -> W
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     39:39:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3042 -> W
     40:40:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3042:3042 -> W
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     41:41:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044 -> W
     42:42:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044:3044 -> W
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     43:43:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044 -> W
     44:44:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044:3044 -> W
     45:47:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3043:3045 -> W
     48:48:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3041:3041 -> W
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     49:49:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3055 -> W
     50:50:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3055:3055 -> W
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     51:51:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057 -> W
     52:52:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057:3057 -> W
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     53:53:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057 -> W
     54:54:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057:3057 -> W
     55:57:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3056:3058 -> W
     58:58:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3054:3054 -> W
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     59:59:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3115 -> W
     60:60:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3115:3115 -> W
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     61:61:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3120 -> W
     62:62:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3120:3120 -> W
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     63:63:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3121 -> W
     64:65:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3121:3122 -> W
     66:66:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3119:3119 -> W
     67:182:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3012:3127 -> W
     1:3:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3131:3133 -> X
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> X
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     4:4:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3145 -> X
     5:5:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3145:3145 -> X
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> X
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     6:6:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3147 -> X
     7:7:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3147:3147 -> X
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> X
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     8:8:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3148 -> X
     9:9:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3148:3148 -> X
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> X
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     10:10:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3149 -> X
     11:11:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3149:3149 -> X
     12:16:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3146:3150 -> X
     17:17:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3144:3144 -> X
     18:36:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3137:3155 -> X
     1:5:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3159:3163 -> Y
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> Y
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Y
     6:6:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3173 -> Y
     7:7:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3173:3173 -> Y
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> Y
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Y
     8:8:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3178 -> Y
     9:9:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3178:3178 -> Y
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> Y
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Y
     10:10:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3179 -> Y
     11:12:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3179:3180 -> Y
     13:13:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3177:3177 -> Y
     14:36:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3167:3189 -> Y
     1:5:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3193:3197 -> Z
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> Z
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Z
     6:6:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3208 -> Z
     7:7:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3208:3208 -> Z
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> Z
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Z
     8:8:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3213 -> Z
     9:9:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3213:3213 -> Z
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> Z
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Z
     10:10:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3214 -> Z
     11:12:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3214:3215 -> Z
     13:13:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3212:3212 -> Z
     14:37:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3201:3224 -> Z
     1:28:com.android.tools.r8.graph.CfCode BooleanMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):51:78 -> a
     1:3:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3228:3230 -> a0
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a0
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a0
     4:4:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3241 -> a0
     5:5:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3241:3241 -> a0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a0
     6:6:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243 -> a0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243:3243 -> a0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243 -> a0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243:3243 -> a0
     10:12:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3242:3244 -> a0
@@ -33353,13 +33330,13 @@
     14:30:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3234:3250 -> a0
     1:21:com.android.tools.r8.graph.CfCode BooleanMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):82:102 -> b
     1:3:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3254:3256 -> b0
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b0
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b0
     4:4:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3267 -> b0
     5:5:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3267:3267 -> b0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b0
     6:6:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269 -> b0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269:3269 -> b0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269 -> b0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269:3269 -> b0
     10:12:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3268:3270 -> b0
@@ -33367,161 +33344,161 @@
     14:30:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3260:3276 -> b0
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):106:120 -> c
     1:7:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3280:3286 -> c0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3312 -> c0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3312:3312 -> c0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c0
     10:10:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3317 -> c0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3317:3317 -> c0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c0
     12:12:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3318 -> c0
     13:14:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3318:3319 -> c0
     15:15:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3316:3316 -> c0
     16:50:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3290:3324 -> c0
     1:19:com.android.tools.r8.graph.CfCode ByteMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):124:142 -> d
     1:10:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3328:3337 -> d0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> d0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3376 -> d0
     12:12:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3376:3376 -> d0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> d0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d0
     13:13:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3381 -> d0
     14:14:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3381:3381 -> d0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> d0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d0
     15:15:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3382 -> d0
     16:17:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3382:3383 -> d0
     18:18:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3380:3380 -> d0
     19:66:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3341:3388 -> d0
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):146:160 -> e
     1:6:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3392:3397 -> e0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> e0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> e0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3413 -> e0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3413:3413 -> e0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> e0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> e0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3418 -> e0
     10:10:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3418:3418 -> e0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> e0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> e0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3419 -> e0
     12:13:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3419:3420 -> e0
     14:14:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3417:3417 -> e0
     15:42:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3401:3428 -> e0
     1:16:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):164:179 -> f
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3433:3437 -> f0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3455 -> f0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3455:3455 -> f0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3457 -> f0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3457:3457 -> f0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3462 -> f0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3462:3462 -> f0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3463 -> f0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3463:3464 -> f0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3461:3466 -> f0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3470 -> f0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3470:3470 -> f0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3472 -> f0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3472:3472 -> f0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3473 -> f0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3473:3473 -> f0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3471:3474 -> f0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3469:3469 -> f0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3480 -> f0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3480:3480 -> f0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3482 -> f0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3482:3482 -> f0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3483 -> f0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3483:3483 -> f0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3481:3484 -> f0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3479:3486 -> f0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3490 -> f0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3490:3490 -> f0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3492 -> f0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3492:3492 -> f0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3493 -> f0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3493:3493 -> f0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3491:3494 -> f0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3489:3489 -> f0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3500 -> f0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3500:3500 -> f0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3502 -> f0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3502:3502 -> f0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3503 -> f0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3503:3503 -> f0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3501:3504 -> f0
     71:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3499:3506 -> f0
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3510 -> f0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3510:3510 -> f0
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3512 -> f0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3512:3512 -> f0
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3513 -> f0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3513:3513 -> f0
     85:88:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3511:3514 -> f0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3509:3509 -> f0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3520 -> f0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3520:3520 -> f0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3522 -> f0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3522:3522 -> f0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3523 -> f0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3523:3523 -> f0
     96:99:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3521:3524 -> f0
     100:107:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3519:3526 -> f0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3530 -> f0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3530:3530 -> f0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3532 -> f0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3532:3532 -> f0
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3533 -> f0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3533:3533 -> f0
     114:117:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3531:3534 -> f0
     118:118:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3529:3529 -> f0
-    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3540 -> f0
     120:120:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3540:3540 -> f0
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     121:121:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3542 -> f0
     122:122:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3542:3542 -> f0
-    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     123:123:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3543 -> f0
     124:124:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3543:3543 -> f0
     125:128:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3541:3544 -> f0
     129:129:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3539:3539 -> f0
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3549 -> f0
     131:131:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3549:3549 -> f0
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     132:132:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3551 -> f0
     133:133:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3551:3551 -> f0
     134:136:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3550:3552 -> f0
     137:137:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3548:3548 -> f0
-    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     138:138:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3557 -> f0
     139:139:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3557:3557 -> f0
-    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     140:140:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3559 -> f0
     141:141:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3559:3559 -> f0
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     142:142:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3560 -> f0
     143:143:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3560:3560 -> f0
     144:147:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3558:3561 -> f0
@@ -33529,837 +33506,837 @@
     149:277:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3441:3569 -> f0
     1:15:com.android.tools.r8.graph.CfCode CharacterMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):183:197 -> g
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3573:3577 -> g0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3592 -> g0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3592:3592 -> g0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3594 -> g0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3594:3594 -> g0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3599 -> g0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3599:3599 -> g0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3600 -> g0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3600:3601 -> g0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3598:3603 -> g0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3607 -> g0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3607:3607 -> g0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3609 -> g0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3609:3609 -> g0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3610 -> g0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3610:3610 -> g0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3608:3611 -> g0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3606:3606 -> g0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3617 -> g0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3617:3617 -> g0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3619 -> g0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3619:3619 -> g0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3620 -> g0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3620:3620 -> g0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3618:3621 -> g0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3616:3623 -> g0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3627 -> g0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3627:3627 -> g0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3629 -> g0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3629:3629 -> g0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3630 -> g0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3630:3630 -> g0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3628:3631 -> g0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3626:3626 -> g0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3637 -> g0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3637:3637 -> g0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3639 -> g0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3639:3639 -> g0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3640 -> g0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3640:3640 -> g0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3638:3641 -> g0
     71:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3636:3643 -> g0
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3647 -> g0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3647:3647 -> g0
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3649 -> g0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3649:3649 -> g0
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3650 -> g0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3650:3650 -> g0
     85:88:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3648:3651 -> g0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3646:3646 -> g0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3657 -> g0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3657:3657 -> g0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3659 -> g0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3659:3659 -> g0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3660 -> g0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3660:3660 -> g0
     96:99:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3658:3661 -> g0
     100:100:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3656:3656 -> g0
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     101:101:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3666 -> g0
     102:102:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3666:3666 -> g0
-    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     103:103:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3668 -> g0
     104:104:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3668:3668 -> g0
     105:107:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3667:3669 -> g0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3665:3665 -> g0
-    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3674 -> g0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3674:3674 -> g0
-    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3676 -> g0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3676:3676 -> g0
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3677 -> g0
     114:114:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3677:3677 -> g0
     115:118:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3675:3678 -> g0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3673:3673 -> g0
     120:225:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3581:3686 -> g0
     1:3:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):202:204 -> h
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     4:4:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):210 -> h
     5:5:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):210:210 -> h
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     6:6:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):216 -> h
     7:7:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):216:216 -> h
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     8:8:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218 -> h
     9:9:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218:218 -> h
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     10:10:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218 -> h
     11:11:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218:218 -> h
     12:14:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):217:219 -> h
     15:15:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):215:215 -> h
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     16:16:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):224 -> h
     17:17:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):224:224 -> h
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     18:18:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226 -> h
     19:19:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226:226 -> h
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     20:20:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226 -> h
     21:21:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226:226 -> h
     22:24:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):225:227 -> h
     25:25:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):223:223 -> h
     26:50:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):208:232 -> h
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3690:3694 -> h0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3706 -> h0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3706:3706 -> h0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3708 -> h0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3708:3708 -> h0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3713 -> h0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3713:3713 -> h0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3714 -> h0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3714:3715 -> h0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3712:3717 -> h0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3721 -> h0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3721:3721 -> h0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3723 -> h0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3723:3723 -> h0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3724 -> h0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3724:3724 -> h0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3722:3725 -> h0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3720:3720 -> h0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3731 -> h0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3731:3731 -> h0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3733 -> h0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3733:3733 -> h0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3734 -> h0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3734:3734 -> h0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3732:3735 -> h0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3730:3737 -> h0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3741 -> h0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3741:3741 -> h0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3743 -> h0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3743:3743 -> h0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3744 -> h0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3744:3744 -> h0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3742:3745 -> h0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3740:3740 -> h0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3751 -> h0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3751:3751 -> h0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3753 -> h0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3753:3753 -> h0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3754 -> h0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3754:3754 -> h0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3752:3755 -> h0
     71:71:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3750:3750 -> h0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     72:72:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3760 -> h0
     73:73:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3760:3760 -> h0
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     74:74:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3762 -> h0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3762:3762 -> h0
     76:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3761:3763 -> h0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3759:3759 -> h0
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3768 -> h0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3768:3768 -> h0
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3770 -> h0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3770:3770 -> h0
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3771 -> h0
     85:85:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3771:3771 -> h0
     86:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3769:3772 -> h0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3767:3767 -> h0
     91:173:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3698:3780 -> h0
     1:8:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):516:523 -> i
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     9:9:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):529 -> i
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):529:529 -> i
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):536 -> i
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):536:536 -> i
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538 -> i
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538:538 -> i
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538 -> i
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538:538 -> i
     17:19:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):537:539 -> i
     20:20:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):535:535 -> i
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):564 -> i
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):564:564 -> i
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):566 -> i
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):566:566 -> i
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):567 -> i
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):567:567 -> i
     27:30:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):565:568 -> i
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):563:563 -> i
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):573 -> i
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):573:573 -> i
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):575 -> i
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):575:575 -> i
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):576 -> i
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):576:576 -> i
     38:41:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):574:577 -> i
     42:42:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):572:572 -> i
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):588 -> i
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):588:588 -> i
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590 -> i
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590:590 -> i
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     47:47:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):591 -> i
     48:48:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):591:591 -> i
     49:52:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):589:592 -> i
     53:53:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):587:587 -> i
     54:124:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):527:597 -> i
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3784:3788 -> i0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3806 -> i0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3806:3806 -> i0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3808 -> i0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3808:3808 -> i0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3809 -> i0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3809:3809 -> i0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3810 -> i0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3810:3810 -> i0
     14:18:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3807:3811 -> i0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3805:3805 -> i0
     20:45:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3792:3817 -> i0
     1:6:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):601:606 -> j
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     7:7:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):613 -> j
     8:8:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):613:613 -> j
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     9:9:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):620 -> j
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):620:620 -> j
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):622 -> j
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):622:622 -> j
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):623 -> j
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):623:623 -> j
     15:18:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):621:624 -> j
     19:19:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):619:619 -> j
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     20:20:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):631 -> j
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):631:631 -> j
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):633 -> j
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):633:633 -> j
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):634 -> j
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):634:634 -> j
     26:29:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):632:635 -> j
     30:30:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):630:630 -> j
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640 -> j
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640:640 -> j
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):642 -> j
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):642:642 -> j
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):643 -> j
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):643:643 -> j
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):644 -> j
     38:38:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):644:644 -> j
     39:43:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):641:645 -> j
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):639:639 -> j
     45:86:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):610:651 -> j
     1:41:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3821:3861 -> j0
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     42:42:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3879 -> j0
     43:43:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3879:3879 -> j0
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     44:44:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3883 -> j0
     45:45:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3883:3883 -> j0
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     46:46:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3886 -> j0
     47:47:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3886:3886 -> j0
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     48:48:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3888 -> j0
     49:49:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3888:3888 -> j0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3892 -> j0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3892:3892 -> j0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3894 -> j0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3894:3894 -> j0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3895 -> j0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3895:3895 -> j0
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     56:56:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3896 -> j0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3896:3896 -> j0
     58:62:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3893:3897 -> j0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3891:3891 -> j0
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3908 -> j0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3908:3908 -> j0
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3912 -> j0
     67:67:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3912:3912 -> j0
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     68:68:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3915 -> j0
     69:69:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3915:3915 -> j0
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     70:70:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3917 -> j0
     71:71:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3917:3917 -> j0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     72:72:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3921 -> j0
     73:73:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3921:3921 -> j0
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     74:74:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3923 -> j0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3923:3923 -> j0
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     76:76:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3924 -> j0
     77:77:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3924:3924 -> j0
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     78:78:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3925 -> j0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3925:3925 -> j0
     80:84:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3922:3926 -> j0
     85:85:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3920:3920 -> j0
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     86:86:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3937 -> j0
     87:87:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3937:3937 -> j0
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     88:88:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3941 -> j0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3941:3941 -> j0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3944 -> j0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3944:3944 -> j0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3946 -> j0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3946:3946 -> j0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3950 -> j0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3950:3950 -> j0
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     96:96:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3952 -> j0
     97:97:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3952:3952 -> j0
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     98:98:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3953 -> j0
     99:99:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3953:3953 -> j0
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     100:100:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3954 -> j0
     101:101:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3954:3954 -> j0
     102:106:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3951:3955 -> j0
     107:107:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3949:3949 -> j0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3966 -> j0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3966:3966 -> j0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3970 -> j0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3970:3970 -> j0
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3973 -> j0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3973:3973 -> j0
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     114:114:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3975 -> j0
     115:115:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3975:3975 -> j0
-    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     116:116:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3979 -> j0
     117:117:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3979:3979 -> j0
-    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     118:118:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3981 -> j0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3981:3981 -> j0
-    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     120:120:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3982 -> j0
     121:121:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3982:3982 -> j0
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     122:122:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3983 -> j0
     123:123:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3983:3983 -> j0
     124:128:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3980:3984 -> j0
     129:129:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3978:3978 -> j0
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3995 -> j0
     131:131:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3995:3995 -> j0
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     132:132:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3999 -> j0
     133:133:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3999:3999 -> j0
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     134:134:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4002 -> j0
     135:135:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4002:4002 -> j0
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     136:136:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4004 -> j0
     137:137:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4004:4004 -> j0
-    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     138:138:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4008 -> j0
     139:139:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4008:4008 -> j0
-    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     140:140:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4010 -> j0
     141:141:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4010:4010 -> j0
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     142:142:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4011 -> j0
     143:143:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4011:4011 -> j0
-    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     144:144:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4012 -> j0
     145:145:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4012:4012 -> j0
     146:150:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4009:4013 -> j0
     151:151:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4007:4007 -> j0
-    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     152:152:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4024 -> j0
     153:153:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4024:4024 -> j0
-    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     154:154:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4028 -> j0
     155:155:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4028:4028 -> j0
-    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     156:156:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4031 -> j0
     157:157:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4031:4031 -> j0
-    158:158:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    158:158:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     158:158:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4033 -> j0
     159:159:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4033:4033 -> j0
-    160:160:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    160:160:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     160:160:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4037 -> j0
     161:161:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4037:4037 -> j0
-    162:162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    162:162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     162:162:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4039 -> j0
     163:163:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4039:4039 -> j0
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     164:164:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4040 -> j0
     165:165:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4040:4040 -> j0
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     166:166:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4041 -> j0
     167:167:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4041:4041 -> j0
     168:172:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4038:4042 -> j0
     173:173:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4036:4036 -> j0
-    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     174:174:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4053 -> j0
     175:175:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4053:4053 -> j0
-    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     176:176:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4057 -> j0
     177:177:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4057:4057 -> j0
-    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     178:178:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4060 -> j0
     179:179:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4060:4060 -> j0
-    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     180:180:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4062 -> j0
     181:181:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4062:4062 -> j0
-    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     182:182:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4066 -> j0
     183:183:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4066:4066 -> j0
-    184:184:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    184:184:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     184:184:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4068 -> j0
     185:185:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4068:4068 -> j0
-    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     186:186:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4069 -> j0
     187:187:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4069:4069 -> j0
-    188:188:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    188:188:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     188:188:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4070 -> j0
     189:189:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4070:4070 -> j0
     190:194:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4067:4071 -> j0
     195:195:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4065:4065 -> j0
-    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     196:196:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4082 -> j0
     197:197:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4082:4082 -> j0
-    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     198:198:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4086 -> j0
     199:199:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4086:4086 -> j0
-    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     200:200:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4089 -> j0
     201:201:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4089:4089 -> j0
-    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     202:202:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4091 -> j0
     203:203:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4091:4091 -> j0
-    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     204:204:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4095 -> j0
     205:205:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4095:4095 -> j0
-    206:206:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    206:206:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     206:206:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4097 -> j0
     207:207:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4097:4097 -> j0
-    208:208:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    208:208:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     208:208:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4098 -> j0
     209:209:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4098:4098 -> j0
-    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     210:210:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4099 -> j0
     211:211:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4099:4099 -> j0
     212:216:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4096:4100 -> j0
     217:217:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4094:4094 -> j0
-    218:218:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    218:218:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     218:218:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4111 -> j0
     219:219:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4111:4111 -> j0
-    220:220:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    220:220:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     220:220:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4115 -> j0
     221:221:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4115:4115 -> j0
-    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     222:222:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4118 -> j0
     223:223:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4118:4118 -> j0
-    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     224:224:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4120 -> j0
     225:225:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4120:4120 -> j0
-    226:226:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    226:226:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     226:226:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4124 -> j0
     227:227:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4124:4124 -> j0
-    228:228:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    228:228:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     228:228:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4126 -> j0
     229:229:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4126:4126 -> j0
-    230:230:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    230:230:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     230:230:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4127 -> j0
     231:231:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4127:4127 -> j0
-    232:232:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    232:232:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     232:232:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4128 -> j0
     233:233:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4128:4128 -> j0
     234:238:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4125:4129 -> j0
     239:239:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4123:4123 -> j0
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     240:240:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4144 -> j0
     241:241:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4144:4144 -> j0
-    242:242:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    242:242:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     242:242:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4146 -> j0
     243:243:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4146:4146 -> j0
-    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     244:244:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4147 -> j0
     245:245:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4147:4147 -> j0
     246:249:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4145:4148 -> j0
     250:250:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4143:4143 -> j0
     251:539:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3865:4153 -> j0
     1:11:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):655:665 -> k
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):671 -> k
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):671:671 -> k
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):678 -> k
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):678:678 -> k
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680 -> k
     17:17:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680:680 -> k
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     18:18:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680 -> k
     19:19:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680:680 -> k
     20:22:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):679:681 -> k
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):677:677 -> k
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):705 -> k
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):705:705 -> k
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707 -> k
     27:27:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707:707 -> k
     28:30:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):706:708 -> k
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):704:704 -> k
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):713 -> k
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):713:713 -> k
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):715 -> k
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):715:715 -> k
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):716 -> k
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):716:716 -> k
     38:41:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):714:717 -> k
     42:42:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):712:712 -> k
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725 -> k
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725:725 -> k
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):727 -> k
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):727:727 -> k
     47:49:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):726:728 -> k
     50:50:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):724:724 -> k
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     51:51:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):733 -> k
     52:52:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):733:733 -> k
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     53:53:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):735 -> k
     54:54:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):735:735 -> k
-    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     55:55:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):736 -> k
     56:56:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):736:736 -> k
     57:60:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):734:737 -> k
     61:61:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):732:732 -> k
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     62:62:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):747 -> k
     63:63:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):747:747 -> k
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     64:64:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):749 -> k
     65:65:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):749:749 -> k
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     66:66:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):750 -> k
     67:67:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):750:750 -> k
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     68:68:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):751 -> k
     69:69:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):751:751 -> k
     70:74:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):748:752 -> k
     75:75:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):746:746 -> k
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     76:76:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756 -> k
     77:77:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756:756 -> k
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     78:78:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):758 -> k
     79:79:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):758:758 -> k
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     80:80:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):763 -> k
     81:81:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):763:763 -> k
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     82:82:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):764 -> k
     83:84:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):764:765 -> k
     85:90:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):762:767 -> k
-    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     91:91:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):771 -> k
     92:92:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):771:771 -> k
-    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     93:93:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773 -> k
     94:94:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773:773 -> k
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     95:95:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):774 -> k
     96:96:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):774:774 -> k
     97:100:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):772:775 -> k
     101:101:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):770:770 -> k
-    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     102:102:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):781 -> k
     103:103:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):781:781 -> k
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     104:104:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):783 -> k
     105:105:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):783:783 -> k
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     106:106:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784 -> k
     107:107:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784:784 -> k
     108:111:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):782:785 -> k
     112:112:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):780:780 -> k
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     113:113:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):790 -> k
     114:114:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):790:790 -> k
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     115:115:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):792 -> k
     116:116:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):792:792 -> k
     117:119:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):791:793 -> k
     120:120:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):789:789 -> k
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     121:121:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):798 -> k
     122:122:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):798:798 -> k
-    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     123:123:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800 -> k
     124:124:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800:800 -> k
-    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     125:125:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):801 -> k
     126:126:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):801:801 -> k
     127:130:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):799:802 -> k
     131:131:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):797:797 -> k
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     132:132:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):813 -> k
     133:133:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):813:813 -> k
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     134:134:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815 -> k
     135:135:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815:815 -> k
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     136:136:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):816 -> k
     137:137:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):816:816 -> k
     138:141:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):814:817 -> k
     142:142:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):812:812 -> k
     143:296:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):669:822 -> k
     1:6:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4157:4162 -> k0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4178 -> k0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4178:4178 -> k0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4180 -> k0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4180:4180 -> k0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4181 -> k0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4181:4181 -> k0
     13:16:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4179:4182 -> k0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4177:4177 -> k0
     18:46:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4166:4194 -> k0
     1:9:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):826:834 -> l
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):840 -> l
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):840:840 -> l
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):847 -> l
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):847:847 -> l
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849 -> l
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849:849 -> l
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849 -> l
     17:17:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849:849 -> l
     18:20:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):848:850 -> l
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):846:846 -> l
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):875 -> l
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):875:875 -> l
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):877 -> l
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):877:877 -> l
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):878 -> l
     27:27:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):878:878 -> l
     28:31:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):876:879 -> l
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):874:874 -> l
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):884 -> l
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):884:884 -> l
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):886 -> l
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):886:886 -> l
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):887 -> l
     38:38:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):887:887 -> l
     39:42:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):885:888 -> l
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):883:883 -> l
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):892 -> l
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):892:892 -> l
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):894 -> l
     47:47:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):894:894 -> l
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     48:48:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):899 -> l
     49:49:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):899:899 -> l
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     50:50:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):900 -> l
     51:52:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):900:901 -> l
     53:58:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):898:903 -> l
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     59:59:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):907 -> l
     60:60:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):907:907 -> l
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     61:61:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):909 -> l
     62:62:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):909:909 -> l
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     63:63:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):910 -> l
     64:64:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):910:910 -> l
     65:68:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):908:911 -> l
     69:69:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):906:906 -> l
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     70:70:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):917 -> l
     71:71:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):917:917 -> l
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     72:72:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):919 -> l
     73:73:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):919:919 -> l
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     74:74:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):920 -> l
     75:75:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):920:920 -> l
     76:79:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):918:921 -> l
     80:80:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):916:916 -> l
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     81:81:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):926 -> l
     82:82:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):926:926 -> l
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     83:83:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):928 -> l
     84:84:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):928:928 -> l
     85:87:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):927:929 -> l
     88:88:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):925:925 -> l
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     89:89:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):934 -> l
     90:90:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):934:934 -> l
-    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     91:91:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):936 -> l
     92:92:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):936:936 -> l
-    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     93:93:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):937 -> l
     94:94:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):937:937 -> l
     95:98:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):935:938 -> l
     99:99:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):933:933 -> l
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     100:100:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):949 -> l
     101:101:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):949:949 -> l
-    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     102:102:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):951 -> l
     103:103:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):951:951 -> l
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     104:104:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):952 -> l
     105:105:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):952:952 -> l
     106:109:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):950:953 -> l
     110:110:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):948:948 -> l
     111:231:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):838:958 -> l
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4198:4202 -> l0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4217 -> l0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4217:4217 -> l0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4218 -> l0
     9:10:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4218:4219 -> l0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4216:4216 -> l0
     12:31:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4206:4225 -> l0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):963:964 -> m
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> m
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):973 -> m
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):973:973 -> m
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> m
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):975 -> m
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):975:975 -> m
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):974:976 -> m
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):972:972 -> m
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> m
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):981 -> m
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):981:981 -> m
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> m
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):983 -> m
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):983:983 -> m
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> m
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     15:15:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):984 -> m
     16:16:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):984:984 -> m
     17:20:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):982:985 -> m
@@ -34367,18 +34344,18 @@
     22:43:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):968:989 -> m
     1:21:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4229:4249 -> m0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):993:994 -> n
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> n
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1003 -> n
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1003:1003 -> n
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> n
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005 -> n
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005:1005 -> n
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1004:1006 -> n
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1002:1002 -> n
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> n
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1011 -> n
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1011:1011 -> n
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> n
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1013 -> n
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1013:1013 -> n
     15:17:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1012:1014 -> n
@@ -34386,168 +34363,168 @@
     19:39:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):998:1018 -> n
     1:21:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4253:4273 -> n0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1023:1024 -> o
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1033 -> o
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1033:1033 -> o
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1035 -> o
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1035:1035 -> o
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1034:1036 -> o
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1032:1032 -> o
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1041 -> o
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1041:1041 -> o
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1043 -> o
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1043:1043 -> o
     15:17:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1042:1044 -> o
     18:18:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1040:1040 -> o
     19:39:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1028:1048 -> o
     1:16:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4278:4293 -> o0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4297 -> o0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4297:4297 -> o0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4299 -> o0
     20:20:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4299:4299 -> o0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4300 -> o0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4300:4300 -> o0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4301 -> o0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4301:4301 -> o0
     25:29:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4298:4302 -> o0
     30:30:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4296:4296 -> o0
     31:53:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4285:4307 -> o0
     1:4:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052:1055 -> p
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p
     5:5:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1065 -> p
     6:6:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1065:1065 -> p
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p
     7:7:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067 -> p
     8:8:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067:1067 -> p
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p
     9:9:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067 -> p
     10:10:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067:1067 -> p
     11:13:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1066:1068 -> p
     14:14:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1064:1064 -> p
     15:37:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1059:1081 -> p
     1:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4312:4328 -> p0
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4332 -> p0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4332:4332 -> p0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     20:20:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4334 -> p0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4334:4334 -> p0
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4335 -> p0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4335:4335 -> p0
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4336 -> p0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4336:4336 -> p0
     26:30:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4333:4337 -> p0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4331:4331 -> p0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4339 -> p0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4339:4339 -> p0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4343 -> p0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4343:4343 -> p0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4345 -> p0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4345:4345 -> p0
     38:40:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4344:4346 -> p0
     41:50:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4342:4351 -> p0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4355 -> p0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4355:4355 -> p0
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4357 -> p0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4357:4357 -> p0
-    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4358 -> p0
     56:56:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4358:4358 -> p0
-    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4359 -> p0
     58:58:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4359:4359 -> p0
     59:63:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4356:4360 -> p0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4354:4354 -> p0
     65:110:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4320:4365 -> p0
     1:5:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1085:1089 -> q
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     6:6:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1099 -> q
     7:7:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1099:1099 -> q
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     8:8:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101 -> q
     9:9:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101:1101 -> q
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     10:10:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101 -> q
     11:11:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101:1101 -> q
     12:14:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1100:1102 -> q
     15:15:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1098:1098 -> q
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     16:16:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1109 -> q
     17:17:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1109:1109 -> q
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     18:18:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111 -> q
     19:19:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111:1111 -> q
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     20:20:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111 -> q
     21:21:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111:1111 -> q
     22:24:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1110:1112 -> q
     25:25:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1108:1108 -> q
     26:56:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1093:1123 -> q
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4370:4374 -> q0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4383 -> q0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4383:4383 -> q0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4389 -> q0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4389:4389 -> q0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4391 -> q0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4391:4391 -> q0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4392 -> q0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4392:4392 -> q0
     14:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4390:4393 -> q0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4388:4388 -> q0
     19:42:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4378:4401 -> q0
     1:5:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1127:1131 -> r
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     6:6:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1141 -> r
     7:7:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1141:1141 -> r
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     8:8:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> r
     9:9:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143:1143 -> r
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     10:10:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> r
     11:11:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143:1143 -> r
     12:14:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1142:1144 -> r
     15:15:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1140:1140 -> r
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     16:16:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1151 -> r
     17:17:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1151:1151 -> r
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     18:18:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153 -> r
     19:19:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153:1153 -> r
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     20:20:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153 -> r
     21:21:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153:1153 -> r
     22:24:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1152:1154 -> r
     25:25:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1150:1150 -> r
     26:56:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1135:1165 -> r
     1:10:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4405:4414 -> r0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4418 -> r0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4418:4418 -> r0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4420 -> r0
     14:14:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4420:4420 -> r0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     15:15:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4421 -> r0
     16:16:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4421:4421 -> r0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4422 -> r0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4422:4422 -> r0
     19:23:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4419:4423 -> r0
@@ -34555,411 +34532,411 @@
     25:42:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4411:4428 -> r0
     1:29:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1169:1197 -> s
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4432:4436 -> s0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> s0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> s0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4451 -> s0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4451:4451 -> s0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> s0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> s0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4453 -> s0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4453:4453 -> s0
     10:12:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4452:4454 -> s0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4450:4450 -> s0
     14:34:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4440:4460 -> s0
     1:5:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1201:1205 -> t
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1226 -> t
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1226:1226 -> t
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1228 -> t
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1228:1228 -> t
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1229 -> t
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1229:1229 -> t
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     12:12:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1230 -> t
     13:13:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1230:1230 -> t
     14:18:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1227:1231 -> t
     19:19:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1225:1225 -> t
     20:47:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1209:1236 -> t
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4464:4469 -> t0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4479 -> t0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4479:4479 -> t0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4480 -> t0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4480:4481 -> t0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4478:4478 -> t0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4490 -> t0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4490:4490 -> t0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4492 -> t0
     16:16:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4492:4492 -> t0
     17:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4491:4493 -> t0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4489:4489 -> t0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4498 -> t0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4498:4498 -> t0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4500 -> t0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4500:4500 -> t0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4501 -> t0
     26:26:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4501:4501 -> t0
     27:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4499:4502 -> t0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4497:4497 -> t0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510 -> t0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510:4510 -> t0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4511 -> t0
     35:36:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4511:4512 -> t0
     37:37:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4509:4509 -> t0
     38:83:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4473:4518 -> t0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1240:1269 -> u
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4523:4528 -> u0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4538 -> u0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4538:4538 -> u0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4539 -> u0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4539:4540 -> u0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4537:4537 -> u0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4549 -> u0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4549:4549 -> u0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4550 -> u0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4550:4551 -> u0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4548:4548 -> u0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4556 -> u0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4556:4556 -> u0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558 -> u0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558:4558 -> u0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558 -> u0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558:4558 -> u0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4557:4559 -> u0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4555:4555 -> u0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4567 -> u0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4567:4567 -> u0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4568 -> u0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4568:4569 -> u0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4566:4566 -> u0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4532:4575 -> u0
     1:3:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1273:1275 -> v
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     4:4:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1286 -> v
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1286:1286 -> v
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1288 -> v
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1288:1288 -> v
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1289 -> v
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1289:1289 -> v
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1290 -> v
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1290:1290 -> v
     12:16:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1287:1291 -> v
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1285:1285 -> v
     18:35:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1279:1296 -> v
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4580:4585 -> v0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4595 -> v0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4595:4595 -> v0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4596 -> v0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4596:4597 -> v0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4594:4594 -> v0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4606 -> v0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4606:4606 -> v0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4607 -> v0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4607:4608 -> v0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4605:4605 -> v0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4613 -> v0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4613:4613 -> v0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615 -> v0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615:4615 -> v0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615 -> v0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615:4615 -> v0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4614:4616 -> v0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4612:4612 -> v0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4624 -> v0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4624:4624 -> v0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4625 -> v0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4625:4626 -> v0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4623:4623 -> v0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4589:4632 -> v0
     1:8:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1301:1308 -> w
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1318 -> w
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1318:1318 -> w
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1319 -> w
     12:13:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1319:1320 -> w
     14:14:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1317:1317 -> w
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     15:15:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1329 -> w
     16:16:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1329:1329 -> w
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331 -> w
     18:18:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331:1331 -> w
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     19:19:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331 -> w
     20:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331:1331 -> w
     21:23:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1330:1332 -> w
     24:24:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1328:1328 -> w
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     25:25:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1342 -> w
     26:26:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1342:1342 -> w
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     27:27:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1344 -> w
     28:28:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1344:1344 -> w
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     29:29:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1345 -> w
     30:30:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1345:1345 -> w
     31:34:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1343:1346 -> w
     35:35:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1341:1341 -> w
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     36:36:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1355 -> w
     37:37:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1355:1355 -> w
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     38:38:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1357 -> w
     39:39:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1357:1357 -> w
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     40:40:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1358 -> w
     41:41:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1358:1358 -> w
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     42:42:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359 -> w
     43:43:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359:1359 -> w
     44:48:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1356:1360 -> w
     49:49:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1354:1354 -> w
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     50:50:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1371 -> w
     51:51:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1371:1371 -> w
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     52:52:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1373 -> w
     53:53:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1373:1373 -> w
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     54:54:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1378 -> w
     55:55:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1378:1378 -> w
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     56:56:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1379 -> w
     57:58:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1379:1380 -> w
     59:64:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1377:1382 -> w
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     65:65:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1386 -> w
     66:66:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1386:1386 -> w
-    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     67:67:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1388 -> w
     68:68:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1388:1388 -> w
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     69:69:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1389 -> w
     70:70:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1389:1389 -> w
     71:74:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1387:1390 -> w
     75:75:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1385:1385 -> w
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     76:76:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1396 -> w
     77:77:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1396:1396 -> w
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     78:78:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1398 -> w
     79:79:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1398:1398 -> w
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     80:80:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1399 -> w
     81:81:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1399:1399 -> w
     82:85:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1397:1400 -> w
     86:93:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1395:1402 -> w
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     94:94:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1406 -> w
     95:95:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1406:1406 -> w
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     96:96:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1408 -> w
     97:97:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1408:1408 -> w
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     98:98:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1409 -> w
     99:99:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1409:1409 -> w
     100:103:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1407:1410 -> w
     104:104:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1405:1405 -> w
-    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     105:105:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1416 -> w
     106:106:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1416:1416 -> w
-    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     107:107:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1418 -> w
     108:108:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1418:1418 -> w
-    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     109:109:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1419 -> w
     110:110:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1419:1419 -> w
     111:114:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1417:1420 -> w
     115:123:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1415:1423 -> w
-    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     124:124:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1427 -> w
     125:125:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1427:1427 -> w
-    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     126:126:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1429 -> w
     127:127:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1429:1429 -> w
-    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     128:128:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1430 -> w
     129:129:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1430:1430 -> w
     130:133:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1428:1431 -> w
     134:134:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1426:1426 -> w
-    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     135:135:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1436 -> w
     136:136:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1436:1436 -> w
-    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     137:137:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1438 -> w
     138:138:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1438:1438 -> w
     139:141:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1437:1439 -> w
     142:142:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1435:1435 -> w
-    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     143:143:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1444 -> w
     144:144:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1444:1444 -> w
-    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     145:145:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1446 -> w
     146:146:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1446:1446 -> w
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     147:147:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1447 -> w
     148:148:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1447:1447 -> w
     149:152:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1445:1448 -> w
     153:153:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1443:1443 -> w
     154:299:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1312:1457 -> w
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4637:4642 -> w0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4652 -> w0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4652:4652 -> w0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4653 -> w0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4653:4654 -> w0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4651:4651 -> w0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4663 -> w0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4663:4663 -> w0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4664 -> w0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4664:4665 -> w0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4662:4662 -> w0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4670 -> w0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4670:4670 -> w0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672 -> w0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672:4672 -> w0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672 -> w0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672:4672 -> w0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4671:4673 -> w0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4669:4669 -> w0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4681 -> w0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4681:4681 -> w0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4682 -> w0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4682:4683 -> w0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4680:4680 -> w0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4646:4689 -> w0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1461:1490 -> x
     1:7:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4693:4699 -> x0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4709 -> x0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4709:4709 -> x0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     10:10:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4711 -> x0
     11:11:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4711:4711 -> x0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4712 -> x0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4712:4712 -> x0
     14:17:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4710:4713 -> x0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4708:4708 -> x0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4721 -> x0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4721:4721 -> x0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4722 -> x0
     22:23:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4722:4723 -> x0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4720:4720 -> x0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4734 -> x0
     26:26:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4734:4734 -> x0
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     27:27:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4736 -> x0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4736:4736 -> x0
     29:31:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4735:4737 -> x0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4733:4733 -> x0
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4739 -> x0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4739:4739 -> x0
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     35:35:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4746 -> x0
     36:36:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4746:4746 -> x0
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     37:37:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4748 -> x0
     38:38:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4748:4748 -> x0
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     39:39:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4749 -> x0
     40:40:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4749:4749 -> x0
     41:44:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4747:4750 -> x0
     45:45:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4745:4745 -> x0
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     46:46:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4752 -> x0
     47:47:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4752:4752 -> x0
     48:101:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4703:4756 -> x0
     1:16:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1494:1509 -> y
     1:5:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4760:4764 -> y0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     6:6:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4774 -> y0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4774:4774 -> y0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4775 -> y0
     9:10:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4775:4776 -> y0
     11:11:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4773:4773 -> y0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4784 -> y0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4784:4784 -> y0
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4786 -> y0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4786:4786 -> y0
     16:18:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4785:4787 -> y0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4783:4783 -> y0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4792 -> y0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4792:4792 -> y0
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4794 -> y0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4794:4794 -> y0
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4795 -> y0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4795:4795 -> y0
     26:29:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4793:4796 -> y0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4791:4791 -> y0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4803 -> y0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4803:4803 -> y0
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4805 -> y0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4805:4805 -> y0
     35:37:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4804:4806 -> y0
     38:38:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4802:4802 -> y0
     39:82:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4768:4811 -> y0
     1:3:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1513:1515 -> z
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> z
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     4:4:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1526 -> z
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1526:1526 -> z
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> z
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1528 -> z
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1528:1528 -> z
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> z
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1529 -> z
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1529:1529 -> z
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> z
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1530 -> z
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1530:1530 -> z
     12:16:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1527:1531 -> z
@@ -34986,7 +34963,7 @@
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void rewriteListOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:20 -> a
     2:5:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):35:38 -> a
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> a
+    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
     6:6: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):38 -> a
     7:9: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):39:41 -> a
     1:1:void rewriteMapOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):30:30 -> b
@@ -34999,11 +34976,11 @@
     7:8:byte[] com.android.tools.r8.utils.StreamUtils.StreamToByteArrayClose(java.io.InputStream):16:17 -> a
     9:13:boolean com.android.tools.r8.ir.optimize.ArgumentRemovalUtils.isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
     14:15:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):18:19 -> a
-    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> a
+    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
     16:16:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19 -> a
     17:18:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:21 -> a
     19:26:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:28 -> a
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):29 -> a
     28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26:26 -> a
     29:29:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -35020,32 +34997,30 @@
     34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22 -> a
     35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22:22 -> a
     36:37:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable):22:23 -> a
-    38:39:int com.android.tools.r8.utils.ListUtils.lastIndexMatching(java.util.List,java.util.function.Predicate):24:25 -> a
-    40:40:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
-    41:43:java.util.List com.android.tools.r8.utils.ListUtils.map(java.util.Collection,java.util.function.Function):33:35 -> a
-    44:46:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
-    47:47:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
-    48:48:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
-    49:49:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
-    50:57:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
-    58:64:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:67 -> a
-    65:66:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:62 -> a
-    67:76:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:70 -> a
-    77:84:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:68 -> a
-    85:87:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:63 -> a
-    88:91:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:64 -> a
-    92:97:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:66 -> a
-    98:106:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:69 -> a
-    107:130:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):83:106 -> a
-    131:131:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):105:105 -> a
-    132:144:void com.android.tools.r8.utils.ZipUtils.writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,com.android.tools.r8.ByteDataView,int):83:95 -> a
-    145:152:boolean com.android.tools.r8.utils.ZipUtils.isClassFile(java.lang.String):104:111 -> a
+    38:38:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
+    39:41:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
+    42:42:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
+    43:43:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
+    44:44:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
+    45:52:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
+    53:59:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:67 -> a
+    60:61:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:62 -> a
+    62:71:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:70 -> a
+    72:79:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:68 -> a
+    80:82:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:63 -> a
+    83:86:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:64 -> a
+    87:92:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:66 -> a
+    93:101:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:69 -> a
+    102:125:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):83:106 -> a
+    126:126:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):105:105 -> a
+    127:139:void com.android.tools.r8.utils.ZipUtils.writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,com.android.tools.r8.ByteDataView,int):83:95 -> a
+    140:147:boolean com.android.tools.r8.utils.ZipUtils.isClassFile(java.lang.String):104:111 -> 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:9:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteRequireNonNull(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):29:35 -> b
     10:11:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> b
     1:3:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19:21 -> c
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> c
+    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> c
     4:4: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):21 -> c
     5:7: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):22:24 -> c
 com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.D.d.f0.f:
@@ -35066,17 +35041,17 @@
     void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode) -> a
     1:4:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):30:33 -> a
     5:7:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):40:42 -> a
-    8:8:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    8:8:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     8:8:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):43 -> a
     9:33:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):44:68 -> a
     34:34:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):67:67 -> a
-    35:35:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    35:35:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     35:35:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):70 -> a
     36:36:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):72:72 -> a
-    37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     37:37:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):72 -> a
     38:42:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):77:81 -> a
-    43:43:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    43:43:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     43:43:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):81 -> a
     44:44:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):82:82 -> a
     45:45:boolean lambda$insertAssumeNoneInstructionsInBlock$0(com.android.tools.r8.ir.code.Instruction):80:80 -> a
@@ -35096,7 +35071,7 @@
     7:7:void markUsersForRemoval(com.android.tools.r8.ir.code.Value):61 -> a
     8:22:void removeIfMarked(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.InstructionListIterator):69:83 -> a
     23:29:void removeMarkedInstructions(java.util.Set):88:94 -> a
-    30:30:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    30:30:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     30:30:void removeMarkedInstructions(java.util.Set):95 -> a
     31:32:void removeMarkedInstructions(java.util.Set):96:97 -> a
     33:34:void finish():105:106 -> a
@@ -35132,52 +35107,59 @@
     boolean $assertionsDisabled -> d
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode mode -> c
     1:1:void <clinit>():40:40 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):58:58 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView):55:62 -> <init>
-    1:6:void logResults():67:72 -> a
-    7:7:void logResults():71:71 -> a
-    8:33:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):80:105 -> a
-    34:50:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):103:119 -> a
-    51:57:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):118:124 -> a
-    58:80:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):132:154 -> a
-    81:90:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):161:170 -> a
-    91:91:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    91:91:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):171 -> a
-    92:100:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):172:180 -> a
-    101:101:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    101:101:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):184 -> a
-    102:112:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):185:195 -> a
-    113:113:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    113:113:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):195 -> a
-    114:124:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):196:206 -> a
-    125:125:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    125:125:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207 -> a
-    126:126:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):209:209 -> a
-    127:127:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    127:127:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):209 -> a
-    128:128:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):211:211 -> a
-    129:129:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    129:129:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):210 -> a
-    130:143:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):212:225 -> a
-    144:144:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    144:144:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):226 -> a
-    145:151:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):227:233 -> a
-    152:152:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    152:152:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):233 -> a
-    153:153:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):233:233 -> a
-    154:155:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241:242 -> a
-    156:156:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    156:156:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):243 -> a
-    157:166:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):243:252 -> a
-    167:167:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    167:167:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):243 -> a
-    168:178:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):256:266 -> a
-    179:186:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):265:272 -> a
-    187:187:java.lang.Object lambda$revisitMethods$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):268:268 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView):58:65 -> <init>
+    1:6:void logResults():70:75 -> a
+    7:7:void logResults():74:74 -> a
+    8:20:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):83:95 -> a
+    21:21:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1124:1124 -> a
+    21:21:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):96 -> a
+    22:31:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):97:106 -> a
+    32:32:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1124:1124 -> a
+    32:32:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106 -> a
+    33:33:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):108:108 -> a
+    34:50:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106:122 -> a
+    51:57:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):121:127 -> a
+    58:75:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):135:152 -> a
+    76:85:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):159:168 -> a
+    86:86:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    86:86:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):169 -> a
+    87:95:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):170:178 -> a
+    96:96:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    96:96:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):182 -> a
+    97:107:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):183:193 -> a
+    108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    108:108:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):193 -> a
+    109:119:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):194:204 -> a
+    120:120:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    120:120:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):205 -> a
+    121:121:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207:207 -> a
+    122:122:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    122:122:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207 -> a
+    123:123:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):209:209 -> a
+    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    124:124:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):208 -> a
+    125:138:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):210:223 -> a
+    139:139:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    139:139:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):224 -> a
+    140:146:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):225:231 -> a
+    147:147:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    147:147:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):231 -> a
+    148:148:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):231:231 -> a
+    149:150:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):239:240 -> a
+    151:151:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    151:151:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241 -> a
+    152:161:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241:250 -> a
+    162:162:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    162:162:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241 -> a
+    163:174:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):254:265 -> a
+    175:183:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):264:272 -> a
+    184:184:java.lang.Object lambda$revisitMethods$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):267:267 -> a
 com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode -> com.android.tools.r8.D.e.e:
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode COLLECT -> a
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode REVISIT -> b
-    1:3:void <clinit>():48:50 -> <clinit>
+    com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode FINISH -> c
+    1:5:void <clinit>():48:52 -> <clinit>
     1:1:void <init>(java.lang.String,int):47:47 -> <init>
 com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.D.e.h:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
@@ -35185,844 +35167,799 @@
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction waveDoneAction -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-    1:1:void <clinit>():61:61 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):100:100 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):98:103 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization):61:61 -> a
-    2:33:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):107:138 -> a
-    34:51:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):259:276 -> a
-    34:51:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    52:52:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
-    52:52:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    53:54:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282:283 -> a
-    53:54:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    55:61:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):287:293 -> a
-    55:61:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    55:61:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
+    1:1:void <clinit>():60:60 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):99:99 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):97:102 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization):60:60 -> a
+    2:33:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):106:137 -> a
+    34:51:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):258:275 -> a
+    34:51:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    52:52:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):281 -> a
+    52:52:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    53:54:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):281:282 -> a
+    53:54:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    55:61:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):286:292 -> a
+    55:61:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    55:61:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     62:62:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
-    62:62:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):293 -> a
-    62:62:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    62:62:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    63:92:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):294:323 -> a
-    63:92:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    63:92:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
+    62:62:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):292 -> a
+    62:62:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    62:62:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    63:92:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):293:322 -> a
+    63:92:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    63:92:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     93:93:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    93:93:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):323 -> a
-    93:93:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    93:93:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    94:94:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):323:323 -> a
-    94:94:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    94:94:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
+    93:93:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):322 -> a
+    93:93:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    93:93:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    94:94:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):322:322 -> a
+    94:94:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    94:94:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     95:95: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
-    95:95:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):323 -> a
-    95:95:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    95:95:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    96:98:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):323:325 -> a
-    96:98:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    96:98:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    99:99:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:138 -> a
-    100:100:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:325 -> a
-    100:100:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    100:100:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    101:109:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:147 -> a
+    95:95:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):322 -> a
+    95:95:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    95:95:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    96:98:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):322:324 -> a
+    96:98:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    96:98:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    99:99:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137:137 -> a
+    100:100:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):324:324 -> a
+    100:100:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    100:100:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    101:109:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:146 -> a
     110:110:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():72:72 -> a
-    110:110:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):148 -> a
-    111:127:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):148:164 -> a
-    128:160:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):140:172 -> a
-    161:161:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
-    161:161:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):176 -> a
-    162:188:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):177:203 -> a
-    189:189:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
-    189:189:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):204 -> a
-    190:190:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):204:204 -> a
-    191:191:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):95:95 -> a
-    191:191:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):204 -> a
-    192:231:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):210:249 -> a
+    110:110:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147 -> a
+    111:127:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147:163 -> a
+    128:160:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:171 -> a
+    161:161:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    161:161:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
+    162:188:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):176:202 -> a
+    189:189:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    189:189:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
+    190:190:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:203 -> a
+    191:191:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):84:84 -> a
+    191:191:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
+    192:231:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):209:248 -> a
     232:232:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    232:232:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):212 -> a
-    233:236:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):251:254 -> a
-    237:237:com.android.tools.r8.graph.DexField lambda$optimize$0(com.android.tools.r8.graph.DexEncodedField):222:222 -> a
-    238:239:void lambda$optimize$1():243:244 -> a
-    240:240:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):331:331 -> a
-    241:241:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    241:241:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):333 -> a
-    242:242:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    242:242:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):334 -> a
-    243:364:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):335:456 -> a
-    365:472:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):349:456 -> a
-    473:571:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):358:456 -> a
-    572:574:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):365:367 -> a
-    575:576:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):445:446 -> a
-    575:576:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):368 -> a
-    577:577:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):369:369 -> a
-    578:582:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():818:822 -> a
-    578:582:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):374 -> a
-    583:601:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):377:395 -> a
-    602:605:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):490:493 -> a
-    602:605:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):402 -> a
-    606:606:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    606:606:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):493 -> a
-    606:606:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):402 -> a
-    607:610:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):494:497 -> a
-    607:610:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):402 -> a
-    611:618:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):404:411 -> a
-    619:619:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    619:619:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):411 -> a
-    620:629:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):412:421 -> a
-    630:630:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    630:630:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):493 -> a
-    630:630:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):402 -> a
-    631:663:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):424:456 -> a
-    664:694:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):426:456 -> a
-    695:719:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):432:456 -> a
-    720:727:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):451:458 -> a
-    728:728:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):456:456 -> a
-    729:729:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$2(com.android.tools.r8.graph.DexField):420:420 -> a
-    730:731:java.util.Collection validateFinalFieldPuts(java.util.Map,java.util.Map):483:484 -> a
-    732:740:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):501:509 -> a
+    232:232:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):211 -> a
+    233:236:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):250:253 -> a
+    237:237:com.android.tools.r8.graph.DexField lambda$optimize$0(com.android.tools.r8.graph.DexEncodedField):221:221 -> a
+    238:239:void lambda$optimize$1():242:243 -> a
+    240:240:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$2(com.android.tools.r8.graph.DexField):417:417 -> a
+    241:242:java.util.Collection validateFinalFieldPuts(java.util.Map,java.util.Map):480:481 -> a
+    243:251:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):498:506 -> a
+    252:252:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    252:252:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):330 -> a
+    253:253:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    253:253:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):331 -> a
+    254:375:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):332:453 -> a
+    376:483:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):346:453 -> a
+    484:582:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):355:453 -> a
+    583:585:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):362:364 -> a
+    586:587:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):445:446 -> a
+    586:587:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):365 -> a
+    588:588:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):366:366 -> a
+    589:593:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():819:823 -> a
+    589:593:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):371 -> a
+    594:612:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):374:392 -> a
+    613:616:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):487:490 -> a
+    613:616:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
+    617:617:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    617:617:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):490 -> a
+    617:617:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
+    618:621:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):491:494 -> a
+    618:621:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
+    622:629:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):401:408 -> a
+    630:630:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    630:630:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):408 -> a
+    631:640:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):409:418 -> a
+    641:641:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    641:641:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):490 -> a
+    641:641:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
+    642:674:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):421:453 -> a
+    675:705:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):423:453 -> a
+    706:730:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):429:453 -> a
+    731:738:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):448:455 -> a
+    739:739:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):453:453 -> a
 com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.D.e.g:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization this$0 -> c
     java.util.Set noLongerWrittenFields -> b
-    1:3:void <init>(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization,java.util.Map,java.util.Set):70:72 -> <init>
-    1:2:void join(java.util.Map,java.util.Set):78:79 -> a
-    3:5:void execute():85:87 -> a
-    6:10:void execute():86:90 -> a
+    1:3:void <init>(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization,java.util.Map,java.util.Set):69:71 -> <init>
+    1:2:void join(java.util.Map,java.util.Set):77:78 -> a
+    3:5:void execute():84:86 -> a
+    6:10:void execute():85:89 -> a
     11:11:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    11:11:void execute():85 -> a
+    11:11:void execute():84 -> a
 com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.D.e.r:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.InternalOptions options -> d
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
-    1:1:void <clinit>():134:134 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):153:157 -> <init>
+    1:1:void <clinit>():131:131 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):150:154 -> <init>
     boolean lambda$computeConstantArrayValues$9(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):231:231 -> a
-    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):315:338 -> a
-    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):405:405 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1278:1278 -> a
-    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):405 -> a
-    28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():629:630 -> a
-    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):405 -> a
-    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):412:423 -> a
-    42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):423 -> a
+    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):228:228 -> a
+    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):312:335 -> a
+    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402:402 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1273:1273 -> a
+    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402 -> a
+    28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():625:626 -> a
+    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402 -> a
+    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):409:420 -> a
+    42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):420 -> a
     43:43:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode,int):126:126 -> a
-    43:43:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):424 -> a
-    44:49:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):426:431 -> a
-    50:86: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):583:619 -> a
-    87:87:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):447:447 -> a
-    87:87: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):620 -> a
-    88:102: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):621:635 -> a
-    103:103:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):447:447 -> a
-    103:103: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):636 -> a
-    104:113: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):637:646 -> a
-    114:127: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):696:709 -> a
-    128:128: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):706:706 -> a
-    129:140:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):719:730 -> a
-    141:148:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):735:742 -> a
-    149:149:int codeUnitMargin():749:749 -> a
-    150:150:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):911:911 -> a
-    151:151:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1088:1088 -> a
-    152:152:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1152:1152 -> a
+    43:43:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):421 -> a
+    44:49:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):423:428 -> a
+    50:86: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):580:616 -> a
+    87:87:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):444:444 -> a
+    87:87: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):617 -> a
+    88:102: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):618:632 -> a
+    103:103:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):444:444 -> a
+    103:103: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):633 -> a
+    104:113: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):634:643 -> a
+    114:127: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):693:706 -> a
+    128:128: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):703:703 -> a
+    129:140:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):716:727 -> a
+    141:148:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):732:739 -> a
+    149:149:int codeUnitMargin():746:746 -> a
+    150:150:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):908:908 -> a
+    151:151:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1082:1082 -> a
+    152:152:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1146:1146 -> a
     153:153:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    153:153:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1151 -> a
-    154:160:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1162:1168 -> a
-    154:160:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1155 -> a
-    161:161:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1155:1155 -> a
+    153:153:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1145 -> a
+    154:160:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1156:1162 -> a
+    154:160:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1149 -> a
+    161:161:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1149:1149 -> a
     162:162:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    162:162:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1154 -> a
-    163:165:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1156:1158 -> a
-    166:179:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1312:1325 -> a
-    180:180:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
-    180:180:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330 -> a
-    181:185:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1331:1335 -> a
-    186:186:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
-    186:186:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1336 -> a
-    187:199:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1336:1348 -> a
-    200:200:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
-    200:200:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1347 -> a
-    201:201:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1346:1346 -> a
-    202:209:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1491:1498 -> a
+    162:162:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1148 -> a
+    163:165:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1150:1152 -> a
+    166:179:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1306:1319 -> a
+    180:180:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    180:180:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1324 -> a
+    181:185:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1325:1329 -> a
+    186:186:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    186:186:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330 -> a
+    187:199:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330:1342 -> a
+    200:200:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    200:200:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1341 -> a
+    201:201:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1340:1340 -> a
+    202:209:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1482:1489 -> a
     210:210:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    210:210:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1498 -> a
-    211:211:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    211:211:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1499 -> a
-    212:212:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1501:1501 -> a
+    210:210:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1489 -> a
+    211:211:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    211:211:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1490 -> a
+    212:212:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1492:1492 -> a
     213:213:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    213:213:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1502 -> a
-    214:215:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1503:1504 -> a
+    213:213:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1493 -> a
+    214:215:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1494:1495 -> a
     216:216:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    216:216:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1504 -> a
-    217:234:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1505:1522 -> a
-    235:254:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1521:1540 -> a
-    255:255:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    255:255:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1541 -> a
-    256:257:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1542:1543 -> a
-    258:258:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    258:258:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1544 -> a
-    259:272:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1545:1558 -> a
-    273:273:boolean lambda$removeInstanceOfInstructionIfTrivial$3(com.android.tools.r8.ir.code.Value):1533:1533 -> a
-    274:279:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1565:1570 -> a
-    280:290: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):1575:1585 -> a
-    291:292:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1751:1752 -> a
-    293:294:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1815:1816 -> a
-    295:295:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    295:295:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1817 -> a
-    296:318:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1818:1840 -> a
-    319:319:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    319:319:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1841 -> a
-    320:333:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1842:1855 -> a
-    334:334:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    334:334:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1860 -> a
-    335:378:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1864:1907 -> a
-    379:389:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1912:1922 -> a
-    390:390:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    390:390:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1922 -> a
-    391:391:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1923:1923 -> a
-    392:392:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    392:392:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1924 -> a
-    393:395:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1918:1920 -> a
-    396:396:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1239:1239 -> a
-    396:396:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1921 -> a
-    397:397:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1921:1921 -> a
-    398:445:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):1959:2006 -> a
-    446:451:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2334:2339 -> a
-    452:452:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2355:2355 -> a
-    453:459:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2343:2349 -> a
-    453:459:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2356 -> a
-    460:462:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2358:2360 -> a
-    463:463:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
-    463:463:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2360 -> a
-    464:470:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2361:2367 -> a
-    471:471:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    471:471:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2368 -> a
-    472:477:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2369:2374 -> a
-    478:487:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2321:2330 -> a
-    478:487:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2375 -> a
-    488:503:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2376:2391 -> a
-    504:505: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):2541:2542 -> a
-    506:506:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2707:2707 -> a
-    507:507:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> a
-    507:507:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2707 -> a
-    508:509:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2707:2708 -> a
-    510:537:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2718:2745 -> a
-    538:538:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> a
-    538:538:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2749 -> a
-    539:553:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2764:2778 -> a
-    554:579:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):2952:2977 -> a
-    580:584: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):2988:2992 -> a
-    585:605:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3149:3169 -> a
-    606:606:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
-    606:606:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3169 -> a
-    607:623:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3169:3185 -> a
-    624:624:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    624:624:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3184 -> a
-    625:625:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    625:625:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3183 -> a
-    626:637:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3183:3194 -> a
-    638:660:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3205:3227 -> a
-    661:661: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
-    661:661:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3227 -> a
-    662:662:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3228:3228 -> a
-    663:697: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):3265:3299 -> a
-    663:697:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3232 -> a
-    698:704:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3233:3239 -> a
-    705:705:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    705:705:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3240 -> a
-    706:720:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3241:3255 -> a
-    721:721: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
-    721:721:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3255 -> a
-    722:726:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3310:3314 -> a
-    727:727: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
-    727:727:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3314 -> a
-    728:732:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3315:3319 -> a
-    733:733:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3372:3372 -> a
-    734:743:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3378:3387 -> a
-    734:743:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    744:744:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3384:3384 -> a
-    744:744:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    745:745:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    745:745:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3384 -> a
-    745:745:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    746:746:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3384:3384 -> a
-    746:746:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    747:748: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):3393:3394 -> a
-    749:749:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    749:749: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):3395 -> a
-    750:750: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):3397:3397 -> a
-    751:751:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    751:751: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):3397 -> a
-    752:753: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):3397:3398 -> a
-    754:763:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3408:3417 -> a
-    764:764:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    764:764:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3418 -> a
-    765:765:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
-    765:765:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3419 -> a
-    766:766:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    766:766:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3420 -> a
-    767:768:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3423:3424 -> a
-    769:769:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    769:769:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3424 -> a
-    770:770:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3425:3425 -> a
-    771:771:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    771:771:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3425 -> a
-    772:772:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3428:3428 -> a
-    773:773:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    773:773:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3428 -> a
-    774:774:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    774:774:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3427 -> a
-    775:776:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3430:3431 -> a
-    777:777:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> a
-    777:777:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3431 -> a
-    778:778:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3432:3432 -> a
-    779:779:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> a
-    779:779:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3432 -> a
-    780:780:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3434:3434 -> a
-    781:781:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1262:1262 -> a
-    781:781:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3436 -> a
-    782:782:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3436:3436 -> a
-    783:783:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    783:783:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3434 -> a
-    784:785:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3438:3439 -> a
-    786:786:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    786:786:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3439 -> a
-    787:788:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3441:3442 -> a
-    789:789:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    789:789:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3442 -> a
-    790:798:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3444:3452 -> a
-    799:799:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    799:799:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3452 -> a
-    800:819:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3453:3472 -> a
-    820:823:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
-    820:823:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3472 -> a
-    824:843:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3473:3492 -> a
-    844:844:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    844:844:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3492 -> a
-    845:847:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3493:3495 -> a
-    848:848:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    848:848:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3495 -> a
-    849:850:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3496:3497 -> a
-    851:851:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    851:851:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3496 -> a
-    852:852:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3498:3498 -> a
-    853:853:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    853:853:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3498 -> a
-    854:857:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3501:3504 -> a
-    858:858:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    858:858:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3504 -> a
-    859:859:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3506:3506 -> a
-    860:860:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    860:860:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3506 -> a
-    861:861:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3511:3511 -> a
-    862:869:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3515:3522 -> a
-    870:880:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3535:3545 -> a
-    870:880:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    881:881:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3523:3523 -> a
-    882:907:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3568:3593 -> a
-    882:907:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3523 -> a
-    908:912:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3524:3528 -> a
-    913:913:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3525:3525 -> a
+    216:216:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1495 -> a
+    217:234:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1496:1513 -> a
+    235:250:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1512:1527 -> a
+    251:251:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    251:251:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1528 -> a
+    252:253:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1529:1530 -> a
+    254:254:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    254:254:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1531 -> a
+    255:268:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1532:1545 -> a
+    269:269:boolean lambda$removeInstanceOfInstructionIfTrivial$3(com.android.tools.r8.ir.code.Value):1524:1524 -> a
+    270:275:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1552:1557 -> a
+    276:286: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):1562:1572 -> a
+    287:288:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1738:1739 -> a
+    289:290:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1802:1803 -> a
+    291:291:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    291:291:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1804 -> a
+    292:314:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1805:1827 -> a
+    315:315:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    315:315:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1828 -> a
+    316:329:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1829:1842 -> a
+    330:330:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    330:330:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1847 -> a
+    331:374:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1851:1894 -> a
+    375:385:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1899:1909 -> a
+    386:386:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    386:386:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1909 -> a
+    387:387:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1910:1910 -> a
+    388:388:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    388:388:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1911 -> a
+    389:391:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1905:1907 -> a
+    392:392:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1234:1234 -> a
+    392:392:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1908 -> a
+    393:393:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1908:1908 -> a
+    394:441:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):1946:1993 -> a
+    442:447:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2321:2326 -> a
+    448:448:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2342:2342 -> a
+    449:455:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2330:2336 -> a
+    449:455:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2343 -> a
+    456:458:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2345:2347 -> a
+    459:459:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
+    459:459:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2347 -> a
+    460:466:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2348:2354 -> a
+    467:467:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    467:467:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2355 -> a
+    468:473:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2356:2361 -> a
+    474:483:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2308:2317 -> a
+    474:483:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2362 -> a
+    484:499:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2363:2378 -> a
+    500:501: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):2509:2510 -> a
+    502:502:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675:2675 -> a
+    503:503:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> a
+    503:503:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675 -> a
+    504:505:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675:2676 -> a
+    506:533:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2686:2713 -> a
+    534:534:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> a
+    534:534:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2717 -> a
+    535:549:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2732:2746 -> a
+    550:575:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):2920:2945 -> a
+    576:580: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):2956:2960 -> a
+    581:601:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3117:3137 -> a
+    602:602: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):40:40 -> a
+    602:602:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3137 -> a
+    603:619:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3137:3153 -> a
+    620:620:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    620:620:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3152 -> a
+    621:621:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    621:621:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3151 -> a
+    622:633:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3151:3162 -> a
+    634:656:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3173:3195 -> a
+    657:657: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
+    657:657:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3195 -> a
+    658:658:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3196:3196 -> a
+    659:693: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):3233:3267 -> a
+    659:693:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3200 -> a
+    694:700:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3201:3207 -> a
+    701:701:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    701:701:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3208 -> a
+    702:716:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3209:3223 -> a
+    717:717: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
+    717:717:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3223 -> a
+    718:722:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3278:3282 -> a
+    723:723: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
+    723:723:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3282 -> a
+    724:728:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3283:3287 -> a
+    729:729:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3340:3340 -> a
+    730:739:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3346:3355 -> a
+    730:739:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    740:740:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352:3352 -> a
+    740:740:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    741:741:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    741:741:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352 -> a
+    741:741:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    742:742:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352:3352 -> a
+    742:742:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    743:744: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):3361:3362 -> a
+    745:745:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    745:745: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):3363 -> a
+    746:746: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):3365:3365 -> a
+    747:747:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    747:747: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):3365 -> a
+    748:749: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):3365:3366 -> a
+    750:759:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3376:3385 -> a
+    760:760:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    760:760:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3386 -> a
+    761:761:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    761:761:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3387 -> a
+    762:762:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    762:762:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3388 -> a
+    763:764:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3391:3392 -> a
+    765:765:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    765:765:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3392 -> a
+    766:766:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3393:3393 -> a
+    767:767:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    767:767:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3393 -> a
+    768:768:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3396:3396 -> a
+    769:769:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    769:769:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3396 -> a
+    770:770:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    770:770:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3395 -> a
+    771:772:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3398:3399 -> a
+    773:773:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    773:773:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3399 -> a
+    774:774:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3400:3400 -> a
+    775:775:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    775:775:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3400 -> a
+    776:776:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3402:3402 -> a
+    777:777:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
+    777:777:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3404 -> a
+    778:778:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3404:3404 -> a
+    779:779:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    779:779:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3402 -> a
+    780:781:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3406:3407 -> a
+    782:782:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    782:782:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3407 -> a
+    783:784:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3409:3410 -> a
+    785:785:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    785:785:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3410 -> a
+    786:794:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3412:3420 -> a
+    795:795:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    795:795:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3420 -> a
+    796:815:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3421:3440 -> a
+    816:819:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
+    816:819:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3440 -> a
+    820:839:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3441:3460 -> a
+    840:840:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    840:840:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3460 -> a
+    841:843:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3461:3463 -> a
+    844:844:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    844:844:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3463 -> a
+    845:846:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3464:3465 -> a
+    847:847:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    847:847:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3464 -> a
+    848:848:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3466:3466 -> a
+    849:849:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    849:849:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3466 -> a
+    850:853:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3469:3472 -> a
+    854:854:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    854:854:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3472 -> a
+    855:855:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3474:3474 -> a
+    856:856:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    856:856:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3474 -> a
+    857:857:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3479:3479 -> a
+    858:865:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3483:3490 -> a
+    866:876:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3503:3513 -> a
+    866:876:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    877:877:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3491:3491 -> a
+    878:903:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3536:3561 -> a
+    878:903:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3491 -> a
+    904:908:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3492:3496 -> a
+    909:909:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493:3493 -> a
+    910:910:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    910:910:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493 -> a
+    911:911:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    911:911:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    911:911:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493 -> a
+    912:912:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493:3493 -> a
+    913:913:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511:3511 -> a
+    913:913:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
     914:914:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    914:914:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3525 -> a
+    914:914:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511 -> a
+    914:914:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
     915:915:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     915:915:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    915:915:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3525 -> a
-    916:916:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3525:3525 -> a
-    917:917:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3543:3543 -> a
-    917:917:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
+    915:915:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511 -> a
+    915:915:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    916:916:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511:3511 -> a
+    916:916:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    917:917:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507:3507 -> a
+    917:917:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
     918:918:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    918:918:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3543 -> a
-    918:918:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
+    918:918:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507 -> a
+    918:918:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
     919:919:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     919:919:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    919:919:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3543 -> a
-    919:919:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    920:920:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3543:3543 -> a
-    920:920:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    921:921:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3539:3539 -> a
-    921:921:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    922:922:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    922:922:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3539 -> a
-    922:922:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    923:923:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    923:923:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    923:923:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3539 -> a
-    923:923:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    924:924:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3539:3539 -> a
-    924:924:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    925:931:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3549:3555 -> a
-    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):303:304 -> b
-    3:12:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):343:352 -> b
-    13:13:boolean lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.ConstInstruction):1760:1760 -> b
-    14:25:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2789:2800 -> b
-    26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> b
-    26:26:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2801 -> b
-    27:45:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2802:2820 -> b
-    46:46:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> b
-    46:46:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2828 -> b
-    47:53:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2829:2835 -> b
-    54:55:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1059:1060 -> b
-    54:55:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2835 -> b
-    56:57:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2836:2837 -> b
-    58:58:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> b
-    58:58:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2837 -> b
-    59:59:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2840:2840 -> b
-    60:60:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> b
-    60:60:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2841 -> b
-    61:62:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2842:2843 -> b
+    919:919:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507 -> a
+    919:919:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    920:920:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507:3507 -> a
+    920:920:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    921:927:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3517:3523 -> a
+    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):300:301 -> b
+    3:12:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):340:349 -> b
+    13:13:boolean lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.ConstInstruction):1747:1747 -> b
+    14:25:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2757:2768 -> b
+    26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> b
+    26:26:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2769 -> b
+    27:45:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2770:2788 -> b
+    46:46:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> b
+    46:46:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2796 -> b
+    47:53:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2797:2803 -> b
+    54:55:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1056 -> b
+    54:55:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2803 -> b
+    56:57:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2804:2805 -> b
+    58:58:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
+    58:58:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2805 -> b
+    59:59:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2808:2808 -> b
+    60:60:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> b
+    60:60:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2809 -> b
+    61:62:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2810:2811 -> b
     63:63:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> b
-    63:63:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2808 -> b
-    64:65:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2846:2847 -> b
-    66:66:boolean lambda$logArgumentTypes$12(com.android.tools.r8.ir.code.Instruction):3417:3417 -> b
-    67:69:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3656:3658 -> b
-    70:70:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3656:3656 -> b
-    1:4:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1673:1676 -> c
-    5:13:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1691:1699 -> c
-    5:13:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
+    63:63:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2776 -> b
+    64:65:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2814:2815 -> b
+    66:66:boolean lambda$logArgumentTypes$12(com.android.tools.r8.ir.code.Instruction):3385:3385 -> b
+    67:69:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3624:3626 -> b
+    70:70:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3624:3624 -> b
+    1:4:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1660:1663 -> c
+    5:13:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1678:1686 -> c
+    5:13:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
     14:14:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
-    14:14:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1699 -> c
-    14:14:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
-    15:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1699:1701 -> c
-    15:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
-    18:25:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1722:1729 -> c
-    18:25:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1702 -> c
-    18:25:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
-    26:27:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1707:1708 -> c
-    26:27:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
-    28:28:java.util.List lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):1901:1901 -> c
-    29:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2567:2617 -> c
-    80:80:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> c
-    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2618 -> c
-    81:90:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2620:2629 -> c
-    91:91:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2628:2628 -> c
-    92:92:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> c
-    92:92:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2635 -> c
-    93:93:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2638:2638 -> c
-    94:107:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2637:2650 -> c
-    108:108:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2649:2649 -> c
-    109:109:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> c
-    109:109:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2656 -> c
-    110:110:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2659:2659 -> c
-    111:130:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2658:2677 -> c
-    1:1:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):170:170 -> d
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> d
-    2:2:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):172 -> d
-    3:25:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):174:196 -> d
-    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> d
-    26:26:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):208 -> d
-    27:28:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):211:212 -> d
+    14:14:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1686 -> c
+    14:14:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    15:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1686:1688 -> c
+    15:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    18:25:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1709:1716 -> c
+    18:25:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1689 -> c
+    18:25:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    26:27:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1694:1695 -> c
+    26:27:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    28:28:java.util.List lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):1888:1888 -> c
+    29:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2535:2585 -> c
+    80:80:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2586 -> c
+    81:90:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2588:2597 -> c
+    91:91:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2596:2596 -> c
+    92:92:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    92:92:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2603 -> c
+    93:93:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2606:2606 -> c
+    94:107:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2605:2618 -> c
+    108:108:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2617:2617 -> c
+    109:109:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    109:109:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2624 -> c
+    110:110:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2627:2627 -> c
+    111:130:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2626:2645 -> c
+    1:1:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):167:167 -> d
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> d
+    2:2:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):169 -> d
+    3:25:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):171:193 -> d
+    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1089:1089 -> d
+    26:26:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):205 -> d
+    27:28:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):208:209 -> d
     29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> d
-    29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):212 -> d
-    30:33:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):212:215 -> d
-    1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1055:1060 -> e
+    29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):209 -> d
+    30:33:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):209:212 -> d
+    1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1049:1054 -> e
     7:45:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):63:101 -> e
-    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1060 -> e
-    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1062:1069 -> e
+    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1054 -> e
+    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1056:1063 -> e
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> e
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> e
-    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1069 -> e
-    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1070:1081 -> e
+    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1063 -> e
+    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1064:1075 -> e
     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):282:282 -> e
-    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1083 -> e
-    68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1086:1094 -> e
+    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1077 -> e
+    68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1080:1088 -> e
     77:77:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> e
-    77:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1060 -> e
-    1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1360:1386 -> f
+    77:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1054 -> e
+    1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1354:1380 -> f
     28:28:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> f
-    28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1386 -> f
-    29:29:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1387:1387 -> f
-    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> f
-    30:30:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1388 -> f
-    31:36:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1390:1395 -> f
-    37: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):1427:1440 -> f
-    37:50:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    51:51:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtCheckCastVerifierBug():1406:1406 -> f
-    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):1440 -> f
-    51:51:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    52:54: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):1441:1443 -> f
-    52:54:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
+    28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1380 -> f
+    29:29:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1381:1381 -> f
+    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> f
+    30:30:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1382 -> f
+    31:36:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1384:1389 -> f
+    37: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):1418:1431 -> f
+    37:50:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    51:51:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtCheckCastVerifierBug():1401:1401 -> f
+    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):1431 -> f
+    51:51:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    52:54: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):1432:1434 -> f
+    52:54:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     55:55:boolean com.android.tools.r8.graph.DexType.isFloatType():216:216 -> f
-    55:55: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):1443 -> f
-    55:55:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    56:63: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):1444:1451 -> f
-    56:63:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
+    55:55: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):1434 -> f
+    55:55:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    56:63: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):1435:1442 -> f
+    56:63:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     64:64:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> f
-    64:64: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):1451 -> f
-    64:64:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    65:93: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):1453:1481 -> f
-    65:93:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
+    64:64:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1442 -> f
+    64:64:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    65:93: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):1444:1472 -> f
+    65:93:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     94:94:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> f
-    94:94: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):1481 -> f
-    94:94:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    95:97: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):1481:1483 -> f
-    95:97:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    98:106:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1396:1404 -> f
-    107:107:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> f
-    107:107:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1416 -> f
-    108:112:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1417:1421 -> f
-    1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3043:3043 -> g
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> g
-    2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3047 -> g
-    3:18:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3048:3063 -> g
-    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> g
-    19:19:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3063 -> g
-    20:61:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3064:3105 -> g
-    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> g
-    62:62:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3063 -> g
-    63:63:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3110:3110 -> g
-    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> h
-    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3114 -> h
-    2:13:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3115:3126 -> h
-    14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> h
-    14:14:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3126 -> h
-    15:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3127:3139 -> h
-    28:28:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> h
-    28:28:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3140 -> h
-    29:29:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3141:3141 -> h
-    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> h
-    30:30:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3126 -> h
-    31:31:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3145:3145 -> h
-    1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1173:1173 -> i
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> i
-    2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1173 -> i
-    3:14:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1176:1187 -> i
-    15:15:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> i
-    15:15:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1188 -> i
-    16:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1189:1209 -> i
-    37:72:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1208:1243 -> i
+    94:94: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):1472 -> f
+    94:94:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    95:97: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):1472:1474 -> f
+    95:97:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    98:120:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1390:1412 -> f
+    1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3011:3011 -> g
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> g
+    2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3015 -> g
+    3:18:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3016:3031 -> g
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> g
+    19:19:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3031 -> g
+    20:61:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3032:3073 -> g
+    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> g
+    62:62:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3031 -> g
+    63:63:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3078:3078 -> g
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> h
+    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3082 -> h
+    2:13:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3083:3094 -> h
+    14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> h
+    14:14:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3094 -> h
+    15:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3095:3107 -> h
+    28:28:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> h
+    28:28:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3108 -> h
+    29:29:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3109:3109 -> h
+    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> h
+    30:30:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3094 -> h
+    31:31:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3113:3113 -> h
+    1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1167:1167 -> i
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> i
+    2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1167 -> i
+    3:14:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1170:1181 -> i
+    15:15:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> i
+    15:15:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1182 -> i
+    16:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1183:1203 -> i
+    37:72:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1202:1237 -> i
     73:73:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> i
-    73:73:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1226 -> i
-    74:76:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1252:1254 -> i
-    77:77:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):479:479 -> i
-    77:77:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1255 -> i
-    78:78:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> i
-    78:78:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256 -> i
-    79:80:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1257:1258 -> i
-    81:81:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> i
-    81:81:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1259 -> i
-    82:83:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1261:1262 -> i
-    84:84:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> i
-    84:84:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1262 -> i
-    85:87:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1262:1264 -> i
-    1:3:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):242:244 -> j
-    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> j
-    4:4:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):245 -> j
-    5:10:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):248:253 -> j
-    11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> j
-    11:11:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):254 -> j
-    12:19:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):258:265 -> j
-    20:20:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> j
-    20:20:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):266 -> j
-    21:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):269:283 -> j
-    36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> j
-    36:36:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):284 -> j
-    37:37:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):285:285 -> j
-    38:38:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> j
-    38:38:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):286 -> j
-    39:39:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):287:287 -> j
-    40:40:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> j
-    40:40:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):289 -> j
-    41:41:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> j
-    41:41:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):290 -> j
-    42:42:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):299:299 -> j
-    1:5:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3329:3333 -> k
-    6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> k
-    6:6:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3334 -> k
-    7:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3335:3345 -> k
-    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> k
-    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3352 -> k
-    19:20:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3353:3354 -> k
-    21:21:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> k
-    21:21:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3355 -> k
-    22:22:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> k
-    22:22:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3356 -> k
-    23:23:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> k
-    23:23:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3359 -> k
-    24:32:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3360:3368 -> k
-    1:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1737:1791 -> l
-    56:56:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> l
-    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1791 -> l
-    57:57:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> l
-    57:57:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1792 -> l
-    58:60:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1793:1795 -> l
-    61:87:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1780:1806 -> l
-    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2036:2036 -> m
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> m
-    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2036 -> m
-    3:9:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2039:2045 -> m
-    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> m
-    10:10:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2046 -> m
-    11:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2047:2047 -> m
-    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2012:2028 -> m
-    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2048 -> m
-    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2051:2067 -> m
-    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2066:2083 -> m
-    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):1932:1948 -> m
-    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2084 -> m
-    81:87:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2088:2094 -> m
-    88:88:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> m
-    88:88:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2095 -> m
-    89:99:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2096:2106 -> m
-    100:100:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> m
-    100:100:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2107 -> m
-    101:115:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2108:2122 -> m
-    116:116:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> m
-    116:116:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2123 -> m
-    117:122:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2129:2134 -> m
-    1:1:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2395:2395 -> n
-    2:7:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401:2406 -> n
-    2:7:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    8:24:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3022:3038 -> n
-    8:24:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2407 -> n
-    8:24:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    25:36:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2996:3007 -> n
-    25:36:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    25:36:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    37:50:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> n
-    37:50:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    37:50:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    37:50:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    51:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> n
-    51:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    51:51:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    51:51:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> n
-    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    52:52:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    52:52:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> n
-    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    53:53:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    53:53:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    54:54:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> n
-    54:54:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    54:54:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    54:54:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    55:63:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007:3015 -> n
-    55:63:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    55:63:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    64:66:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2881:2883 -> n
-    64:66:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    64:66:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    67:67:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> n
-    67:67:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2883 -> n
-    67:67:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    67:67:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    68:102:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2884:2918 -> n
-    68:102:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    68:102:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    103:103:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> n
-    103:103:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2919 -> n
-    103:103:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    103:103:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    104:125:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2921:2942 -> n
-    104:125:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    104:125:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    126:149:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2415:2438 -> n
-    126:149:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    150:150:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    150:150:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2439 -> n
-    150:150:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    151:165:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2442:2456 -> n
-    151:165:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    166:166:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    166:166:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2457 -> n
-    166:166:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    167:167:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2448:2448 -> n
-    167:167:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    168:168:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    168:168:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2449 -> n
-    168:168:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    169:179:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2464:2474 -> n
-    169:179:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    180:180:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    180:180:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2475 -> n
-    180:180:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    181:196:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2478:2493 -> n
-    181:196:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    197:197:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    197:197:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2494 -> n
-    197:197:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    198:198:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2484:2484 -> n
-    198:198:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    199:199:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    199:199:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2485 -> n
-    199:199:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    200:204:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2504:2508 -> n
-    200:204:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    205:205:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    205:205:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2509 -> n
-    205:205:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    206:206:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2511:2511 -> n
-    206:206:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    207:207:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> n
-    207:207:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2511 -> n
-    207:207:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    208:208:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    208:208:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2512 -> n
-    208:208:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    209:211:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2517:2519 -> n
-    209:211:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    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):2546:2546 -> n
-    212:212:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2521 -> n
-    212:212:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    213:213:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    213:213:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2523 -> n
-    213:213:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    214:216:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2530:2532 -> n
-    214:216:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    217:217:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> n
-    217:217:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2532 -> n
-    217:217:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    218:221:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2532:2535 -> n
-    218:221:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2171:2176 -> o
-    7:9:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2215:2217 -> o
-    7:9:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2176 -> o
-    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> o
-    10:10:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2218 -> o
-    10:10:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2176 -> o
-    11:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2219:2233 -> o
-    11:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2176 -> o
-    26:28:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2181:2183 -> o
-    29:29:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> o
-    29:29:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2184 -> o
-    30:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2185:2191 -> o
-    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2140:2162 -> o
-    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2193 -> o
-    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2194:2207 -> o
-    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2167:2167 -> o
-    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2193 -> o
-    1:3:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1593:1595 -> p
-    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> p
-    4:4:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1596 -> p
-    5:6:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1597:1598 -> p
-    7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> p
-    7:7:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1599 -> p
-    8:16:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1600:1608 -> p
-    17:17:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> p
-    17:17:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1609 -> p
-    18:23:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1610:1615 -> p
-    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> p
-    24:24:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1618 -> p
-    25:25:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1622:1622 -> p
-    1:3:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1633:1635 -> q
-    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> q
-    4:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1636 -> q
-    5:23:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1637:1655 -> q
-    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> q
-    24:24:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1656 -> q
-    25:25:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> q
-    25:25:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1657 -> q
-    26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> q
-    26:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1658 -> q
-    27:45:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1646:1664 -> q
-    1:35:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3655:3689 -> r
-    36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> r
-    36:36:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3689 -> r
-    37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> r
-    37:37:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3690 -> r
-    38:45:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3693:3700 -> r
-    1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1107:1121 -> s
-    16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):358:376 -> s
-    16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1122 -> s
-    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1124:1124 -> s
-    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):382:395 -> s
-    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1125 -> s
-    50:50:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):479:479 -> s
-    50:50:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1129 -> s
-    51:58:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1131:1138 -> s
-    59:59:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):479:479 -> s
-    59:59:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1142 -> s
-    60:61:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1144:1145 -> s
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2683:2683 -> t
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2578 -> t
-    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.<init>():119:119 -> t
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2683 -> t
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2578 -> t
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2686:2699 -> t
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2578 -> t
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2579:2579 -> u
-    2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> u
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2579 -> u
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1738:1738 -> v
+    73:73:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1220 -> i
+    74:76:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1246:1248 -> i
+    77:77:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> i
+    77:77:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1249 -> i
+    78:84:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1250:1256 -> i
+    85:85:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> i
+    85:85:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256 -> i
+    86:88:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256:1258 -> i
+    1:10:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):843:852 -> j
+    11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
+    11:11:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):853 -> j
+    12:14:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):854:856 -> j
+    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1001:1008 -> j
+    15:22:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1027:1029 -> j
+    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1012 -> j
+    23:25:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1013:1021 -> j
+    26:34:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    35:35:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):860:860 -> j
+    36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> j
+    36:36:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):864 -> j
+    37:37:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
+    37:37:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):865 -> j
+    38:56:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):866:884 -> j
+    57:57:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> j
+    57:57:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):884 -> j
+    58:58:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):885:885 -> j
+    59:59:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> j
+    59:59:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):886 -> j
+    60:60:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> j
+    60:60:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):887 -> j
+    61:61:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
+    61:61:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):888 -> j
+    62:85:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):889:912 -> j
+    86:86:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    86:86:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):912 -> j
+    87:101:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):913:927 -> j
+    102:102:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    102:102:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):927 -> j
+    103:139:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):929:965 -> j
+    140:140:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    140:140:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):965 -> j
+    141:141:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):967:967 -> j
+    142:156:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):751:765 -> j
+    142:156:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    157:157:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
+    157:157:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):765 -> j
+    157:157:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    158:169:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):771:782 -> j
+    158:169:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    170:170:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    170:170:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):782 -> j
+    170:170:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    171:220:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):783:832 -> j
+    171:220:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    221:221:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
+    221:221:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):833 -> j
+    221:221:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    222:222:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):838:838 -> j
+    222:222:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    223:247:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):972:996 -> j
+    1:3:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):239:241 -> k
+    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> k
+    4:4:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):242 -> k
+    5:10:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):245:250 -> k
+    11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> k
+    11:11:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):251 -> k
+    12:19:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):255:262 -> k
+    20:20:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> k
+    20:20:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):263 -> k
+    21:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):266:280 -> k
+    36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> k
+    36:36:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):281 -> k
+    37:37:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):282:282 -> k
+    38:38:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> k
+    38:38:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):283 -> k
+    39:39:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):284:284 -> k
+    40:40:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> k
+    40:40:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):286 -> k
+    41:41:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> k
+    41:41:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):287 -> k
+    42:42:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):296:296 -> k
+    1:5:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3297:3301 -> l
+    6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> l
+    6:6:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3302 -> l
+    7:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3303:3313 -> l
+    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> l
+    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3320 -> l
+    19:20:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3321:3322 -> l
+    21:21:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> l
+    21:21:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3323 -> l
+    22:22:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> l
+    22:22:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3324 -> l
+    23:23:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> l
+    23:23:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3327 -> l
+    24:32:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3328:3336 -> l
+    1:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1724:1778 -> m
+    56:56:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> m
+    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1778 -> m
+    57:57:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> m
+    57:57:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1779 -> m
+    58:60:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1780:1782 -> m
+    61:87:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1767:1793 -> m
+    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2023:2023 -> n
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> n
+    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2023 -> n
+    3:9:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2026:2032 -> n
+    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> n
+    10:10:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2033 -> n
+    11:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2034:2034 -> n
+    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):1999:2015 -> n
+    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2035 -> n
+    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2038:2054 -> n
+    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2053:2070 -> n
+    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):1919:1935 -> n
+    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2071 -> n
+    81:87:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2075:2081 -> n
+    88:88:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> n
+    88:88:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2082 -> n
+    89:99:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2083:2093 -> n
+    100:100:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> n
+    100:100:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2094 -> n
+    101:115:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2095:2109 -> n
+    116:116:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> n
+    116:116:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2110 -> n
+    117:122:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2116:2121 -> n
+    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2158:2163 -> o
+    7:9:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2202:2204 -> o
+    7:9:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
+    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> o
+    10:10:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2205 -> o
+    10:10:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
+    11:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2206:2220 -> o
+    11:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
+    26:28:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2168:2170 -> o
+    29:29:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> o
+    29:29:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2171 -> o
+    30:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2172:2178 -> o
+    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2127:2149 -> o
+    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2180 -> o
+    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2181:2194 -> o
+    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2154:2154 -> o
+    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2180 -> o
+    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2382:2387 -> p
+    7:23:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2990:3006 -> p
+    7:23:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2388 -> p
+    24:35:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2964:2975 -> p
+    24:35:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    36:49:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> p
+    36:49:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    36:49:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    50:50:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> p
+    50:50:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    50:50:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    51:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> p
+    51:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    51:51:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> p
+    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    52:52:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> p
+    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    53:53:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    54:62:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975:2983 -> p
+    54:62:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    63:65:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2849:2851 -> p
+    63:65:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    66:66:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> p
+    66:66:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2851 -> p
+    66:66:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    67:101:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2852:2886 -> p
+    67:101:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    102:102:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> p
+    102:102:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2887 -> p
+    102:102:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    103:124:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2889:2910 -> p
+    103:124:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    125:149:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2396:2420 -> p
+    150:150:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    150:150:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2421 -> p
+    151:165:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2424:2438 -> p
+    166:166:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    166:166:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2439 -> p
+    167:167:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2430:2430 -> p
+    168:168:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    168:168:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2431 -> p
+    169:179:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2446:2456 -> p
+    180:180:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    180:180:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2457 -> p
+    181:196:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2460:2475 -> p
+    197:197:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    197:197:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2476 -> p
+    198:198:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2466:2466 -> p
+    199:199:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    199:199:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2467 -> p
+    200:203:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2486:2489 -> p
+    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):2514:2514 -> p
+    204:204:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2490 -> p
+    205:205:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2492:2492 -> p
+    206:206:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> p
+    206:206:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2492 -> p
+    207:207:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    207:207:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2493 -> p
+    208:210:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2499:2501 -> p
+    211:211:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> p
+    211:211:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2501 -> p
+    212:214:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2501:2503 -> p
+    1:3:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1580:1582 -> q
+    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> q
+    4:4:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1583 -> q
+    5:6:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1584:1585 -> q
+    7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> q
+    7:7:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1586 -> q
+    8:16:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1587:1595 -> q
+    17:17:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> q
+    17:17:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1596 -> q
+    18:23:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1597:1602 -> q
+    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> q
+    24:24:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1605 -> q
+    25:25:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1609:1609 -> q
+    1:3:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1620:1622 -> r
+    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> r
+    4:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1623 -> r
+    5:23:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1624:1642 -> r
+    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> r
+    24:24:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1643 -> r
+    25:25:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> r
+    25:25:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1644 -> r
+    26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> r
+    26:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1645 -> r
+    27:45:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1633:1651 -> r
+    1:35:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3623:3657 -> s
+    36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> s
+    36:36:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3657 -> s
+    37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> s
+    37:37:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3658 -> s
+    38:45:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3661:3668 -> s
+    1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1101:1115 -> t
+    16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):355:373 -> t
+    16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1116 -> t
+    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1118:1118 -> t
+    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):379:392 -> t
+    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1119 -> t
+    50:50:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> t
+    50:50:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1123 -> t
+    51:58:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1125:1132 -> t
+    59:59:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> t
+    59:59:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1136 -> t
+    60:61:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1138:1139 -> t
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2651:2651 -> u
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.<init>():119:119 -> u
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2651 -> u
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2654:2667 -> u
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2547:2547 -> v
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> v
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1738 -> v
-    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):219:231 -> w
-    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):228:234 -> w
-    1:10:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):846:855 -> x
-    11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> x
-    11:11:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):856 -> x
-    12:14:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):857:859 -> x
-    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1007:1014 -> x
-    15:22:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):861 -> x
-    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1033:1035 -> x
-    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1018 -> x
-    23:25:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):861 -> x
-    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1019:1027 -> x
-    26:34:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):861 -> x
-    35:35:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):863:863 -> x
-    36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> x
-    36:36:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):867 -> x
-    37:37:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> x
-    37:37:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):868 -> x
-    38:56:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):869:887 -> x
-    57:57:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> x
-    57:57:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):887 -> x
-    58:58:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):888:888 -> x
-    59:59:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> x
-    59:59:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):889 -> x
-    60:60:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> x
-    60:60:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):890 -> x
-    61:61:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> x
-    61:61:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):891 -> x
-    62:85:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):892:915 -> x
-    86:86:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> x
-    86:86:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):915 -> x
-    87:101:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):916:930 -> x
-    102:102:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> x
-    102:102:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):930 -> x
-    103:139:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):932:968 -> x
-    140:140:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> x
-    140:140:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> x
-    141:141:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):970:970 -> x
-    142:173:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):754:785 -> x
-    142:173:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):971 -> x
-    174:174:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> x
-    174:174:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):785 -> x
-    174:174:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):971 -> x
-    175:230:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):786:841 -> x
-    175:230:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):971 -> x
-    231:255:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):975:999 -> x
-    256:256:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> x
-    256:256:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):999 -> x
-    257:260:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):999:1002 -> x
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2547 -> v
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1725:1725 -> w
+    2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> w
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1725 -> w
+    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):216:228 -> x
+    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):225:231 -> x
 com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.D.e.i:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
-    1:1:void <clinit>():2442:2442 -> <clinit>
+    1:1:void <clinit>():2424:2424 -> <clinit>
 com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.D.e.j:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():2237:2237 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2237:2237 -> <init>
-    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2241:2242 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2237:2237 -> a
-    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2250:2250 -> a
-    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2237 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1211:1211 -> a
-    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2250 -> a
-    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2237 -> a
-    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2254:2269 -> a
-    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2237 -> a
-    20:20:int doHash(java.lang.Object):2237:2237 -> a
-    21:35:int doHash(com.android.tools.r8.ir.code.Instruction):2280:2294 -> a
-    21:35:int doHash(java.lang.Object):2237 -> a
-    36:41:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2301:2306 -> a
-    42:46:int getHashCode(com.android.tools.r8.ir.code.Value):2312:2316 -> a
+    1:1:void <clinit>():2224:2224 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2224:2224 -> <init>
+    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2228:2229 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2224:2224 -> a
+    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2237:2237 -> a
+    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> a
+    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2237 -> a
+    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> a
+    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2241:2256 -> a
+    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> a
+    20:20:int doHash(java.lang.Object):2224:2224 -> a
+    21:35:int doHash(com.android.tools.r8.ir.code.Instruction):2267:2281 -> a
+    21:35:int doHash(java.lang.Object):2224 -> a
+    36:41:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2288:2293 -> a
+    42:46:int getHashCode(com.android.tools.r8.ir.code.Value):2299:2303 -> a
 com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.D.e.k:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
@@ -36030,59 +35967,59 @@
     com.android.tools.r8.ir.code.IRCode code -> c
     boolean $assertionsDisabled -> h
     int right -> e
-    1:1:void <clinit>():512:512 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):520:521 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):530:530 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):535:535 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):545:545 -> a
-    4:9:com.android.tools.r8.ir.code.BasicBlock build():550:555 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
-    10:10:com.android.tools.r8.ir.code.BasicBlock build():555 -> a
-    11:16:com.android.tools.r8.ir.code.BasicBlock build():556:561 -> a
+    1:1:void <clinit>():509:509 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):517:518 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):527:527 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):532:532 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):542:542 -> a
+    4:9:com.android.tools.r8.ir.code.BasicBlock build():547:552 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock build():552 -> a
+    11:16:com.android.tools.r8.ir.code.BasicBlock build():553:558 -> a
     17:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
-    17:20:com.android.tools.r8.ir.code.BasicBlock build():561 -> a
-    21:23:com.android.tools.r8.ir.code.BasicBlock build():563:565 -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):540:540 -> b
+    17:20:com.android.tools.r8.ir.code.BasicBlock build():558 -> a
+    21:23:com.android.tools.r8.ir.code.BasicBlock build():560:562 -> a
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):537:537 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.D.e.l:
     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>():137:139 -> <clinit>
-    1:1:void <init>(java.lang.String,int):136:136 -> <init>
+    1:3:void <clinit>():134:136 -> <clinit>
+    1:1:void <init>(java.lang.String,int):133:133 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.D.e.m:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.Position):440:441 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position):437:438 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.D.e.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():649:649 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):653:653 -> <init>
-    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):651:657 -> <init>
-    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):670:670 -> a
-    2:2:int getMax():666:666 -> a
-    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):670 -> a
-    3:3:int getMin():662:662 -> a
-    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):670 -> a
-    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):670:671 -> a
-    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):687:687 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):649:649 -> b
-    2:2:int getMax():666:666 -> b
-    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):675 -> b
-    3:3:int getMin():662:662 -> b
-    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):675 -> b
-    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):676:676 -> b
+    1:1:void <clinit>():646:646 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):650:650 -> <init>
+    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):648:654 -> <init>
+    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667:667 -> a
+    2:2:int getMax():663:663 -> a
+    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667 -> a
+    3:3:int getMin():659:659 -> a
+    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667 -> a
+    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667:668 -> a
+    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):684:684 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):646:646 -> b
+    2:2:int getMax():663:663 -> b
+    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):672 -> b
+    3:3:int getMin():659:659 -> b
+    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):672 -> b
+    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):673:673 -> b
     5:5:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):114:114 -> b
-    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):680 -> b
-    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):680:680 -> b
+    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):677 -> b
+    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):677:677 -> b
     7:7:int com.android.tools.r8.ir.code.IntSwitch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):103:103 -> b
-    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):682 -> b
-    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):682:682 -> b
+    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):679 -> b
+    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):679:679 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.D.e.o:
     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>():1355:1356 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1354:1354 -> <init>
+    1:2:void <clinit>():1349:1350 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1348:1348 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.D.e.p:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
@@ -36091,26 +36028,26 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    1:1:void <clinit>():3600:3600 -> <clinit>
-    1:8:void <init>():3600:3607 -> <init>
-    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3600:3600 -> <init>
-    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3610:3612 -> a
-    1:33:void dfs(com.android.tools.r8.ir.code.Value):3616:3648 -> b
+    1:1:void <clinit>():3568:3568 -> <clinit>
+    1:8:void <init>():3568:3575 -> <init>
+    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3568:3568 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3578:3580 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):3584:3616 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.D.e.q:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap 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):458:458 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Position):454:454 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):467:467 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):472:472 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):477:477 -> a
-    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):483:504 -> a
+    1:1:void <init>(com.android.tools.r8.ir.code.Position):455:455 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Position):451:451 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):464:464 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):469:469 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):474:474 -> a
+    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):480:501 -> a
     26:29:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.IRMetadata):1422:1425 -> a
-    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):504 -> a
-    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):505:506 -> 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):495:495 -> 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):501:501 -> b
+    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):501 -> a
+    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):502:503 -> 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):492:492 -> 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):498:498 -> b
 com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.D.e.t:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> e
     boolean $assertionsDisabled -> f
@@ -36144,12 +36081,12 @@
     157:165:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):185:193 -> a
     166:171:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):206:211 -> a
     166:171:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):194 -> a
-    172:172:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    172:172:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     172:172:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):212 -> a
     172:172:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):194 -> a
     173:173:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):212:212 -> a
     173:173:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):194 -> a
-    174:174:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    174:174:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     174:174:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):213 -> a
     174:174:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):194 -> a
     175:175:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):217:217 -> a
@@ -36179,7 +36116,7 @@
     1:8:void run(com.android.tools.r8.ir.code.IRCode):35:42 -> a
     9:10:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):89:90 -> a
     9:10:void run(com.android.tools.r8.ir.code.IRCode):43 -> a
-    11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     11:11:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):91 -> a
     11:11:void run(com.android.tools.r8.ir.code.IRCode):43 -> a
     12:21:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):93:102 -> a
@@ -36212,107 +36149,113 @@
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isForcedInliningOracle() -> a
     1:29:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):94:122 -> a
-    1:29:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356 -> a
-    30:30:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:360 -> a
+    1:29:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    30:30:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):355:355 -> a
     31:49:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):130:148 -> a
-    31:49:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
+    31:49:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
     50:51:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):210:211 -> a
     50:51:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):150 -> a
-    50:51:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
+    50:51:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
     52:54:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):151:153 -> a
-    52:54:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
+    52:54:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
     55:55:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
     55:55:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):137 -> a
-    55:55:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
+    55:55:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
     56:56:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
     56:56:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):132 -> a
-    56:56:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
+    56:56:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
     57:58:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):133:134 -> a
-    57:58:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
-    59:60:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365:366 -> a
-    61:61:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365:365 -> a
+    57:58:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    59:60:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:361 -> a
+    61:61:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:360 -> a
     62:70:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):219:227 -> a
-    62:70:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370 -> a
-    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    62:70:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     71:71:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227 -> a
-    71:71:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370 -> a
-    72:146:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227:301 -> a
-    72:146:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370 -> a
-    147:147:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):300:300 -> a
-    147:147:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370 -> a
-    148:148:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):374:374 -> a
-    149:151:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:97 -> a
-    149:151:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356 -> a
-    152:167:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):169:184 -> a
-    168:188:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):180:200 -> a
-    189:189:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
-    189:189:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
-    190:190:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):204:204 -> a
-    191:191:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
-    191:191:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
-    192:192:java.lang.Boolean lambda$canInlineStaticInvoke$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):182:182 -> a
-    193:197:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):306:310 -> a
-    198:198:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):309:309 -> a
-    199:199:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):316:316 -> a
-    200:211:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):325:336 -> a
-    200:211:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):317 -> a
-    212:212:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):318:318 -> a
-    213:213:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):347:347 -> a
-    214:215:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):383:384 -> a
-    216:216:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    216:216:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):384 -> a
-    217:222:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):386:391 -> a
-    223:223:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    223:223:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):391 -> a
-    224:224:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):392:392 -> a
-    225:225:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    225:225:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):392 -> a
-    226:237:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):392:403 -> a
-    238:242:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):416:420 -> a
-    243:245:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):426:428 -> a
-    246:246:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    246:246:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):428 -> a
-    247:247:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):430:430 -> a
-    248:259:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):440:451 -> a
-    260:291:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):467:498 -> a
-    292:292:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    292:292:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):498 -> a
-    293:298:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):501:506 -> a
-    299:299:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    299:299:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):498 -> a
-    300:318:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):509:527 -> a
-    319:319:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    319:319:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):528 -> a
-    320:321:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):530:531 -> a
-    322:322:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    322:322:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):528 -> a
-    323:331:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):537:545 -> a
-    332:332:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    332:332:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):546 -> a
-    333:335:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):548:550 -> a
-    336:336:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    336:336:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):546 -> a
-    337:337:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):558:558 -> a
-    338:343:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):565:570 -> a
-    344:344: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):582:582 -> a
-    345:347:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):593:595 -> a
-    345: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):585 -> a
-    348:348: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):586:586 -> a
-    349:365: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):680:696 -> a
-    349:365: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):587 -> a
-    366:382: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):615:631 -> a
-    383:383:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    383:383: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):631 -> a
-    384:388: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):632:636 -> a
-    389:389:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    389:389: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):637 -> a
-    390:390: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):639:639 -> a
-    391:391:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    391:391: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):631 -> a
-    392:395: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):644:647 -> a
-    396:396:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):706:706 -> a
-    397:431:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):712:746 -> a
-    432:438:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):758:764 -> a
+    71:71:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    72:143:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227:298 -> a
+    72:143:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    144:146:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):297:299 -> a
+    144:146:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    147:147:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):369:369 -> a
+    148:150:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:97 -> a
+    148:150:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    151:166:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):169:184 -> a
+    167:187:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):180:200 -> a
+    188:188:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    188:188:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
+    189:189:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):204:204 -> a
+    190:190:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    190:190:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
+    191:191:java.lang.Boolean lambda$canInlineStaticInvoke$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):182:182 -> a
+    192:192:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):311:311 -> a
+    193:204:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):320:331 -> a
+    193:204:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):312 -> a
+    205:205:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):313:313 -> a
+    206:206:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):342:342 -> a
+    207:208:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):378:379 -> a
+    209:209:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    209:209:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):379 -> a
+    210:215:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):381:386 -> a
+    216:216:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    216:216:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):386 -> a
+    217:217:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387:387 -> a
+    218:218:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    218:218:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387 -> a
+    219:230:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387:398 -> a
+    231:235:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):411:415 -> a
+    236:238:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):421:423 -> a
+    239:239:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    239:239:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):423 -> a
+    240:240:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):425:425 -> a
+    241:272:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):443:474 -> a
+    273:273:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    273:273:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):474 -> a
+    274:279:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):477:482 -> a
+    280:280:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    280:280:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):474 -> a
+    281:299:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):485:503 -> a
+    300:300:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    300:300:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):504 -> a
+    301:302:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):506:507 -> a
+    303:303:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    303:303:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):504 -> a
+    304:312:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):513:521 -> a
+    313:313:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    313:313:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):522 -> a
+    314:316:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):524:526 -> a
+    317:317:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    317:317:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):522 -> a
+    318:318:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):534:534 -> a
+    319:319:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541:541 -> a
+    320:320:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    320:320:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541 -> a
+    321:323:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):544:546 -> a
+    324:324:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    324:324:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541 -> a
+    325:325: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
+    326:326:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    326:326: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 -> a
+    327:329:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):569:571 -> a
+    327:329: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):561 -> a
+    330:330: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):562:562 -> a
+    331:347: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):656:672 -> a
+    331: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):563 -> a
+    348:348:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    348:348: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 -> a
+    349:365: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):591:607 -> a
+    366:366:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    366:366:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):607 -> a
+    367:371: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):608:612 -> a
+    372:372:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    372:372: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):613 -> a
+    373:373: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):615:615 -> a
+    374:374:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    374:374:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):607 -> a
+    375:378: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):620:623 -> a
+    379:379:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):682:682 -> a
+    380:404:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):688:712 -> a
+    405:412:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):724:731 -> a
 com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.D.e.w:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
@@ -36322,25 +36265,25 @@
     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.DexType):48 -> a
     5:31:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):49:75 -> a
-    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Assume.getAliasForOutValue():199:199 -> a
+    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Assume.getAliasForOutValue():194:194 -> a
     32:32:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):75 -> a
     33:59:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):76:102 -> a
     60:108:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):101:149 -> a
     109:109:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     109:109:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):148 -> a
     110:124:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):153:167 -> a
-    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     125:125:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):174 -> a
     126:145:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):176:195 -> a
-    146:146:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    146:146:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     146:146:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):195 -> a
-    147:147:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    147:147:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     147:147:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):196 -> a
     148:148:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):198:198 -> a
     149:149:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
     149:149:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):198 -> a
     150:152:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):200:202 -> a
-    153:153:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    153:153:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     153:153:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):202 -> a
     154:164:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):205:215 -> a
     165:176:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):214:225 -> a
@@ -36356,25 +36299,25 @@
     1:3:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):42:44 -> a
     4:5:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):54:55 -> a
     4:5:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     6:6:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):56 -> a
     6:6:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    7:81:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):57:131 -> a
-    7:81:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    82:82:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):130:130 -> a
-    82:82:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    83:83:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    83:83:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):133 -> a
-    83:83:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    84:84:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):135:135 -> a
-    84:84:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    85:85:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    85:85:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):135 -> a
-    85:85:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    86:101:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):160:175 -> a
-    1:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):146:155 -> b
+    7:76:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):57:126 -> a
+    7:76:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
+    77:77:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):125:125 -> a
+    77:77:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
+    78:78:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    78:78:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):128 -> a
+    78:78:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
+    79:79:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):130:130 -> a
+    79:79:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
+    80:80:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    80:80:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):130 -> a
+    80:80:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
+    81:96:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):155:170 -> a
+    1:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):141:150 -> b
     11:13:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.join(java.lang.Iterable,com.android.tools.r8.graph.AppView):103:105 -> b
-    11:13:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):155 -> b
+    11:13:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):150 -> b
 com.android.tools.r8.ir.optimize.EnumInfoMapCollector -> com.android.tools.r8.D.e.y:
     java.util.Map valueInfoMaps -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -36391,7 +36334,6 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():23:23 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,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.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
     boolean isForcedInliningOracle() -> a
@@ -36402,7 +36344,7 @@
     1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):45:49 -> a
     6:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):62:72 -> a
     6:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):58 -> a
-    17:20:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):122:125 -> a
+    17:20:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):113:116 -> a
 com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.D.e.B:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -36425,12 +36367,12 @@
     34:40:boolean isIdempotentLibraryMethodInvoke(com.android.tools.r8.ir.code.InvokeMethod):256:262 -> a
     34:40:void canonicalize(com.android.tools.r8.ir.code.IRCode):130 -> a
     41:61:void canonicalize(com.android.tools.r8.ir.code.IRCode):131:151 -> a
-    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     62:62:void canonicalize(com.android.tools.r8.ir.code.IRCode):151 -> a
     63:63:void canonicalize(com.android.tools.r8.ir.code.IRCode):152:152 -> a
     64:64:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
     64:64:void canonicalize(com.android.tools.r8.ir.code.IRCode):152 -> a
-    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     65:65:void canonicalize(com.android.tools.r8.ir.code.IRCode):151 -> a
     66:66:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
     66:66:void canonicalize(com.android.tools.r8.ir.code.IRCode):138 -> a
@@ -36438,7 +36380,7 @@
     89:89:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():283:283 -> a
     89:89:void canonicalize(com.android.tools.r8.ir.code.IRCode):184 -> a
     90:139:void canonicalize(com.android.tools.r8.ir.code.IRCode):186:235 -> a
-    140:140:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    140:140:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     140:140:void canonicalize(com.android.tools.r8.ir.code.IRCode):236 -> a
     141:156:void canonicalize(com.android.tools.r8.ir.code.IRCode):237:252 -> a
     157:157:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.InvokeMethod):171:171 -> a
@@ -36451,22 +36393,22 @@
     181:184: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):220:223 -> a
     185:189:void insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):290:294 -> a
     185:189: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):225 -> a
-    190:190:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    190:190:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     190:190:void insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):295 -> a
     190:190: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):225 -> a
     191:191:void insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):295:295 -> a
     191:191: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):225 -> a
-    192:192:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    192:192:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     192:192:void insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):296 -> a
     192: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):225 -> a
     193:193:void insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):300:300 -> a
     193:193: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):225 -> a
     194:195: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:228 -> a
     196:200:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):267:271 -> a
-    201:201:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    201:201:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     201:201:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):272 -> a
     202:209:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):273:280 -> a
-    210:210:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    210:210:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     210:210:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):285 -> a
     211:211:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):280:280 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):195:195 -> b
@@ -36481,80 +36423,71 @@
     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.D.e.I:
-    java.util.Set doubleInlineCallers -> g
-    com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> e
-    java.util.Set doubleInlineSelectedTargets -> h
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> c
+    java.util.Set doubleInlineSelectedTargets -> g
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> j
-    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> d
-    java.util.Map doubleInlineeCandidates -> i
-    boolean applyDoubleInlining -> f
+    boolean $assertionsDisabled -> i
+    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> c
+    java.util.Set doubleInlineCallers -> f
+    boolean applyDoubleInlining -> e
     java.util.Set blacklist -> b
-    1:1:void <clinit>():73:73 -> <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):91:91 -> <init>
-    2:17: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):82:97 -> <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.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):102:120 -> a
-    20:20:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):115:115 -> a
-    21:21:boolean isDoubleInliningEnabled():128:128 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):142:142 -> a
-    23:23:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1430 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):142 -> a
-    24:24:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1430:1430 -> a
-    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):142 -> a
-    25:30:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):1032:1037 -> a
-    25:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):143 -> a
-    31:43:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):144:156 -> a
-    44:46: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):134:136 -> a
-    44:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):157 -> a
-    47:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):158:163 -> a
-    53:58:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):185:190 -> a
-    59:69:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):194:204 -> a
-    70:71:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):209:210 -> a
-    72:79:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):245:252 -> a
-    80:93:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):251:264 -> a
-    94:98:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):254:258 -> a
-    99:105:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):254:260 -> a
-    106:130:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):784:808 -> a
-    131:132:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):833:834 -> a
-    133:141:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):843:851 -> a
-    142:142:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):862:862 -> a
-    142:142:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):845 -> a
-    143:143:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):852:852 -> a
-    144:144:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):862:862 -> a
-    145:161:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):879:895 -> a
-    162:162:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    162:162:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):896 -> a
-    163:186:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):897:920 -> a
-    187:198:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):919:930 -> a
-    199:206:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1020:1027 -> a
-    199:206:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):935 -> a
-    207:207:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1025:1025 -> a
-    207:207:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):935 -> a
-    208:208:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):935:935 -> a
-    209:241:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):931:963 -> a
-    242:242:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    242:242:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):967 -> a
-    243:244:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):968:969 -> a
-    245:254: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.DexEncodedMethod):1047:1056 -> a
-    245:254:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):975 -> a
-    255:288:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):969:1002 -> a
-    289:291:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):70:72 -> a
-    289:291:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1002 -> a
-    292:292:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1003:1003 -> a
-    293:293:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):76:76 -> a
-    293:293:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1002 -> a
-    294:302:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1005:1013 -> a
-    303:303:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):479:479 -> a
-    303:303:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1014 -> a
-    304:305:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1015:1016 -> a
-    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):169:175 -> b
-    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> b
-    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):175 -> b
-    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):227:238 -> b
-    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):215:221 -> c
+    com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> d
+    java.util.Map doubleInlineeCandidates -> h
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):85:85 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):77:90 -> <init>
+    1:19:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:113 -> a
+    20:20:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):108:108 -> a
+    21:21:boolean isDoubleInliningEnabled():121:121 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:135 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1425 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135 -> a
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1425:1425 -> a
+    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135 -> a
+    25:30:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):991:996 -> a
+    25:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):136 -> a
+    31:43:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):137:149 -> a
+    44:46: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):127:129 -> a
+    44:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):150 -> a
+    47:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):151:156 -> a
+    53:58:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):178:183 -> a
+    59:69:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):187:197 -> a
+    70:71:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):202:203 -> a
+    72:79:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):238:245 -> a
+    80:93:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):244:257 -> a
+    94:98:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:251 -> a
+    99:105:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:253 -> a
+    106:130:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):773:797 -> a
+    131:132:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):822:823 -> a
+    133:141:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):832:840 -> a
+    142:142:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):851:851 -> a
+    142:142:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):834 -> a
+    143:143:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):841:841 -> a
+    144:144:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):851:851 -> a
+    145:156:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):868:879 -> a
+    157:157:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    157:157:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):880 -> a
+    158:184:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):881:907 -> a
+    185:192:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):979:986 -> a
+    185:192:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912 -> a
+    193:193:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):984:984 -> a
+    193:193:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912 -> a
+    194:194:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912:912 -> a
+    195:223:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):908:936 -> a
+    224:224:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    224:224:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):941 -> a
+    225:226:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):942:943 -> a
+    227:236: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.DexEncodedMethod):1006:1015 -> a
+    227:236:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):949 -> a
+    237:266:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):943:972 -> a
+    267:267:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> a
+    267:267:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):973 -> a
+    268:269:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):974:975 -> a
+    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):162:168 -> b
+    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> b
+    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):168 -> b
+    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):220:231 -> b
+    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):208:214 -> c
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.D.e.C:
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> d
@@ -36565,110 +36498,106 @@
     com.android.tools.r8.ir.optimize.Inliner$Constraint ALWAYS -> g
     com.android.tools.r8.ir.optimize.Inliner$Constraint SUBCLASS -> f
     int value -> a
-    1:17:void <clinit>():274:290 -> <clinit>
-    18:47:void <clinit>():274:303 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):294:295 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():274:274 -> a
-    1:1:boolean isSet(int):307:307 -> b
+    1:17:void <clinit>():267:283 -> <clinit>
+    18:47:void <clinit>():267:296 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):287:288 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():267:267 -> a
+    1:1:boolean isSet(int):300:300 -> b
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.D.e.D:
     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>():325:333 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):335:338 -> <init>
-    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):341:345 -> <init>
-    1:24: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):368:391 -> a
-    25:36: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):397:408 -> a
-    37:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):413:463 -> a
-    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):537:547 -> a
-    88:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):463 -> a
-    99:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464:471 -> a
-    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):514:529 -> a
-    107:122:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):471 -> a
-    123:157: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):475:509 -> a
-    1:5:boolean equals(java.lang.Object):358:362 -> equals
-    1:4:int hashCode():350:353 -> hashCode
+    1:9:void <clinit>():318:326 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):328:331 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):334:338 -> <init>
+    1:24: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):361:384 -> a
+    25:36: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):390:401 -> a
+    37:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):406:456 -> a
+    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):530:540 -> a
+    88:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):456 -> a
+    99:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):457:464 -> a
+    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):507:522 -> a
+    107:122:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464 -> a
+    123:157: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):468:502 -> a
+    1:5:boolean equals(java.lang.Object):351:355 -> equals
+    1:4:int hashCode():343:346 -> hashCode
     5:5:int com.android.tools.r8.graph.DexType.computeHashCode():43:43 -> hashCode
-    5:5:int hashCode():353 -> hashCode
+    5:5:int hashCode():346 -> hashCode
 com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.D.e.E:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
     boolean shouldSynthesizeNullCheckForReceiver -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():572:572 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):580:583 -> <init>
-    1:1:void setShouldSynthesizeNullCheckForReceiver():587:587 -> a
-    2:17:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):597:612 -> a
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    18:18:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):612 -> a
-    19:50:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):613:644 -> a
-    51:51:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    51:51:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):645 -> a
-    52:62:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):646:656 -> a
+    1:1:void <clinit>():565:565 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):573:576 -> <init>
+    1:1:void setShouldSynthesizeNullCheckForReceiver():580:580 -> a
+    2:17:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):589:604 -> a
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    18:18:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):604 -> a
+    19:50:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):605:636 -> a
+    51:51:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    51:51:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):637 -> a
+    52:62:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):638:648 -> a
     63:63:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    63:63:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):655 -> a
-    64:85:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):658:679 -> a
-    86:91:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):678:683 -> a
-    92:92:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    92:92:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):685 -> a
-    93:93:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):685:685 -> a
-    94:94:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    94:94:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):683 -> a
-    95:101:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):686:692 -> 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.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):694 -> a
-    103:103:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):694:694 -> 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.TypeLatticeElement):1040:1040 -> a
-    104:104:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):696 -> a
-    105:106:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):697:698 -> a
-    107:107:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):131:131 -> a
-    107:107:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):700 -> a
-    108:110:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):704:706 -> a
-    111:111:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    111:111:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):706 -> a
-    112:124:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):707:719 -> a
-    125:125:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    125:125:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):719 -> a
-    126:139:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):720:733 -> a
+    63:63:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):647 -> a
+    64:85:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):650:671 -> a
+    86:91:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):670:675 -> a
+    92:92:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    92:92:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):677 -> a
+    93:93:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):677:677 -> a
+    94:94:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    94:94:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):675 -> a
+    95:103:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):678:686 -> 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.TypeLatticeElement):1036:1036 -> a
+    104:104:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):688 -> a
+    105:106:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):689:690 -> a
+    107:107:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    107:107:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):692 -> a
+    108:110:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):696:698 -> a
+    111:111:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    111:111:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):698 -> a
+    112:124:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):699:711 -> a
+    125:125:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    125:125:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):711 -> a
+    126:139:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):712:725 -> a
     140:140:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    140:140:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):732 -> a
-    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    141:141:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):731 -> a
-    142:142:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):734:734 -> a
-    143:143:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    143:143:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):734 -> a
-    144:148:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):736:740 -> a
-    149:149:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    149:149:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):740 -> a
-    150:150:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    150:150:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):741 -> a
-    151:151:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):742:742 -> a
-    152:152:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    152:152:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):742 -> a
-    153:165:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):743:755 -> a
-    166:166:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    166:166:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):755 -> a
-    167:174:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):760:767 -> a
-    175:175:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):699:699 -> a
+    140:140:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):724 -> a
+    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    141:141:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):723 -> a
+    142:142:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):726:726 -> a
+    143:143:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    143:143:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):726 -> a
+    144:148:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):728:732 -> a
+    149:149:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    149:149:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):732 -> a
+    150:150:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    150:150:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):733 -> a
+    151:151:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):734:734 -> a
+    152:152:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    152:152:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):734 -> a
+    153:165:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):735:747 -> a
+    166:166:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    166:166:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):747 -> a
+    167:171:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):752:756 -> a
+    172:172:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):691:691 -> a
 com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.D.e.F:
     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):776:778 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):765:767 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.D.e.G:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.graph.DexType receiverType -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):822:824 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):811:813 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.D.e.H:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     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:5:void <clinit>():560:564 -> <clinit>
-    1:1:void <init>(java.lang.String,int):559:559 -> <init>
-    1:1:boolean mustBeInlined():568:568 -> a
+    1:5:void <clinit>():553:557 -> <clinit>
+    1:1:void <init>(java.lang.String,int):552:552 -> <init>
 com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.D.e.J:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
@@ -36731,7 +36660,6 @@
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType) -> a
 com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.D.e.L:
-    boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
@@ -36782,97 +36710,97 @@
     java.util.Set warnedFields -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.Reporter reporter -> b
-    1:3:void <clinit>():46:48 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):87:87 -> <init>
-    2:37:void <init>(com.android.tools.r8.graph.AppView):54:89 -> <init>
-    1:5:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedField):93:97 -> a
-    6:13:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup lookupMemberRule(com.android.tools.r8.graph.DexDefinition):112:119 -> a
-    14:17:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):181:184 -> a
-    18:20:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):183:185 -> a
-    21:21: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):222:222 -> a
-    22:32:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):126:136 -> a
-    22:32: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):222 -> a
-    33:40:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):135:142 -> a
-    33:40: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):222 -> a
+    1:3:void <clinit>():43:45 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):84:84 -> <init>
+    2:37:void <init>(com.android.tools.r8.graph.AppView):51:86 -> <init>
+    1:5:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedField):90:94 -> a
+    6:13:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup lookupMemberRule(com.android.tools.r8.graph.DexDefinition):109:116 -> a
+    14:17:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):178:181 -> a
+    18:20:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):180:182 -> a
+    21:21: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):218:218 -> a
+    22:32:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):123:133 -> a
+    22:32: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):218 -> a
+    33:40:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):132:139 -> a
+    33:40: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):218 -> a
     41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    41:41:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):142 -> a
-    41:41: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):222 -> a
-    42:51:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):141:150 -> a
-    42:51: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):222 -> a
-    52:70:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):147:165 -> a
-    52:70: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):222 -> a
-    71:82:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):160:171 -> a
-    71:82: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):222 -> a
-    83:83: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):225:225 -> a
-    84:86:void setValueRangeFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.Value):209:211 -> a
-    84:86: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):225 -> a
-    87:98: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):228:239 -> a
-    99:99:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    99:99: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):239 -> a
-    100:100: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):241:241 -> a
-    101:108:void rewriteStaticGetWithConstantValues(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.StaticGet):345:352 -> a
-    109:144:void rewriteStaticGetWithConstantValues(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.StaticGet):351:386 -> a
-    145:145:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    145:145:void rewriteStaticGetWithConstantValues(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.StaticGet):386 -> a
-    146:154:void rewriteStaticGetWithConstantValues(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.StaticGet):388:396 -> a
-    155:155:java.lang.Boolean lambda$rewriteStaticGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):352:352 -> a
-    156:166:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):436:446 -> a
-    167:167:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    167:167:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447 -> a
-    168:170:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):448:450 -> a
-    171:220:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):254:303 -> a
-    171:220:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    221:225:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):101:105 -> a
-    221:225:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):307 -> a
-    221:225:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    226:232:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):310:316 -> a
-    226:232:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    233:240:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):315:322 -> a
-    233:240:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    241:245:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):193:197 -> a
-    241:245:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321 -> a
-    241:245:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    246:249:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):195:198 -> a
-    246:249:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321 -> a
-    246:249:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    250:260:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):194:204 -> a
-    250:260:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321 -> a
-    250:260:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    261:267:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):325:331 -> a
-    261:267:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    268:268:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    268:268:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):331 -> a
-    268:268:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    269:269:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    269:269:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):333 -> a
-    269:269:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    270:270:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):335:335 -> a
-    270:270:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    271:277:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):451:457 -> a
-    278:286:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):452:460 -> a
-    287:287:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):405:405 -> a
-    287:287:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):459 -> a
-    288:288:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    288:288:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):405 -> a
-    288:288:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):459 -> a
-    289:306:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):409:426 -> a
-    289:306:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):459 -> a
-    307:308:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):464:465 -> a
-    309:309:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    309:309:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):465 -> a
-    310:312:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):465:467 -> a
+    41:41:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):139 -> a
+    41:41: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):218 -> a
+    42:51:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):138:147 -> a
+    42:51: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):218 -> a
+    52:70:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):144:162 -> a
+    52:70: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):218 -> a
+    71:82:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):157:168 -> a
+    71:82: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):218 -> a
+    83:83: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):221:221 -> a
+    84:86:void setValueRangeFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.Value):205:207 -> a
+    84:86: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):221 -> a
+    87:98: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):224:235 -> a
+    99:99:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    99:99: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):235 -> a
+    100:100: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):237:237 -> a
+    101:108:void rewriteStaticGetWithConstantValues(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.StaticGet):341:348 -> a
+    109:144:void rewriteStaticGetWithConstantValues(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.StaticGet):347:382 -> a
+    145:145:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    145:145:void rewriteStaticGetWithConstantValues(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.StaticGet):382 -> a
+    146:154:void rewriteStaticGetWithConstantValues(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.StaticGet):384:392 -> a
+    155:155:java.lang.Boolean lambda$rewriteStaticGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):348:348 -> a
+    156:166:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):432:442 -> a
+    167:167:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    167:167:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):443 -> a
+    168:170:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):444:446 -> a
+    171:220:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):250:299 -> a
+    171:220:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    221:225:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):98:102 -> a
+    221:225:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):303 -> a
+    221:225:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    226:232:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):306:312 -> a
+    226:232:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    233:240:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):311:318 -> a
+    233:240:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    241:245:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):190:194 -> a
+    241:245:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    241:245:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    246:249:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):192:195 -> a
+    246:249:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    246:249:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    250:259:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):191:200 -> a
+    250:259:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    250:259:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    260:266:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321:327 -> a
+    260:266:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    267:267:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    267:267:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):327 -> a
+    267:267:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    268:268:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    268:268:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
+    268:268:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    269:269:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):331:331 -> a
+    269:269:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    270:276:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447:453 -> a
+    277:285:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):448:456 -> a
+    286:286:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):401:401 -> a
+    286:286:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    287:287:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    287:287:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):401 -> a
+    287:287:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    288:305:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):405:422 -> a
+    288:305:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    306:307:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):460:461 -> a
+    308:308:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    308:308:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):461 -> a
+    309:311:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):461:463 -> a
 com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.D.e.O:
     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):67:69 -> <init>
-    1:5:boolean equals(java.lang.Object):74:78 -> equals
-    1:1:int hashCode():83:83 -> hashCode
+    1:3:void <init>(com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType,com.android.tools.r8.shaking.ProguardMemberRule):64:66 -> <init>
+    1:5:boolean equals(java.lang.Object):71:75 -> equals
+    1:1:int hashCode():80:80 -> hashCode
 com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.D.e.P:
     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>():57:59 -> <clinit>
-    1:1:void <init>(java.lang.String,int):56:56 -> <init>
+    1:3:void <clinit>():54:56 -> <clinit>
+    1:1:void <init>(java.lang.String,int):53:53 -> <init>
 com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.D.e.S:
     java.util.Map com.android.tools.r8.ir.optimize.MemberPoolCollection.memberPools -> c
     com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.MemberPoolCollection.appView -> b
@@ -36903,16 +36831,16 @@
     12:13:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):98:99 -> a
     14:14:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):104:104 -> a
     15:18:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):135:138 -> a
-    19:19:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
+    19:19:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     19:19:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):139 -> a
     20:21:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):141:142 -> a
-    22:22:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):583:583 -> a
+    22:22:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):581:581 -> a
     22:22:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):143 -> a
     23:30:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):145:152 -> a
-    31:31:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
+    31:31:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     31:31:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):153 -> a
     32:33:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):155:156 -> a
-    34:34:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):583:583 -> a
+    34:34:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):581:581 -> a
     34:34:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):157 -> a
     35:35:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):140:140 -> a
     36:36:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):234:234 -> a
@@ -36994,7 +36922,7 @@
     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():932:932 -> a
+    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> 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:31:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):47:62 -> a
     32:36:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):61:65 -> a
@@ -37011,7 +36939,7 @@
     void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode) -> a
     boolean lambda$addNonNullForValues$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:15:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):66:80 -> a
-    16:16:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    16:16:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     16:16:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):81 -> a
     17:73:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):82:138 -> a
     74:74:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
@@ -37030,12 +36958,12 @@
     99:100:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):153:154 -> a
     101:175:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):153:227 -> a
     176:184:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):225:233 -> a
-    185:185:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    185:185:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     185:185:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):233 -> a
     186:186:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):233:233 -> a
-    187:187:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    187:187:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     187:187:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):234 -> a
-    188:188:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    188:188:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     188:188:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):235 -> a
     189:198:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):236:245 -> a
     199:199:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
@@ -37043,7 +36971,7 @@
     200:200:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):245:245 -> a
     201:261: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):299:359 -> a
     262:272: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):357:367 -> a
-    273:273:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    273:273:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     273:273: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):367 -> a
     274:279: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):370:375 -> a
     280:285: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):383:388 -> a
@@ -37072,24 +37000,19 @@
     11:19:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1324:1332 -> a
     20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Outliner$Outline.buildMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):581:581 -> a
     20:20:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333 -> a
-    21:21:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.Outliner):106:106 -> 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):581 -> a
-    21:21:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333 -> a
-    22:22: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):581:581 -> a
-    22:22:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333 -> a
-    23:32:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1334:1343 -> a
-    33:33:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    33:33:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1343 -> a
-    34:42:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1344:1352 -> a
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    43:43:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1352 -> a
-    44:66:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1353:1375 -> a
-    67:67:void com.android.tools.r8.graph.DexProgramClass.<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):70:70 -> a
-    67:67:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1375 -> a
-    68:68:void com.android.tools.r8.graph.DexProgramClass.<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):52:52 -> a
-    68:68:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1375 -> a
-    69:75:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1392:1398 -> a
-    76:77:boolean checkAllOutlineSitesFoundAgain():1403:1404 -> a
+    21:30:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1334:1343 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    31:31:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1343 -> a
+    32:40:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1344:1352 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    41:41:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1352 -> a
+    42:64:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1353:1375 -> a
+    65:65:void com.android.tools.r8.graph.DexProgramClass.<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):70:70 -> a
+    65:65:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1375 -> a
+    66:66:void com.android.tools.r8.graph.DexProgramClass.<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):52:52 -> a
+    66:66:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1375 -> a
+    67:73:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1392:1398 -> a
+    74:75:boolean checkAllOutlineSitesFoundAgain():1403:1404 -> a
     1:1:com.android.tools.r8.ir.optimize.InliningConstraints access$100(com.android.tools.r8.ir.optimize.Outliner):106:106 -> b
     2:4:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1294:1296 -> b
     5:5:java.util.Set getMethodsSelectedForOutlining():1316:1316 -> b
@@ -37268,7 +37191,7 @@
     4:6:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1266:1268 -> a
     4:6:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1202 -> a
     7:56:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1203:1252 -> a
-    57:57:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    57:57:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     57:57:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1252 -> a
     58:64:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1253:1259 -> a
 com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.D.e.g0:
@@ -37335,7 +37258,7 @@
     5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):767:772 -> 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():335:335 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> 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):945:951 -> a
     39:71:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):957:989 -> a
@@ -37354,14 +37277,14 @@
     105:113:void includeInstruction(com.android.tools.r8.ir.code.Instruction):997:1005 -> c
     105:113:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     105:113:void process():760 -> c
-    114:114:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> c
+    114:114:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     114:114:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006 -> c
     114:114:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     114:114:void process():760 -> c
     115:121:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006:1012 -> c
     115:121:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     115:121:void process():760 -> c
-    122:122:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> c
+    122:122:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     122:122:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006 -> c
     122:122:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     122:122:void process():760 -> c
@@ -37371,7 +37294,7 @@
     132:137:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1023:1028 -> c
     132:137:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     132:137:void process():760 -> c
-    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> c
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     138:138:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1028 -> c
     138:138:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     138:138:void process():760 -> c
@@ -37384,7 +37307,7 @@
     164:172:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1034:1042 -> c
     164:172:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     164:172:void process():760 -> c
-    173:173:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> c
+    173:173:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     173:173:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1028 -> c
     173:173:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     173:173:void process():760 -> c
@@ -37405,7 +37328,7 @@
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):40:40 -> a
     2:9:void removeRedundantInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):489:496 -> a
     2:9:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):41 -> a
-    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     10:10:void removeRedundantInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):497 -> a
     10:10:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):41 -> a
     11:17:void removeRedundantInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):498:504 -> a
@@ -37499,19 +37422,19 @@
     1:2:boolean shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):71:72 -> a
     3:11:boolean couldBeVolatile(com.android.tools.r8.graph.DexField):101:109 -> a
     12:23:void run():113:124 -> a
-    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     24:24:void run():125 -> a
     25:39:void run():126:140 -> a
-    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     40:40:void run():140 -> a
     41:46:void run():141:146 -> a
-    47:47:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    47:47:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     47:47:void run():140 -> a
     48:54:void run():148:154 -> a
-    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     55:55:void run():154 -> a
     56:57:void run():155:156 -> a
-    58:58:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    58:58:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     58:58:void run():154 -> a
     59:127:void run():157:225 -> a
     128:154:void run():200:226 -> a
@@ -37521,14 +37444,14 @@
     164:166:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):297:299 -> a
     164:166:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     164:166:void run():229 -> a
-    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     167:167:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):299 -> a
     167:167:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     167:167:void run():229 -> a
     168:169:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):300:301 -> a
     168:169:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     168:169:void run():229 -> a
-    170:170:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    170:170:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     170:170:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):299 -> a
     170:170:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     170:170:void run():229 -> a
@@ -37560,7 +37483,7 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:12:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:47 -> a
-    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     13:13:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):48 -> a
     14:19:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):49:54 -> a
     20:33: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):81:94 -> a
@@ -37573,17 +37496,17 @@
     59:61:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:57 -> a
     62:69: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):133:140 -> a
     62:69:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    70:70:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    70:70:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     70:70: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):140 -> a
     70:70:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     71:96: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):142:167 -> a
     71:96:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     97:97: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):170 -> a
     97:97:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     98:124: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):172:198 -> a
     98:124:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     125:125: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):140 -> a
     125:125:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     126:128:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):60:62 -> a
@@ -37606,29 +37529,29 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView):71:77 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():81:81 -> a
     2:2:void rewrite(com.android.tools.r8.ir.code.IRCode):85:85 -> a
-    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     3:3:void rewrite(com.android.tools.r8.ir.code.IRCode):86 -> a
     4:29:void rewrite(com.android.tools.r8.ir.code.IRCode):87:112 -> a
-    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     30:30:void rewrite(com.android.tools.r8.ir.code.IRCode):112 -> a
     31:56:void rewrite(com.android.tools.r8.ir.code.IRCode):113:138 -> a
-    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     57:57:void rewrite(com.android.tools.r8.ir.code.IRCode):138 -> a
     58:60:void rewrite(com.android.tools.r8.ir.code.IRCode):138:140 -> a
-    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     61:61:void rewrite(com.android.tools.r8.ir.code.IRCode):141 -> a
     62:65:void rewrite(com.android.tools.r8.ir.code.IRCode):142:145 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     66:66:void rewrite(com.android.tools.r8.ir.code.IRCode):141 -> a
-    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     67:67:void rewrite(com.android.tools.r8.ir.code.IRCode):138 -> a
     68:87:void rewrite(com.android.tools.r8.ir.code.IRCode):150:169 -> a
     88:99:void rewrite(com.android.tools.r8.ir.code.IRCode):168:179 -> a
-    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     100:100:void rewrite(com.android.tools.r8.ir.code.IRCode):112 -> a
     101:102:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):184:185 -> a
     101: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):171 -> a
-    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     103:103:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):185 -> a
     103:103:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     104:124:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):186:206 -> a
@@ -37641,7 +37564,7 @@
     126:126:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     127:137:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):206:216 -> a
     127:137:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
-    138:138:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> a
+    138:138:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
     138:138:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):213 -> a
     138:138:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     139:146:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):218:225 -> a
@@ -37673,7 +37596,7 @@
     251:252:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225:226 -> a
     251:252:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     253:253:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172:172 -> a
-    254:254:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    254:254:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     254:254:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172 -> a
     255:255:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):173:173 -> a
 com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.D.e.q0:
@@ -37735,9 +37658,14 @@
     1:7:com.android.tools.r8.shaking.AppInfoWithLiveness run():80:86 -> a
     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:74:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):103:160 -> a
-    75:75:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> a
-    76:78:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):165:167 -> a
+    17:18:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):103:104 -> a
+    19:19:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    19:19:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):105 -> a
+    20:56:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):107:143 -> a
+    57:57:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    57:57:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):105 -> a
+    58:58:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):107:107 -> a
+    59:61:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):148:150 -> a
 com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.D.e.u0:
 com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.D.e.v0:
     com.android.tools.r8.ir.code.Instruction arrayGet -> b
@@ -37788,7 +37716,7 @@
     220:230:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):360:370 -> a
     231:231:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):369:369 -> a
     232:241:void rewrite(com.android.tools.r8.ir.code.IRCode):374:383 -> a
-    242:242:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    242:242:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     242:242:void rewrite(com.android.tools.r8.ir.code.IRCode):384 -> a
     243:245:void rewrite(com.android.tools.r8.ir.code.IRCode):385:387 -> a
     246:255: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):439:448 -> a
@@ -37799,23 +37727,22 @@
     289:297:void rewrite(com.android.tools.r8.ir.code.IRCode):408:416 -> a
     298:318: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,java.util.Set,java.util.Set):536:556 -> a
     298:318:void rewrite(com.android.tools.r8.ir.code.IRCode):415 -> a
-    319:319:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):479:479 -> a
-    319:319:void rewrite(com.android.tools.r8.ir.code.IRCode):425 -> a
-    320:320:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> a
-    320:320:void rewrite(com.android.tools.r8.ir.code.IRCode):426 -> a
-    321:323:void rewrite(com.android.tools.r8.ir.code.IRCode):427:429 -> a
-    324:324:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    324:324:void rewrite(com.android.tools.r8.ir.code.IRCode):429 -> a
-    325:327:void rewrite(com.android.tools.r8.ir.code.IRCode):429:431 -> a
-    328:332:void logResults():458:462 -> a
-    333:340:void logResults():459:466 -> a
-    341:346:void logResults():463:468 -> a
-    347:350:void logResults():467:470 -> a
-    351:354:void logResults():469:472 -> a
-    355:355:void logResults():471:471 -> a
-    356:393: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,java.util.Set):483:520 -> a
-    394:401:void replaceOutValueByNull(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):565:572 -> a
-    402:404:void replaceOutValueByNull(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):571:573 -> a
+    319:320:void rewrite(com.android.tools.r8.ir.code.IRCode):425:426 -> a
+    321:321:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    321:321:void rewrite(com.android.tools.r8.ir.code.IRCode):426 -> a
+    322:322:void rewrite(com.android.tools.r8.ir.code.IRCode):426:426 -> a
+    323:323:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> a
+    323:323:void rewrite(com.android.tools.r8.ir.code.IRCode):428 -> a
+    324:326:void rewrite(com.android.tools.r8.ir.code.IRCode):429:431 -> a
+    327:331:void logResults():458:462 -> a
+    332:339:void logResults():459:466 -> a
+    340:345:void logResults():463:468 -> a
+    346:349:void logResults():467:470 -> a
+    350:353:void logResults():469:472 -> a
+    354:354:void logResults():471:471 -> a
+    355:392: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,java.util.Set):483:520 -> a
+    393:400:void replaceOutValueByNull(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):565:572 -> a
+    401:403:void replaceOutValueByNull(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):571:573 -> a
     1:8:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):307:314 -> b
     9:9:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> b
     9:9:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):314 -> b
@@ -37855,41 +37782,41 @@
     38:38:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
     38:38:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> a
     38:38:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    39:49:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222:232 -> a
-    39:49:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    50:50:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
-    50:50:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):236 -> a
-    50:50:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    51:63:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):237:249 -> a
-    51:63:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    64:64:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    64:64:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> a
-    64:64:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    65:84:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):287:306 -> a
-    85:85:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    85:85:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):306 -> a
-    86:97:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):307:318 -> a
-    98:98:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
-    98:98:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):320 -> a
-    99:101:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):321:323 -> a
-    102:109:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):319:326 -> a
-    110:113:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):333:336 -> a
-    114:114:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    114:114:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):336 -> a
-    115:123:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):336:344 -> a
-    124:124:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    124:124:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):344 -> a
-    125:131:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):345:351 -> a
-    1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):255:272 -> b
-    19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):271:276 -> b
+    39:45:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222:228 -> a
+    39:45:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    46:46:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):275:275 -> a
+    46:46:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):229 -> a
+    46:46:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    47:59:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):230:242 -> a
+    47:59:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    60:60:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    60:60:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> a
+    60:60:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    61:80:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):280:299 -> a
+    81:81:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    81:81:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):299 -> a
+    82:93:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):300:311 -> a
+    94:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
+    94:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):313 -> a
+    95:97:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):314:316 -> a
+    98:105:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):312:319 -> a
+    106:109:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):326:329 -> a
+    110:110:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    110:110:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):329 -> a
+    111:119:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):329:337 -> a
+    120:120:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    120:120:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):337 -> a
+    121:127:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):338:344 -> a
+    1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):248:265 -> b
+    19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):264:269 -> b
     1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):217:217 -> c
 com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.D.e.z0:
 com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.D.e.A0:
     java.util.BitSet used -> a
-    1:3:void <init>():354:356 -> <init>
-    4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):354:354 -> <init>
-    1:1:java.util.BitSet getUsedArguments():359:359 -> a
-    2:2:boolean register(int):364:364 -> a
+    1:3:void <init>():347:349 -> <init>
+    4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):347:347 -> <init>
+    1:1:java.util.BitSet getUsedArguments():352:352 -> a
+    2:2:boolean register(int):357:357 -> a
 com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.D.e.B0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> b
     com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool methodPool -> a
@@ -37954,13 +37881,13 @@
     31:31:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):193 -> a
     32:33:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):265:266 -> a
     32:33:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):193 -> a
-    34:34:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
+    34:34:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     34:34: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):172 -> a
     35:81: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):172:218 -> a
     82:84:void logIneligibleUser(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionOrPhi):77:79 -> a
     82:84: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):218 -> a
     85:94: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):223:232 -> a
-    95:95:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> a
+    95:95:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1089:1089 -> a
     95:95: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):233 -> a
     96:97: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):234:235 -> a
     98:98:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
@@ -38004,18 +37931,18 @@
     29:45:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):101:117 -> a
     1:13:com.android.tools.r8.ir.code.Value getOrCreateOutValue(com.android.tools.r8.ir.code.BasicBlock):69:81 -> b
     14:24:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):123:133 -> b
-    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     25:25:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):133 -> b
     26:26:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):133:133 -> b
-    27:27:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    27:27:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     27:27:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):133 -> b
     28:38:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):142:152 -> b
     39:39:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> b
     39:39:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):152 -> b
-    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> b
+    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> b
     40:40:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151 -> b
     41:45:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151:155 -> b
-    46:46:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> b
+    46:46:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
     46:46:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):155 -> b
     47:50:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):157:160 -> b
 com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.D.e.F0.d:
@@ -38040,10 +37967,10 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):94:94 -> <init>
     2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):78:101 -> <init>
     1:1:int getEstimatedCombinedSizeForInlining():105:105 -> a
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     2:2:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):589 -> a
     3:3:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):589:589 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     4:4:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):589 -> a
     5:34:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):262:291 -> a
     35:47:com.android.tools.r8.graph.DexEncodedMethod findSingleTarget(com.android.tools.r8.ir.code.InvokeMethod):962:974 -> a
@@ -38051,7 +37978,7 @@
     48:85:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):293:330 -> a
     86:93:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):800:807 -> a
     86:93:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     94:94:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807 -> a
     94:94:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     95:102:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807:814 -> a
@@ -38059,7 +37986,7 @@
     103:103:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
     103:103:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):814 -> a
     103:103:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    104:104:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    104:104:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     104:104:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807 -> a
     104:104:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     105:105:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):819:819 -> a
@@ -38067,14 +37994,14 @@
     106:107:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):847:848 -> a
     106:107:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     106:107:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     108:108:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):848 -> a
     108:108:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     108:108:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     109:116:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):849:856 -> a
     109:116:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     109:116:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    117:117:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    117:117:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     117:117:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):848 -> a
     117:117:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     117:117:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
@@ -38083,14 +38010,14 @@
     130:133:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):340:343 -> a
     134:136:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):280:282 -> a
     137:137:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370:370 -> a
-    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     138:138:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
     139:139:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370:370 -> a
-    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     140:140:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
     141:147:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):409:415 -> a
     141:147:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
-    148:148:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    148:148:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     148:148:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):415 -> a
     148:148:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
     149:154:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):416:421 -> a
@@ -38132,10 +38059,10 @@
     408:408:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):710:710 -> a
     409:445:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleVirtualMethodCall(boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):720:756 -> a
     446:451:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):760:765 -> a
-    452:452:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    452:452:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     452:452:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):765 -> a
     453:453:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):765:765 -> a
-    454:454:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    454:454:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     454:454:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):765 -> a
     455:458:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):769:772 -> a
     459:489:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):869:899 -> a
@@ -38149,10 +38076,10 @@
     540:541:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1008:1009 -> a
     1:103:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():148:250 -> b
     104:104:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():234:234 -> b
-    105:105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    105:105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     105:105:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):696 -> b
     106:106:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):696:696 -> b
-    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     107:107:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):696 -> b
     108:121:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):939:952 -> b
     108:121:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):956 -> b
@@ -38178,16 +38105,15 @@
     1:1:com.android.tools.r8.ir.optimize.info.DefaultCallSiteOptimizationInfo getInstance():16:16 -> d
 com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.D.e.G0.c:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
-    1:1:void <clinit>():12:12 -> <clinit>
-    1:1:void <init>():14:14 -> <init>
+    1:1:void <clinit>():11:11 -> <clinit>
+    1:1:void <init>():13:13 -> <init>
     boolean cannotBeKept() -> b
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType() -> c
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType() -> d
-    int getReadBits() -> e
-    boolean isDefaultFieldOptimizationInfo() -> f
-    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():22:22 -> h
-    boolean valueHasBeenPropagated() -> i
-    1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():17:17 -> j
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType() -> c
+    int getReadBits() -> d
+    boolean isDefaultFieldOptimizationInfo() -> e
+    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():21:21 -> g
+    boolean valueHasBeenPropagated() -> h
+    1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():16:16 -> i
 com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.D.e.G0.d:
     boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> m
     boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> p
@@ -38253,16 +38179,15 @@
     1:1:boolean mayHaveSideEffects():201:201 -> y
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():77:77 -> z
 com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.D.e.G0.e:
-    1:1:void <init>():10:10 -> <init>
+    1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
     boolean cannotBeKept() -> b
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType() -> c
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType() -> d
-    int getReadBits() -> e
-    boolean isDefaultFieldOptimizationInfo() -> f
-    boolean isMutableFieldOptimizationInfo() -> g
-    com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> h
-    boolean valueHasBeenPropagated() -> i
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType() -> c
+    int getReadBits() -> d
+    boolean isDefaultFieldOptimizationInfo() -> e
+    boolean isMutableFieldOptimizationInfo() -> f
+    com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> g
+    boolean valueHasBeenPropagated() -> h
 com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.D.e.G0.g:
     long getReturnedConstantNumber() -> A
     com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility() -> B
@@ -38308,142 +38233,94 @@
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():63:63 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView):68:71 -> <init>
-    1:1: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):79:79 -> a
-    2:6:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):194:198 -> a
-    2: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):80 -> a
-    7:13:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage collectParameterUsages(int,com.android.tools.r8.ir.code.Value):214:220 -> a
-    7:13:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):201 -> a
-    7:13: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):80 -> a
-    14:21:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):203:210 -> a
-    14:21: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):80 -> a
-    22:22:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):206:206 -> a
-    22:22: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):80 -> a
-    23:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):225:242 -> a
-    23: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):81 -> a
-    41:41:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    41:41:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):245 -> a
-    41:41: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):81 -> a
-    42:61:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):246:265 -> a
-    42:61: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):81 -> a
-    62:64: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):82:84 -> a
-    65:68:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):476:479 -> a
-    65:68: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):84 -> a
-    69:75:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):478:484 -> a
-    69: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):84 -> a
-    76:76:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):483:483 -> 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):84 -> a
-    77:85: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):732:740 -> a
-    77:85: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):86 -> a
-    86:86:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    86:86: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):740 -> a
-    86:86: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):86 -> a
-    87:94: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):743:750 -> a
-    87:94: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):86 -> a
-    95:101:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):757:763 -> a
-    95:101: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):87 -> a
-    102:102:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    102:102:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):758 -> a
-    102:102: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):87 -> a
-    103:103: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):88:88 -> a
-    104:110:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):838:844 -> a
-    104:110: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):89 -> a
-    111:133:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):851:873 -> a
-    111:133: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):90 -> a
-    134:165:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):878:909 -> a
-    134:165: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):91 -> a
-    166:211: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):931:976 -> a
-    166:211:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):910 -> a
-    166:211: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):91 -> a
-    212:217:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):916:921 -> a
-    212:217: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):91 -> a
-    218:218:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    218:218:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):842 -> a
-    218:218: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):89 -> a
-    219:280:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):109:170 -> a
-    281:281:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):169:169 -> a
-    282:285:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):144:147 -> a
-    286:286:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    286:286:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):147 -> a
-    287:287:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):151:151 -> a
-    288:288:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    288:288:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):151 -> a
-    289:289:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    289:289:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):147 -> a
-    290:323:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):155:188 -> a
-    324:324:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    324:324:boolean lambda$identifyClassInlinerEligibility$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):170 -> a
-    325:325:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):496:496 -> a
-    326:342: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):499:515 -> a
-    343:401:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):527:585 -> a
-    402:441:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):546:585 -> a
-    442:454:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):573:585 -> a
-    455:455:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):596:596 -> a
-    456:460: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):599:603 -> a
-    461:476:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):679:694 -> a
-    461:476: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):605 -> a
-    477:496: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):606:625 -> a
-    497:502: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):624:629 -> a
-    503:510:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):713:720 -> a
-    503:510: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):629 -> a
-    511:531: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):630:650 -> a
-    532:534:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):702:704 -> a
-    535:546:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):771:782 -> a
-    547:558: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:53 -> a
-    547:558:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    559:559:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    559:559: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):53 -> a
-    559:559:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    560:563: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):54:57 -> a
-    560:563:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    564:564: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):539:539 -> a
-    564:564: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
-    564:564:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    565:573: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
-    565:573:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    574:574: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:59 -> a
-    574:574:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    575:575:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    575:575: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):53 -> a
-    575:575:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    576:589: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):72:85 -> a
-    576:589:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    590:645: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
-    590:645:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    646:646:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():32:32 -> a
-    646:646:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):784 -> a
-    647:648:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):785:786 -> a
-    649:649:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():28:28 -> a
-    649:649:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):787 -> a
-    650:650:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):788:788 -> a
-    651:651:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():32:32 -> a
-    651:651:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):784 -> a
-    652:655:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):793:796 -> a
-    656:664:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):815:823 -> a
-    656:664:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):796 -> a
-    665:669:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):804:808 -> a
-    670:670:boolean lambda$computeMayHaveSideEffects$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):805:805 -> a
-    1:24:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):271:294 -> b
-    25:25:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):394:394 -> b
-    25:25:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):294 -> b
-    26:26:boolean com.android.tools.r8.graph.DexClass.definesFinalizer(com.android.tools.r8.graph.DexItemFactory):801:801 -> b
-    26:26:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):394 -> b
-    26:26:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):294 -> b
-    27:100:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):398:471 -> b
-    27:100:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):294 -> b
-    101:161:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):307:367 -> b
-    101:161:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):295 -> b
-    162:223:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):313:374 -> b
-    162:223:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):295 -> b
-    224:224:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):291:291 -> b
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):67:70 -> <init>
+    1:57:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):109:165 -> a
+    58:101:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):140:183 -> a
+    102:105:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):445:448 -> a
+    106:112:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):447:453 -> a
+    113:113:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):452:452 -> a
+    114:114:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):465:465 -> a
+    115:131:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$0(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):468:484 -> a
+    132:190:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):496:554 -> a
+    191:230:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):515:554 -> a
+    231:243:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):542:554 -> a
+    244:244:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):565:565 -> a
+    245:249:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):568:572 -> a
+    250:265:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):648:663 -> a
+    250:265:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):574 -> a
+    266:285:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):575:594 -> a
+    286:291:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):593:598 -> a
+    292:299:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):682:689 -> a
+    292:299:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):598 -> a
+    300:320:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):599:619 -> a
+    321:323:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):671:673 -> a
+    324:332: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):701:709 -> a
+    333:333:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    333:333: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):709 -> a
+    334:341: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):712:719 -> a
+    342:348:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):726:732 -> a
+    349:349:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    349:349:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):727 -> a
+    350:350:boolean lambda$computeMayHaveSideEffects$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):774:774 -> a
+    351:382:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):847:878 -> a
+    383:428: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):900:945 -> a
+    383:428:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):879 -> a
+    429:434:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):885:890 -> a
+    1:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):216:255 -> b
+    41:52:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):740:751 -> b
+    53:62: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):41:50 -> b
+    53:62:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    63:63: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):50 -> b
+    63:63:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    64:67: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):51:54 -> b
+    64:67:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    68:68: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):539:539 -> b
+    68:68: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):55 -> b
+    68:68:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    69:77: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):55:63 -> b
+    69:77:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    78:78: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):56:56 -> b
+    78:78:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    79:79:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    79:79: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):50 -> b
+    79:79:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    80:93: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):69:82 -> b
+    80:93:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    94:149: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):75:130 -> b
+    94:149:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    150:150:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> b
+    150:150:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):753 -> b
+    151:152:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):754:755 -> b
+    153:153:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():27:27 -> b
+    153:153:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):756 -> b
+    154:154:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):757:757 -> b
+    155:155:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> b
+    155:155:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):753 -> b
+    156:159:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):762:765 -> b
+    160:168:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):784:792 -> b
+    160:168:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):765 -> b
+    169:173:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):773:777 -> b
+    1:17:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):261:277 -> c
+    18:87:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):371:440 -> c
+    18:87:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):277 -> c
+    88:144:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):290:346 -> c
+    88:144:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):278 -> c
+    145:202:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):296:353 -> c
+    145:202:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):278 -> c
+    203:203:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):274:274 -> c
+    204:226:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):820:842 -> c
+    1:7:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):807:813 -> d
+    8:8:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> d
+    8:8:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):811 -> d
 com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.D.e.G0.h:
     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>():669:672 -> <clinit>
-    1:1:void <init>(java.lang.String,int):668:668 -> <init>
+    1:4:void <clinit>():638:641 -> <clinit>
+    1:1:void <init>(java.lang.String,int):637:637 -> <init>
 com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo -> com.android.tools.r8.D.e.G0.m:
     java.util.Map callSiteInfos -> b
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection cachedRepresentative -> c
@@ -38502,40 +38379,36 @@
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType(int):38:38 -> a
     1:1:int hashCode():43:43 -> hashCode
 com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.D.e.G0.n:
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicUpperBoundType -> e
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement dynamicLowerBoundType -> d
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicType -> d
     boolean cannotBeKept -> b
     boolean valueHasBeenPropagated -> c
     int readBits -> a
-    1:7:void <init>():21:27 -> <init>
+    1:6:void <init>():20:25 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
-    1:5:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):31:35 -> a
-    6:6:void joinReadBits(int):53:53 -> a
-    7:7:void setDynamicLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):71:71 -> a
-    8:8:void setDynamicUpperBoundType(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):80:80 -> a
-    1:1:boolean cannotBeKept():58:58 -> b
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():67:67 -> c
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType():76:76 -> d
-    1:1:int getReadBits():49:49 -> e
-    boolean isMutableFieldOptimizationInfo() -> g
-    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():41:41 -> h
-    2:2:boolean cannotBeKept():58:58 -> h
-    2:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():42 -> h
-    3:3:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():42:42 -> h
-    4:4:boolean valueHasBeenPropagated():85:85 -> h
-    4:4:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():43 -> h
-    5:5:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():43:43 -> h
-    1:1:boolean valueHasBeenPropagated():85:85 -> i
-    1:1:void markAsPropagated():89:89 -> j
-    1:1:void markCannotBeKept():62:62 -> k
+    1:2:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):29:30 -> a
+    3:3:void joinReadBits(int):48:48 -> a
+    4:4:void setDynamicType(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):66:66 -> a
+    1:1:boolean cannotBeKept():53:53 -> b
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType():62:62 -> c
+    1:1:int getReadBits():44:44 -> d
+    boolean isMutableFieldOptimizationInfo() -> f
+    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():36:36 -> g
+    2:2:boolean cannotBeKept():53:53 -> g
+    2:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():37 -> g
+    3:3:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():37:37 -> g
+    4:4:boolean valueHasBeenPropagated():71:71 -> g
+    4:4:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():38 -> g
+    5:5:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():38:38 -> g
+    1:1:boolean valueHasBeenPropagated():71:71 -> h
+    1:1:void markAsPropagated():75:75 -> i
+    1:1:void markCannotBeKept():57:57 -> j
 com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.D.e.G0.p:
     1:1:void <init>():20:20 -> <init>
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void com.android.tools.r8.ir.conversion.FieldOptimizationFeedback.markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField) -> a
     void com.android.tools.r8.ir.conversion.FieldOptimizationFeedback.markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
-    void com.android.tools.r8.ir.conversion.FieldOptimizationFeedback.markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement) -> a
-    void com.android.tools.r8.ir.conversion.FieldOptimizationFeedback.markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
+    void com.android.tools.r8.ir.conversion.FieldOptimizationFeedback.markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
@@ -38576,46 +38449,44 @@
     java.util.Map fieldOptimizationInfos -> a
     java.util.Map methodOptimizationInfos -> b
     java.util.Map processed -> c
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:8:void <init>():26:33 -> <init>
-    1:2:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):61:62 -> a
-    3:3:boolean lambda$updateVisibleOptimizationInfo$0(java.util.Map$Entry):70:70 -> a
-    4:9:boolean noUpdatesLeft():87:92 -> a
-    10:10:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):105:105 -> a
-    11:11:void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):111:111 -> a
-    12:12:void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):116:116 -> a
-    13:13:void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int):121:121 -> a
-    14:15:void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):144:145 -> a
-    16:16:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):150:150 -> a
-    17:17:void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long):155:155 -> a
-    18:18:void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):160:160 -> a
-    19:19:void methodReturnsObjectOfType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):166:166 -> a
-    20:20:void methodReturnsObjectWithLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):172:172 -> a
-    21:21:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):202:202 -> a
-    22:22:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):213:213 -> a
-    23:23:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):225:225 -> a
-    24:24:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):230:230 -> a
-    25:25:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):241:241 -> a
-    26:26:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):251:251 -> a
-    27:27:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):256:256 -> a
-    1:2:void updateVisibleOptimizationInfo():69:70 -> b
-    3:17:void updateVisibleOptimizationInfo():69:83 -> b
-    18:18:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):71:71 -> b
-    19:19:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):100:100 -> b
-    20:20:void markForceInline(com.android.tools.r8.graph.DexEncodedMethod):128:128 -> b
-    21:21:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):219:219 -> b
-    22:22:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):246:246 -> b
-    1:6:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getFieldOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedField):37:42 -> c
-    7:7:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):133:133 -> c
-    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):138:138 -> d
-    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):207:207 -> e
-    1:1:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):187:187 -> f
-    1:1:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):182:182 -> g
-    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):177:177 -> h
-    1:1:void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod):192:192 -> i
-    1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):235:235 -> j
-    1:6:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):48:53 -> k
+    1:8:void <init>():25:32 -> <init>
+    1:2:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):60:61 -> a
+    3:4:void updateVisibleOptimizationInfo():68:69 -> a
+    5:19:void updateVisibleOptimizationInfo():68:82 -> a
+    20:20:boolean lambda$updateVisibleOptimizationInfo$0(java.util.Map$Entry):69:69 -> a
+    21:21:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):94:94 -> a
+    22:22:void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):99:99 -> a
+    23:23:void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int):104:104 -> a
+    24:25:void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):127:128 -> a
+    26:26:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):133:133 -> a
+    27:27:void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long):138:138 -> a
+    28:28:void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):143:143 -> a
+    29:29:void methodReturnsObjectOfType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):149:149 -> a
+    30:30:void methodReturnsObjectWithLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):155:155 -> a
+    31:31:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):185:185 -> a
+    32:32:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):196:196 -> a
+    33:33:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):208:208 -> a
+    34:34:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):213:213 -> a
+    35:35:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):224:224 -> a
+    36:36:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):234:234 -> a
+    37:37:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):239:239 -> a
+    1:1:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):70:70 -> b
+    2:2:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):89:89 -> b
+    3:3:void markForceInline(com.android.tools.r8.graph.DexEncodedMethod):111:111 -> b
+    4:4:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):202:202 -> b
+    5:5:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):229:229 -> b
+    1:6:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getFieldOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedField):36:41 -> c
+    7:7:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):116:116 -> c
+    8:8:void com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo.markInlinedIntoSingleCallSite():0:0 -> c
+    8:8:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):116 -> c
+    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):121:121 -> d
+    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):190:190 -> e
+    1:1:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):170:170 -> f
+    1:1:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):165:165 -> g
+    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):160:160 -> h
+    1:1:void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> i
+    1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):218:218 -> j
+    1:6:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):47:52 -> k
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.D.e.G0.s:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
@@ -38624,8 +38495,7 @@
     void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField) -> a
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
-    void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement) -> a
-    void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
+    void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
     void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
@@ -38659,8 +38529,7 @@
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
-    void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement) -> a
-    void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
+    void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
     void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
     void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long) -> a
@@ -38673,46 +38542,39 @@
     void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer) -> a
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple getInstance():27:27 -> a
     2:2:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):39:39 -> a
-    3:3:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):136:136 -> a
+    3:3:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):130:130 -> a
     void markForceInline(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
     void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> b
     1:1:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):34:34 -> b
-    1:1:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):67:67 -> c
-    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> d
-    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):141:141 -> e
+    1:1:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):61:61 -> c
+    2:2:void com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo.markInlinedIntoSingleCallSite():0:0 -> c
+    2:2:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):61 -> c
+    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):66:66 -> d
+    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):135:135 -> e
     void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> f
     void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> g
     void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> h
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> i
-    1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):167:167 -> j
+    1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):161:161 -> j
 com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.D.e.G0.w:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> a
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:5:void <init>(java.util.List):32:36 -> <init>
-    6:6:void <init>(java.util.List):35:35 -> <init>
-    1:1:java.lang.Integer lambda$new$0(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage):36:36 -> a
-    2:3:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsage(int):40:41 -> a
-    1:2:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):49:50 -> b
-    3:3:java.lang.Object com.android.tools.r8.utils.ListUtils.last(java.util.List):20:20 -> b
-    3:3:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):50 -> b
-    4:8:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):50:54 -> b
-    9:10:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage.copyAndShift(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,int):109:110 -> b
-    9:10:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):55 -> b
-    11:24:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):55:68 -> b
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:5:void <init>(java.util.List):31:35 -> <init>
+    6:6:void <init>(java.util.List):34:34 -> <init>
+    1:1:java.lang.Integer lambda$new$0(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage):35:35 -> a
+    2:3:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsage(int):39:40 -> a
 com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.D.e.G0.u:
     java.util.List callsReceiver -> c
     boolean hasFieldRead -> e
     boolean isAssignedToField -> f
     boolean isReturned -> g
-    boolean $assertionsDisabled -> h
     java.util.Set ifZeroTest -> b
     int index -> a
     boolean hasFieldAssignment -> d
-    1:1:void <clinit>():71:71 -> <clinit>
-    1:10:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean):96:105 -> <init>
-    1:1:boolean notUsed():121:121 -> a
+    1:10:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean):72:81 -> <init>
+    1:1:boolean notUsed():85:85 -> a
 com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.D.e.G0.v:
     boolean $assertionsDisabled -> i
     java.util.Set ifZeroTestTypes -> c
@@ -38723,195 +38585,143 @@
     boolean isAssignedToField -> g
     boolean isReturned -> h
     int index -> a
-    1:1:void <clinit>():130:130 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,int):142:142 -> <init>
-    2:12:void <init>(com.android.tools.r8.ir.code.Value,int):134:144 -> <init>
-    1:6:boolean note(com.android.tools.r8.ir.code.Instruction):149:154 -> a
-    7:9:boolean note(com.android.tools.r8.ir.code.If):183:185 -> a
-    7:9:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    10:10:boolean note(com.android.tools.r8.ir.code.If):185 -> a
-    10:10:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    11:11:boolean note(com.android.tools.r8.ir.code.If):185:185 -> a
-    11:11:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    12:12:boolean note(com.android.tools.r8.ir.code.If):185 -> a
-    12:12:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    13:15:boolean note(com.android.tools.r8.ir.code.If):184:186 -> a
-    13:15:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    16:16:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.code.If.asIf():0:0 -> a
-    16:16:boolean note(com.android.tools.r8.ir.code.If):183 -> a
-    16:16:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    17:18:boolean note(com.android.tools.r8.ir.code.Instruction):156:157 -> a
-    19:20:boolean note(com.android.tools.r8.ir.code.InstanceGet):193:194 -> a
-    19:20:boolean note(com.android.tools.r8.ir.code.Instruction):157 -> a
-    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    21:21:boolean note(com.android.tools.r8.ir.code.InstanceGet):194 -> a
-    21:21:boolean note(com.android.tools.r8.ir.code.Instruction):157 -> a
-    22:23:boolean note(com.android.tools.r8.ir.code.InstanceGet):194:195 -> a
-    22:23:boolean note(com.android.tools.r8.ir.code.Instruction):157 -> a
-    24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    24:24:boolean note(com.android.tools.r8.ir.code.InstanceGet):194 -> a
-    24:24:boolean note(com.android.tools.r8.ir.code.Instruction):157 -> a
-    25:26:boolean note(com.android.tools.r8.ir.code.Instruction):159:160 -> a
-    27:28:boolean note(com.android.tools.r8.ir.code.InstancePut):202:203 -> a
-    27:28:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    29:29:boolean note(com.android.tools.r8.ir.code.InstancePut):203 -> a
-    29:29:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    30:32:boolean note(com.android.tools.r8.ir.code.InstancePut):203:205 -> a
-    30:32:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    33:33:boolean note(com.android.tools.r8.ir.code.InstancePut):205 -> a
-    33:33:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    34:34:boolean note(com.android.tools.r8.ir.code.InstancePut):205:205 -> a
-    34:34:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    35:35:boolean note(com.android.tools.r8.ir.code.InstancePut):205 -> a
-    35:35:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    36:36:boolean note(com.android.tools.r8.ir.code.InstancePut):208:208 -> a
-    36:36:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    37:37:boolean note(com.android.tools.r8.ir.code.InstancePut):208 -> a
-    37:37:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    38:39:boolean note(com.android.tools.r8.ir.code.InstancePut):208:209 -> a
-    38:39:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    40:40:boolean note(com.android.tools.r8.ir.code.InstancePut):208 -> a
-    40:40:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    41:41:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    41:41:boolean note(com.android.tools.r8.ir.code.InstancePut):203 -> a
-    41:41:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    42:46:boolean note(com.android.tools.r8.ir.code.Instruction):162:166 -> a
-    47:48:boolean note(com.android.tools.r8.ir.code.Return):228:229 -> a
-    47:48:boolean note(com.android.tools.r8.ir.code.Instruction):166 -> a
-    49:49:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    49:49:boolean note(com.android.tools.r8.ir.code.Return):229 -> a
-    49:49:boolean note(com.android.tools.r8.ir.code.Instruction):166 -> a
-    50:50:boolean note(com.android.tools.r8.ir.code.Return):229:229 -> a
-    50:50:boolean note(com.android.tools.r8.ir.code.Instruction):166 -> a
-    51:51:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    51:51:boolean note(com.android.tools.r8.ir.code.Return):229 -> a
-    51:51:boolean note(com.android.tools.r8.ir.code.Instruction):166 -> a
-    52:54:boolean note(com.android.tools.r8.ir.code.Return):228:230 -> a
-    52:54:boolean note(com.android.tools.r8.ir.code.Instruction):166 -> a
-    55:55:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage build():172:172 -> a
-    56:56:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):217:217 -> a
-    57:62:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):216:221 -> a
-    63:63:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):218:218 -> a
-    64:64:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    64:64:boolean lambda$note$0(com.android.tools.r8.ir.code.Value):217 -> a
-    65:65:boolean lambda$note$0(com.android.tools.r8.ir.code.Value):217:217 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    66:66:boolean lambda$note$0(com.android.tools.r8.ir.code.Value):217 -> a
+    1:1:void <clinit>():94:94 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,int):106:106 -> <init>
+    2:12:void <init>(com.android.tools.r8.ir.code.Value,int):98:108 -> <init>
+    1:2:boolean note(com.android.tools.r8.ir.code.Instruction):113:114 -> a
+    3:5:boolean note(com.android.tools.r8.ir.code.If):143:145 -> a
+    3:5:boolean note(com.android.tools.r8.ir.code.Instruction):114 -> a
+    6:6:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.code.If.asIf():0:0 -> a
+    6:6:boolean note(com.android.tools.r8.ir.code.If):143 -> a
+    6:6:boolean note(com.android.tools.r8.ir.code.Instruction):114 -> a
+    7:8:boolean note(com.android.tools.r8.ir.code.Instruction):116:117 -> a
+    9:11:boolean note(com.android.tools.r8.ir.code.InstanceGet):152:154 -> a
+    9:11:boolean note(com.android.tools.r8.ir.code.Instruction):117 -> a
+    12:13:boolean note(com.android.tools.r8.ir.code.Instruction):119:120 -> a
+    14:21:boolean note(com.android.tools.r8.ir.code.InstancePut):161:168 -> a
+    14:21:boolean note(com.android.tools.r8.ir.code.Instruction):120 -> a
+    22:23:boolean note(com.android.tools.r8.ir.code.Instruction):122:123 -> a
+    24:28:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):175:179 -> a
+    24:28:boolean note(com.android.tools.r8.ir.code.Instruction):123 -> a
+    29:29:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):176:176 -> a
+    29:29:boolean note(com.android.tools.r8.ir.code.Instruction):123 -> a
+    30:31:boolean note(com.android.tools.r8.ir.code.Instruction):125:126 -> a
+    32:33:boolean note(com.android.tools.r8.ir.code.Return):186:187 -> a
+    32:33:boolean note(com.android.tools.r8.ir.code.Instruction):126 -> a
+    34:34:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage build():132:132 -> a
 com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.D.e.G0.x:
-    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer trivialInitializerInfo -> u
-    long returnedConstantNumber -> k
-    boolean neverReturnsNormally -> i
-    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference inlining -> p
-    boolean useIdentifierNameString -> q
-    boolean triggersClassInitBeforeAnySideEffect -> s
-    java.util.BitSet nonNullParamOnNormalExits -> y
-    boolean mayHaveSideEffects -> f
-    boolean neverReturnsNull -> h
-    boolean returnValueHasBeenPropagated -> A
+    boolean returnsConstantNumber -> i
+    boolean returnsConstantString -> k
+    boolean initializerEnablingJavaAssertions -> u
+    int returnedArgument -> d
+    boolean checksNullReceiverBeforeAnySideEffect -> q
+    java.util.BitSet nonNullParamOrThrow -> w
+    java.util.Set initializedClassesOnNormalExit -> c
+    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility classInlinerEligibility -> s
+    boolean reachabilitySensitive -> y
+    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement returnsObjectWithLowerBoundType -> n
+    boolean returnValueOnlyDependsOnArguments -> f
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement returnsObjectOfType -> m
+    boolean neverReturnsNormally -> h
+    boolean $assertionsDisabled -> A
+    com.android.tools.r8.graph.DexString returnedConstantString -> l
     boolean classInitializerMayBePostponed -> b
-    boolean returnsConstantNumber -> j
-    boolean returnsConstantString -> l
-    boolean initializerEnablingJavaAssertions -> v
-    int returnedArgument -> e
-    boolean checksNullReceiverBeforeAnySideEffect -> r
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement returnsObjectWithLowerBoundType -> o
-    com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo parametersUsages -> w
-    java.util.BitSet nonNullParamOrThrow -> x
-    java.util.Set initializedClassesOnNormalExit -> d
-    boolean reachabilitySensitive -> z
-    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility classInlinerEligibility -> t
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement returnsObjectOfType -> n
-    boolean returnValueOnlyDependsOnArguments -> g
+    com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo parametersUsages -> v
+    long returnedConstantNumber -> j
+    boolean useIdentifierNameString -> p
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference inlining -> o
+    boolean triggersClassInitBeforeAnySideEffect -> r
+    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer trivialInitializerInfo -> t
+    java.util.BitSet nonNullParamOnNormalExits -> x
+    boolean returnValueHasBeenPropagated -> z
+    boolean mayHaveSideEffects -> e
+    boolean neverReturnsNull -> g
     boolean cannotBeKept -> a
-    boolean $assertionsDisabled -> B
-    com.android.tools.r8.graph.DexString returnedConstantString -> m
-    boolean hasBeenInlinedIntoSingleCallSite -> c
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:1:void <init>():81:81 -> <init>
-    2:59:void <init>():22:79 -> <init>
-    60:60:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):87:87 -> <init>
-    61:153:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):22:114 -> <init>
-    1:2:long getReturnedConstantNumber():255:256 -> A
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():250:250 -> B
-    1:1:java.util.Set getInitializedClassesOnNormalExit():174:174 -> C
-    1:1:boolean isInitializerEnablingJavaAssertions():267:267 -> D
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():179:179 -> E
-    1:1:java.util.BitSet getNonNullParamOrThrow():189:189 -> F
-    1:54:void adjustOptimizationInfoAfterRemovingThisParameter():455:508 -> G
-    1:1:void markAsPropagated():438:438 -> H
-    1:1:void markCannotBeKept():150:150 -> I
-    1:1:void markClassInitializerMayBePostponed():159:159 -> J
-    1:2:void markForceInline():405:406 -> K
-    1:1:void markInlinedIntoSingleCallSite():203:203 -> L
-    1:1:void markMayNotHaveSideEffects():344:344 -> M
-    1:2:void markNeverInline():419:420 -> N
-    1:1:void markNeverReturnsNormally():356:356 -> O
-    1:1:void markNeverReturnsNull():352:352 -> P
-    1:1:void markReturnValueOnlyDependsOnArguments():348:348 -> Q
-    1:1:void markUseIdentifierNameString():425:425 -> R
-    1:1:void setInitializerEnablingJavaAssertions():330:330 -> S
-    1:6:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):119:124 -> a
-    7:7:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):184:184 -> a
-    8:8:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):306:306 -> a
-    9:9:void setNonNullParamOnNormalExits(java.util.BitSet):314:314 -> a
-    10:10:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):322:322 -> a
-    11:11:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):326:326 -> a
-    12:12:void markInitializesClassesOnNormalExit(java.util.Set):334:334 -> a
-    13:17:void markReturnsConstantNumber(long):360:364 -> a
-    18:22:void markReturnsConstantString(com.android.tools.r8.graph.DexString):368:372 -> a
-    23:32:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):376:385 -> a
-    33:36:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):384:387 -> a
-    37:43:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):391:397 -> a
-    44:49:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):394:399 -> a
-    50:50:void markCheckNullReceiverBeforeAnySideEffect(boolean):429:429 -> a
-    51:52:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():448:449 -> a
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():194:194 -> b
-    2:2:void setNonNullParamOrThrow(java.util.BitSet):310:310 -> b
-    3:5:void markReturnsArgument(int):338:340 -> b
-    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):433:433 -> b
-    1:1:boolean cannotBeKept():145:145 -> c
-    2:2:void setReachabilitySensitive(boolean):318:318 -> c
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():287:287 -> d
-    1:1:boolean returnValueHasBeenPropagated():443:443 -> e
-    1:1:boolean classInitializerMayBePostponed():155:155 -> f
-    1:2:int getReturnedArgument():218:219 -> g
-    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():261:262 -> h
-    1:1:boolean returnValueOnlyDependsOnArguments():302:302 -> i
-    1:1:boolean neverInline():282:282 -> j
-    1:1:boolean neverReturnsNormally():229:229 -> k
-    1:2:boolean returnsConstant():234:235 -> l
-    1:1:boolean returnsConstantString():245:245 -> m
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicReturnType():164:164 -> n
-    1:1:boolean useIdentifierNameString():272:272 -> o
-    1:1:boolean triggersClassInitBeforeAnySideEffect():292:292 -> p
-    1:1:boolean returnsConstantNumber():240:240 -> q
-    1:1:boolean returnsArgument():213:213 -> r
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>():83:83 -> <init>
+    2:58:void <init>():25:81 -> <init>
+    59:59:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):87:87 -> <init>
+    60:143:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):25:108 -> <init>
+    1:2:long getReturnedConstantNumber():249:250 -> A
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():244:244 -> B
+    1:1:java.util.Set getInitializedClassesOnNormalExit():168:168 -> C
+    1:1:boolean isInitializerEnablingJavaAssertions():261:261 -> D
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():173:173 -> E
+    1:1:java.util.BitSet getNonNullParamOrThrow():183:183 -> F
+    1:41:void adjustOptimizationInfoAfterRemovingThisParameter():444:484 -> G
+    1:1:void markAsPropagated():427:427 -> H
+    1:1:void markCannotBeKept():144:144 -> I
+    1:1:void markClassInitializerMayBePostponed():153:153 -> J
+    1:2:void markForceInline():394:395 -> K
+    1:1:void markMayNotHaveSideEffects():338:338 -> L
+    1:2:void markNeverInline():408:409 -> M
+    1:1:void markNeverReturnsNormally():350:350 -> N
+    1:1:void markNeverReturnsNull():346:346 -> O
+    1:1:void markReturnValueOnlyDependsOnArguments():342:342 -> P
+    1:1:void markUseIdentifierNameString():414:414 -> Q
+    1:1:void setInitializerEnablingJavaAssertions():324:324 -> R
+    1:6:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):113:118 -> a
+    7:7:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):178:178 -> a
+    8:8:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):300:300 -> a
+    9:9:void setNonNullParamOnNormalExits(java.util.BitSet):308:308 -> a
+    10:10:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):316:316 -> a
+    11:11:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):320:320 -> a
+    12:12:void markInitializesClassesOnNormalExit(java.util.Set):328:328 -> a
+    13:17:void markReturnsConstantNumber(long):354:358 -> a
+    18:22:void markReturnsConstantString(com.android.tools.r8.graph.DexString):362:366 -> a
+    23:29:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):370:376 -> a
+    30:36:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):380:386 -> a
+    37:42:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):383:388 -> a
+    43:43:void markCheckNullReceiverBeforeAnySideEffect(boolean):418:418 -> a
+    44:45:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():437:438 -> a
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():188:188 -> b
+    2:2:void setNonNullParamOrThrow(java.util.BitSet):304:304 -> b
+    3:5:void markReturnsArgument(int):332:334 -> b
+    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):422:422 -> b
+    1:1:boolean cannotBeKept():139:139 -> c
+    2:2:void setReachabilitySensitive(boolean):312:312 -> c
+    1:1:boolean checksNullReceiverBeforeAnySideEffect():281:281 -> d
+    1:1:boolean returnValueHasBeenPropagated():432:432 -> e
+    1:1:boolean classInitializerMayBePostponed():149:149 -> f
+    1:2:int getReturnedArgument():212:213 -> g
+    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():255:256 -> h
+    1:1:boolean returnValueOnlyDependsOnArguments():296:296 -> i
+    1:1:boolean neverInline():276:276 -> j
+    1:1:boolean neverReturnsNormally():223:223 -> k
+    1:2:boolean returnsConstant():228:229 -> l
+    1:1:boolean returnsConstantString():239:239 -> m
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicReturnType():158:158 -> n
+    1:1:boolean useIdentifierNameString():266:266 -> o
+    1:1:boolean triggersClassInitBeforeAnySideEffect():286:286 -> p
+    1:1:boolean returnsConstantNumber():234:234 -> q
+    1:1:boolean returnsArgument():207:207 -> r
     boolean isUpdatableMethodOptimizationInfo() -> s
-    1:1:boolean neverReturnsNull():224:224 -> t
-    1:1:boolean isReachabilitySensitive():208:208 -> u
+    1:1:boolean neverReturnsNull():218:218 -> t
+    1:1:boolean isReachabilitySensitive():202:202 -> u
     com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> v
-    1:1:boolean forceInline():277:277 -> w
+    1:1:boolean forceInline():271:271 -> w
     boolean isDefaultMethodOptimizationInfo() -> x
-    1:1:boolean mayHaveSideEffects():297:297 -> y
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():169:169 -> z
+    1:1:boolean mayHaveSideEffects():291:291 -> y
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():163:163 -> z
 com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.D.e.H0.a:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:3:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):20:22 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     4:4:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):22 -> a
     5:5:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):23:23 -> a
-    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     6:6:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):22 -> a
-    7:11:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:36 -> a
-    12:12:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):34:34 -> a
+    7:7:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:32 -> a
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    8:8:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():243 -> a
+    8:8:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32 -> a
+    9:9:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:32 -> a
+    10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    10:10:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():243 -> a
+    10:10:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32 -> a
+    11:14:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):33:36 -> a
+    15:15: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.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.H0.b:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -38928,9 +38738,8 @@
     void reportCallerNotSameNest() -> c
     void reportWillExceedInstructionBudget(int,int) -> c
     void reportCallerNotSamePackage() -> d
-    void reportWillExceedMaxInliningDepth(int,int) -> d
+    void reportWillExceedMonitorEnterValuesBudget(int,int) -> d
     void reportCallerNotSubtype() -> e
-    void reportWillExceedMonitorEnterValuesBudget(int,int) -> e
     void reportClasspathMethod() -> f
     void reportInaccessible() -> g
     void reportInlineeDoesNotHaveCode() -> h
@@ -38951,7 +38760,7 @@
     void reportReceiverMaybeNull() -> w
     void reportRecursiveMethod() -> x
     void reportUnknownTarget() -> y
-    boolean unsetReasonHasBeenReportedFlag() -> z
+    boolean verifyReasonHasBeenReported() -> z
 com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.H0.c:
     1:1:void <init>():18:18 -> <init>
     void reportBlacklisted() -> a
@@ -38967,9 +38776,8 @@
     void reportCallerNotSameNest() -> c
     void reportWillExceedInstructionBudget(int,int) -> c
     void reportCallerNotSamePackage() -> d
-    void reportWillExceedMaxInliningDepth(int,int) -> d
+    void reportWillExceedMonitorEnterValuesBudget(int,int) -> d
     void reportCallerNotSubtype() -> e
-    void reportWillExceedMonitorEnterValuesBudget(int,int) -> e
     void reportClasspathMethod() -> f
     void reportInaccessible() -> g
     void reportInlineeDoesNotHaveCode() -> h
@@ -38990,7 +38798,7 @@
     void reportReceiverMaybeNull() -> w
     void reportRecursiveMethod() -> x
     void reportUnknownTarget() -> y
-    boolean unsetReasonHasBeenReportedFlag() -> z
+    boolean verifyReasonHasBeenReported() -> z
 com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.D.e.H0.d:
     com.android.tools.r8.graph.DexEncodedMethod callee -> a
     boolean $assertionsDisabled -> e
@@ -39016,9 +38824,8 @@
     1:1:void reportCallerNotSameNest():62:62 -> c
     2:2:void reportWillExceedInstructionBudget(int,int):242:242 -> c
     1:1:void reportCallerNotSamePackage():67:67 -> d
-    2:2:void reportWillExceedMaxInliningDepth(int,int):251:251 -> d
+    2:2:void reportWillExceedMonitorEnterValuesBudget(int,int):252:252 -> d
     1:1:void reportCallerNotSubtype():74:74 -> e
-    2:2:void reportWillExceedMonitorEnterValuesBudget(int,int):261:261 -> e
     1:1:void reportClasspathMethod():82:82 -> f
     1:1:void reportInaccessible():87:87 -> g
     1:1:void reportInlineeDoesNotHaveCode():102:102 -> h
@@ -39039,7 +38846,7 @@
     1:1:void reportReceiverMaybeNull():204:204 -> w
     1:1:void reportRecursiveMethod():209:209 -> x
     1:1:void reportUnknownTarget():214:214 -> y
-    1:2:boolean unsetReasonHasBeenReportedFlag():270:271 -> z
+    1:1:boolean verifyReasonHasBeenReported():261:261 -> z
 com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.D.e.I0.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
@@ -39064,84 +38871,56 @@
 com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.D.e.I0.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.graph.DexEncodedMethod context -> j
+    com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy NoOp -> j
+    boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.IRCode code -> g
     com.android.tools.r8.ir.code.InstructionListIterator instructions -> i
-    com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy NoOp -> k
-    boolean $assertionsDisabled -> l
     java.util.function.Function strategyProvider -> d
     com.android.tools.r8.kotlin.Kotlin kotlin -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaChecker -> e
     java.util.ListIterator blocks -> h
     com.android.tools.r8.graph.DexEncodedMethod method -> f
-    1:29:void <clinit>():47:75 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):160:160 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):169:178 -> <init>
+    1:29:void <clinit>():46:74 -> <clinit>
+    1:9:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):155:163 -> <init>
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut) -> a
-    1:2:com.android.tools.r8.ir.code.InstructionListIterator instructions():182:183 -> a
-    3:3:boolean shouldRewrite(com.android.tools.r8.graph.DexType):206:206 -> a
-    4:23:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):211:230 -> a
-    4:23:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):47 -> a
-    24:24:boolean shouldRewrite(com.android.tools.r8.graph.DexMethod):201:201 -> a
-    24:24:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):230 -> a
-    24:24:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):47 -> a
-    25:34:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):231:240 -> a
-    25:34:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):47 -> a
-    35:39:java.lang.Void visit(com.android.tools.r8.ir.code.NewInstance):246:250 -> a
-    35:39:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):47 -> a
-    40:40:java.lang.Void visit(com.android.tools.r8.ir.code.CheckCast):258:258 -> a
-    40:40:java.lang.Object visit(com.android.tools.r8.ir.code.CheckCast):47 -> a
-    41:41:java.lang.Void visit(com.android.tools.r8.ir.code.NewArrayEmpty):264:264 -> a
-    41:41:java.lang.Object visit(com.android.tools.r8.ir.code.NewArrayEmpty):47 -> a
-    42:42:java.lang.Void visit(com.android.tools.r8.ir.code.ConstClass):270:270 -> a
-    42:42:java.lang.Object visit(com.android.tools.r8.ir.code.ConstClass):47 -> a
-    43:43:java.lang.Void visit(com.android.tools.r8.ir.code.ConstMethodType):276:276 -> a
-    43:43:java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodType):47 -> a
-    44:44:java.lang.Void visit(com.android.tools.r8.ir.code.ConstMethodHandle):282:282 -> a
-    44:44:java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodHandle):47 -> a
-    45:47:java.lang.Void visit(com.android.tools.r8.ir.code.InstanceGet):288:290 -> a
-    45:47:java.lang.Object visit(com.android.tools.r8.ir.code.InstanceGet):47 -> a
-    48:48:boolean shouldRewrite(com.android.tools.r8.graph.DexField):197:197 -> a
-    48:48:java.lang.Void visit(com.android.tools.r8.ir.code.InstanceGet):291 -> a
-    48:48:java.lang.Object visit(com.android.tools.r8.ir.code.InstanceGet):47 -> a
-    49:57:java.lang.Void visit(com.android.tools.r8.ir.code.InstanceGet):293:301 -> a
-    49:57:java.lang.Object visit(com.android.tools.r8.ir.code.InstanceGet):47 -> a
-    58:60:java.lang.Void visit(com.android.tools.r8.ir.code.InstancePut):307:309 -> a
-    58:60:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):47 -> a
-    61:61:boolean shouldRewrite(com.android.tools.r8.graph.DexField):197:197 -> a
-    61:61:java.lang.Void visit(com.android.tools.r8.ir.code.InstancePut):310 -> a
-    61:61:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):47 -> a
-    62:70:java.lang.Void visit(com.android.tools.r8.ir.code.InstancePut):312:320 -> a
-    62:70:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):47 -> a
-    71:73:java.lang.Void visit(com.android.tools.r8.ir.code.StaticGet):326:328 -> a
-    71:73:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):47 -> a
-    74:74:boolean shouldRewrite(com.android.tools.r8.graph.DexField):197:197 -> a
-    74:74:java.lang.Void visit(com.android.tools.r8.ir.code.StaticGet):329 -> a
-    74:74:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):47 -> a
-    75:79:java.lang.Void visit(com.android.tools.r8.ir.code.StaticGet):331:335 -> a
-    75:79:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):47 -> a
-    80:82:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):342:344 -> a
-    80:82:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):47 -> a
-    83:83:boolean shouldRewrite(com.android.tools.r8.graph.DexField):197:197 -> a
-    83:83:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):345 -> a
-    83:83:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):47 -> a
-    84:88:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):347:351 -> a
-    84:88:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):47 -> a
-    1:5:void processCode():187:191 -> b
+    1:2:com.android.tools.r8.ir.code.InstructionListIterator instructions():167:168 -> a
+    3:32:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):183:212 -> a
+    3:32:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):46 -> a
+    33:37:java.lang.Void visit(com.android.tools.r8.ir.code.NewInstance):218:222 -> a
+    33:37:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):46 -> a
+    38:38:java.lang.Void visit(com.android.tools.r8.ir.code.CheckCast):230:230 -> a
+    38:38:java.lang.Object visit(com.android.tools.r8.ir.code.CheckCast):46 -> a
+    39:39:java.lang.Void visit(com.android.tools.r8.ir.code.NewArrayEmpty):236:236 -> a
+    39:39:java.lang.Object visit(com.android.tools.r8.ir.code.NewArrayEmpty):46 -> a
+    40:40:java.lang.Void visit(com.android.tools.r8.ir.code.ConstClass):242:242 -> a
+    40:40:java.lang.Object visit(com.android.tools.r8.ir.code.ConstClass):46 -> a
+    41:41:java.lang.Void visit(com.android.tools.r8.ir.code.ConstMethodType):248:248 -> a
+    41:41:java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodType):46 -> a
+    42:42:java.lang.Void visit(com.android.tools.r8.ir.code.ConstMethodHandle):254:254 -> a
+    42:42:java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodHandle):46 -> a
+    43:56:java.lang.Void visit(com.android.tools.r8.ir.code.InstanceGet):260:273 -> a
+    43:56:java.lang.Object visit(com.android.tools.r8.ir.code.InstanceGet):46 -> a
+    57:70:java.lang.Void visit(com.android.tools.r8.ir.code.InstancePut):279:292 -> a
+    57:70:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):46 -> a
+    71:80:java.lang.Void visit(com.android.tools.r8.ir.code.StaticGet):298:307 -> a
+    71:80:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):46 -> a
+    81:90:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):314:323 -> a
+    81:90:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):46 -> a
+    1:5:void processCode():172:176 -> b
 com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.D.e.I0.b:
-    1:1:void <init>():76:76 -> <init>
+    1:1:void <init>():75:75 -> <init>
     boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
     boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
-    1:1:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):114:114 -> a
-    2:2:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):119:119 -> a
-    3:3:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InstanceGet):124:124 -> a
-    4:4:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):129:129 -> a
+    1:1:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):113:113 -> a
+    2:2:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):118:118 -> a
+    3:3:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InstanceGet):123:123 -> a
+    4:4:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):128:128 -> a
     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
@@ -39181,7 +38960,7 @@
     11:24:java.lang.String createHash(java.util.List):182:195 -> b
     11:24:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):174 -> b
     25:25:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):174:174 -> b
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     26:26:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):173 -> b
     27:29:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):173:175 -> b
     30:30:java.lang.String createHash(java.util.List):197:197 -> b
@@ -39223,7 +39002,7 @@
     23:23:com.android.tools.r8.graph.DexProgramClass synthesizeClass():55 -> k
 com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.D.e.I0.i:
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup() -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.D.e.I0.q:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.D.e.I0.n:
     java.util.Map lambdas -> a
     java.util.Map groups -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> g
@@ -39232,136 +39011,119 @@
     java.util.Set methodsToReprocess -> d
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.AppView appView -> e
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode mode -> i
     com.android.tools.r8.DiagnosticsHandler reporter -> h
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaInvalidator -> j
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaChecker -> k
-    1:1:void <clinit>():85:85 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):159:159 -> <init>
-    2:44:void <init>(com.android.tools.r8.graph.AppView):125:167 -> <init>
+    java.util.function.BiFunction strategyFactory -> i
+    1:1:void <clinit>():86:86 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):123:123 -> <init>
+    2:44:void <init>(com.android.tools.r8.graph.AppView):89:131 -> <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):85 -> a
-    2:2:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):182:182 -> a
-    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):475 -> 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):85 -> a
-    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):476:476 -> 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):85 -> a
-    4:4:com.android.tools.r8.graph.AppView access$400(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):85:85 -> a
-    5:5:void invalidateLambda(com.android.tools.r8.graph.DexType):174:174 -> a
-    6:6:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):186:186 -> a
-    6:6:void access$600(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):85 -> a
-    7:40:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication):194:227 -> a
-    41:41:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):202:202 -> a
-    42:43:void analyzeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241:242 -> a
-    44:45:void rewriteCodeForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):268:269 -> a
-    46:55:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):280:289 -> a
-    56:76:java.util.Map finalizeLambdaGroups():380:400 -> a
-    56:76:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):293 -> a
-    77:112:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):296:331 -> a
-    113:127:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):330:344 -> a
-    128:128:void lambda$applyLambdaClassMapping$5(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):297:297 -> a
-    129:129:void lambda$applyLambdaClassMapping$7(com.android.tools.r8.graph.DexEncodedMethod):325:325 -> a
-    130:130:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):333:333 -> a
-    131:133:boolean lambda$applyLambdaClassMapping$8(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):335:337 -> a
-    134:138:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):349:353 -> a
-    139:158:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):357:376 -> a
-    159:159:void lambda$analyzeLambdaClassesStructure$12(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):362:362 -> a
-    160:165:void lambda$analyzeLambdaClassesStructure$11(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):364:369 -> a
-    166:171:void lambda$analyzeLambdaClassesStructure$11(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):367:372 -> a
-    172:172:void invalidateLambda(com.android.tools.r8.graph.DexType):174:174 -> a
-    172:172:void lambda$analyzeLambdaClassesStructure$11(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):372 -> a
-    173:179:void removeTrivialLambdaGroups():406:412 -> a
-    180:190:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):420:430 -> a
-    191:204:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):429:442 -> a
-    205:209:java.lang.Object lambda$rewriteLambdaReferences$15(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):432:436 -> a
-    210:216:java.lang.Object lambda$rewriteLambdaReferences$15(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):432:438 -> a
-    217:218:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):446:447 -> a
-    217:218:void lambda$analyzeReferencesInProgramClasses$10(com.android.tools.r8.graph.DexProgramClass):351 -> a
-    219:220:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:109 -> a
-    219:220:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):447 -> a
-    219:220:void lambda$analyzeReferencesInProgramClasses$10(com.android.tools.r8.graph.DexProgramClass):351 -> a
-    221:243:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):448:470 -> a
-    221:243:void lambda$analyzeReferencesInProgramClasses$10(com.android.tools.r8.graph.DexProgramClass):351 -> a
-    244:244:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:108 -> a
-    244:244:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):447 -> a
-    244:244:void lambda$analyzeReferencesInProgramClasses$10(com.android.tools.r8.graph.DexProgramClass):351 -> a
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):85:85 -> b
-    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):178:178 -> b
-    3:4:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):257:258 -> b
-    5:5:com.android.tools.r8.graph.DexType lambda$applyLambdaClassMapping$6(com.android.tools.r8.graph.DexProgramClass):308:308 -> b
-    6:6:void lambda$removeTrivialLambdaGroups$13(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):412:412 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteLambdaReferences$14(com.android.tools.r8.graph.DexEncodedMethod):425:425 -> b
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$800(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):85:85 -> c
-    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):169:169 -> c
-    3:3:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.DexProgramClass):195:195 -> c
-    1:1:java.util.Map access$900(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):85:85 -> d
-    2:4:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):198:200 -> d
-    5:5:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> d
-    5:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):200 -> d
-    6:7:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):200:201 -> d
-    1:13:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):206:218 -> e
-    14:14:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):213:213 -> e
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):146:146 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):408 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):409:409 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    4:4:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> a
+    5:5:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    6:6:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):150:150 -> a
+    6:6:void access$200(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):86 -> a
+    7:40:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):159:192 -> a
+    41:41:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
+    42:42:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):167:167 -> a
+    43:44:void processMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:204 -> a
+    45:54:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):215:224 -> a
+    55:75:java.util.Map finalizeLambdaGroups():313:333 -> a
+    55:75:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):228 -> a
+    76:109:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):231:264 -> a
+    110:124:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):263:277 -> a
+    125:125:void lambda$applyLambdaClassMapping$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):232:232 -> a
+    126:126:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$applyLambdaClassMapping$7(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    127:127:void lambda$applyLambdaClassMapping$8(com.android.tools.r8.graph.DexEncodedMethod):258:258 -> a
+    128:128:boolean lambda$applyLambdaClassMapping$10(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):266:266 -> a
+    129:131:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):268:270 -> a
+    132:136:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):282:286 -> a
+    137:156:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):290:309 -> a
+    157:157:void lambda$analyzeLambdaClassesStructure$13(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):295:295 -> a
+    158:163:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):297:302 -> a
+    164:169:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):300:305 -> a
+    170:170:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    170:170:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):305 -> a
+    171:177:void removeTrivialLambdaGroups():339:345 -> a
+    178:188:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):353:363 -> a
+    189:202:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):362:375 -> a
+    203:207:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:369 -> a
+    208:214:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:371 -> a
+    215:216:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):379:380 -> a
+    215:216:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    217:218:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:109 -> a
+    217:218:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    217:218:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    219:241:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381:403 -> a
+    219:241:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    242:242:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:108 -> a
+    242:242:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    242:242:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$100(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> b
+    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):142:142 -> b
+    3:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):163:165 -> b
+    6:6:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
+    6:6:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165 -> b
+    7:8:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165:166 -> b
+    9:21:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):171:183 -> b
+    22:22:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):178:178 -> b
+    23:23:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$collectGroupCandidates$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):192:192 -> b
+    24:24:void lambda$removeTrivialLambdaGroups$14(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):345:345 -> b
+    25:25:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteLambdaReferences$15(com.android.tools.r8.graph.DexEncodedMethod):358:358 -> b
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$400(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> c
+    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):133:133 -> c
+    1:1:java.util.Map access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> d
 com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.D.e.I0.j:
 com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.D.e.I0.k:
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> m
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):479:479 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):480:484 -> <init>
-    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):481:481 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):483:483 -> a
-    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):491:491 -> a
-    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):496:496 -> a
-    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):501:501 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):506:506 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):511:511 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):516:516 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.D.e.I0.l:
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> a
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):94:94 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):94:94 -> <init>
-    1:1:void analyzeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):98:98 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.D.e.I0.m:
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> c
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> b
-    java.util.Set lambdaGroupsClasses -> a
-    1:3:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Set,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):108:110 -> <init>
-    1:5:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):115:119 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.D.e.I0.n:
-    boolean $assertionsDisabled -> o
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> m
-    java.util.Set typeAffectedValues -> n
-    1:1:void <clinit>():520:520 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):520:520 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):532:534 -> <init>
-    5:5:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):531:531 -> <init>
-    6:20:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):524:538 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):533:533 -> a
-    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):542:544 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):602:602 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):607:607 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):614:614 -> a
-    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):619:619 -> a
-    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):626:626 -> a
-    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):631:631 -> a
-    1:28:void processCode():551:578 -> b
-    29:45:void processCode():577:593 -> b
-    46:46:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):597:597 -> b
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.D.e.I0.o:
+    com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> l
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):412:412 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413:417 -> <init>
+    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):414:414 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):416:416 -> a
+    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):424:424 -> a
+    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):429:429 -> a
+    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):434:434 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):439:439 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):444:444 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):449:449 -> a
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.D.e.I0.l:
+    boolean $assertionsDisabled -> n
+    com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> l
+    java.util.Set typeAffectedValues -> m
+    1:1:void <clinit>():453:453 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):453:453 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):464:466 -> <init>
+    5:5:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):463:463 -> <init>
+    6:18:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):457:469 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):465:465 -> a
+    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):473:475 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):533:533 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):538:538 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):545:545 -> a
+    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):550:550 -> a
+    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):557:557 -> a
+    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):562:562 -> a
+    1:28:void processCode():482:509 -> b
+    29:45:void processCode():508:524 -> b
+    46:46:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):528:528 -> b
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.D.e.I0.m:
     java.util.Map lambdaGroupsClasses -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():635:635 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):640:641 -> <init>
-    1:5:void fixup(com.android.tools.r8.graph.DexEncodedField):658:662 -> a
-    6:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod):668:674 -> a
-    1:1:java.lang.Object apply(java.lang.Object):635:635 -> apply
-    2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):646:650 -> apply
-    2:6:java.lang.Object apply(java.lang.Object):635 -> apply
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.D.e.I0.p:
-    1:1:void <init>():87:87 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):87:87 -> <init>
-    void analyzeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
-    void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.D.e.I0.r:
+    1:1:void <clinit>():566:566 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):571:572 -> <init>
+    1:5:void fixup(com.android.tools.r8.graph.DexEncodedField):589:593 -> a
+    6:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod):599:605 -> a
+    1:1:java.lang.Object apply(java.lang.Object):566:566 -> apply
+    2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):577:581 -> apply
+    2:6:java.lang.Object apply(java.lang.Object):566 -> apply
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.D.e.I0.o:
     java.util.function.Consumer onLambdaType -> c
     java.util.function.Predicate isLambdaType -> b
     boolean $assertionsDisabled -> d
@@ -39399,7 +39161,7 @@
     63:63:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
     63:63:void accept(com.android.tools.r8.graph.DexMethodHandle):83 -> a
     64:65:void accept(com.android.tools.r8.graph.DexMethodHandle):83:84 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.D.e.I0.s.a:
+com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.a:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> m
     com.android.tools.r8.graph.DexItemFactory factory -> l
@@ -39412,35 +39174,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.D.e.I0.s.g:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.D.e.I0.p.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):104:104 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId):106:106 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):111:111 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):117:117 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.D.e.I0.s.b:
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.I0.s.c:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.D.e.I0.p.b:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.I0.p.c:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):180:180 -> <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):191:194 -> a
     5:5:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):195:195 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():185:185 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.I0.s.d:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.I0.p.d:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):152:152 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):157:157 -> a
     2:9:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):164:171 -> a
     10:10:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):167:167 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.I0.s.e:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.I0.p.e:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):130:130 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():145:145 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):135:135 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.s.f:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.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):213:214 -> <init>
     1:6:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:226 -> b
     7:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:221 -> b
     1:1:void prepareSuperConstructorCall(int):219:219 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.s.h:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.p.h:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -39487,29 +39249,29 @@
     32:32:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     33:33:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     33:33:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.D.e.I0.s.n:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.D.e.I0.p.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):110:110 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId):112:112 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):117:117 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):123:123 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.D.e.I0.s.i:
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.I0.s.j:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.D.e.I0.p.i:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.I0.p.j:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):191:191 -> <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):202:208 -> a
     8:8:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):206:206 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():196:196 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.I0.s.k:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.I0.p.k:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):158:158 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):163:163 -> a
     2:14:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):170:182 -> a
     15:15:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):178:178 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.I0.s.l:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.I0.p.l:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):136:136 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():151:151 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):141:141 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.s.m:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.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):227:230 -> <init>
@@ -39518,7 +39280,7 @@
     2:7:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:244 -> b
     8:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:239 -> b
     1:3:void prepareSuperConstructorCall(int):235:237 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.s.o:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.p.o:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -39572,7 +39334,7 @@
     36:36:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     37:37:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     37:37:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.s.p:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.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>
@@ -39581,7 +39343,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.D.e.I0.s.q:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.D.e.I0.p.q:
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> a
@@ -39663,14 +39425,14 @@
     208:208:void accept(java.lang.Object):47 -> accept
     209:228:void accept(com.android.tools.r8.graph.DexClass):96:115 -> accept
     209:228:void accept(java.lang.Object):47 -> accept
-    229:229:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> accept
+    229:229:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> accept
     229:229:void accept(com.android.tools.r8.graph.DexClass):114 -> accept
     229:229:void accept(java.lang.Object):47 -> accept
     230:234:void accept(com.android.tools.r8.graph.DexClass):117:121 -> accept
     230:234:void accept(java.lang.Object):47 -> accept
     235:235:void accept(com.android.tools.r8.graph.DexClass):73:73 -> accept
     235:235:void accept(java.lang.Object):47 -> accept
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.D.e.I0.s.r:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.D.e.I0.p.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
@@ -39683,7 +39445,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.D.e.I0.s.s:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.D.e.I0.p.s:
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategy -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
@@ -39701,7 +39463,7 @@
     9:9:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> a
     9:9:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):78 -> a
     10:10:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):78:78 -> a
-    11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1262:1262 -> a
+    11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
     11:11:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):77 -> a
     1:2:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:47 -> b
     3:3:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:46 -> b
@@ -39710,7 +39472,7 @@
     1:1:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57 -> c
     2:8:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57:63 -> c
     1:1:com.android.tools.r8.graph.DexField getLambdaIdField(com.android.tools.r8.graph.DexItemFactory):67:67 -> d
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1262:1262 -> d
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> d
     2:2:com.android.tools.r8.graph.DexField getLambdaIdField(com.android.tools.r8.graph.DexItemFactory):67 -> d
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> e
     1:1:java.lang.String getTypePackage():52 -> e
@@ -39721,7 +39483,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.D.e.I0.s.t:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.D.e.I0.p.t:
     boolean $assertionsDisabled -> p
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> o
     1:1:void <clinit>():36:36 -> <clinit>
@@ -39751,7 +39513,7 @@
     1:25:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():90:114 -> i
     26:44:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():109:127 -> i
     1:3:java.util.Map collectVirtualMethods():135:137 -> l
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.D.e.I0.s.u:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.D.e.I0.p.u:
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -39763,13 +39525,13 @@
     13:20:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):116:123 -> a
     21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     21:21:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):123 -> a
-    22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     22:22:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122 -> a
     23:28:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122:127 -> a
     29:31:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):132:134 -> a
     32:36:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):212:216 -> a
     32:36:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> 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.TypeLatticeElement):1012:1012 -> 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.TypeLatticeElement):1008:1008 -> a
     37:37:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):216 -> a
     37:37:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     38:47:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):217:226 -> a
@@ -39801,7 +39563,7 @@
     58:66:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     67:67:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):228:228 -> a
     67:67:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
-    68:68:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    68:68: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):40:40 -> a
     68:68:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):228 -> a
     68:68:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     69:69:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):228:228 -> a
@@ -39823,13 +39585,13 @@
     118:121:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):194:197 -> a
     122:122:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     122:122:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):197 -> a
-    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     123:123:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196 -> a
     124:130:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196:202 -> a
     131:134:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):234:237 -> a
     135:135:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     135:135:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):237 -> a
-    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     136:136:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):236 -> a
     1:5:boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):70:74 -> b
     6:15:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):96:105 -> b
@@ -39838,7 +39600,7 @@
     17:17:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):105:105 -> b
     1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):61:64 -> c
     1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):79:79 -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.D.e.I0.s.v:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.D.e.I0.p.v:
     com.android.tools.r8.graph.DexProto mainMethodProto -> g
     com.android.tools.r8.graph.ParameterAnnotationsList mainMethodParamAnnotations -> i
     int innerClassAccess -> k
@@ -39861,7 +39623,7 @@
     8:8:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     8:8:java.lang.String toString():119 -> toString
     9:23:java.lang.String toString():119:133 -> toString
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.s.w:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.p.w:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -39954,7 +39716,7 @@
     11:11:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):61 -> c
     12:18:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):63:69 -> c
     19:24:boolean hasValidAnnotations(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):90:95 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.D.e.I0.s.x:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.D.e.I0.p.x:
     com.android.tools.r8.graph.DexItemFactory factory -> l
     java.util.List implMethods -> n
     com.android.tools.r8.graph.DexField idField -> m
@@ -40151,7 +39913,7 @@
     110:113:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):175:178 -> a
     114:127:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223:236 -> a
     128:134:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):235:241 -> a
-    135:135:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
+    135:135:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     135:135:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246 -> a
     136:145:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246:255 -> a
     146:154: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):341:349 -> a
@@ -40178,23 +39940,23 @@
     257:269:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):472:484 -> a
     257:269:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):288 -> a
     270:302:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):290:322 -> a
-    303:303:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    303:303:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     303:303:boolean lambda$analyzeAllValueUsers$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):510 -> a
     304:322: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):428:446 -> a
-    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     323:323: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):446 -> a
     324:324: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):447:447 -> a
-    325:325:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    325:325:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     325:325: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):446 -> a
     326:327: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):452:453 -> a
     328:328: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):491:491 -> a
-    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     329:329: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):491 -> a
     330:375: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):491:536 -> a
     376:377:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):559:560 -> a
     378:381:void setFixupStrategy(java.util.function.BiConsumer):571:574 -> a
     382:385:void cleanFixupStrategy():578:581 -> a
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     1:1:boolean lambda$isValidInitCall$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):438 -> b
     2:4:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):564:566 -> b
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.D.e.K0.a:
@@ -40322,11 +40084,11 @@
     172:172:void finalEligibilityCheck():156 -> a
     173:183:void finalEligibilityCheck():156:166 -> a
     184:200:void finalEligibilityCheck():165:181 -> a
-    201:201:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
+    201:201:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     201:201:void finalEligibilityCheck():183 -> a
     202:213:void finalEligibilityCheck():183:194 -> a
     214:216:void finalEligibilityCheck():193:195 -> a
-    217:217:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
+    217:217:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     217:217:void finalEligibilityCheck():183 -> a
     218:218:void finalEligibilityCheck():206:206 -> a
     219:219:boolean lambda$finalEligibilityCheck$0(com.android.tools.r8.graph.DexEncodedMethod):148:148 -> a
@@ -40349,28 +40111,28 @@
     280:280:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):278:278 -> a
     280:280:void lambda$rewriteReferences$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):326 -> a
     281:286:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):337:342 -> a
-    287:287:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    287:287:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     287:287:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):343 -> a
     288:289:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):344:345 -> a
-    290:290:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    290:290:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     290:290:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):343 -> a
     291:296:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):352:357 -> a
     297:297:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364:364 -> a
-    298:298:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    298:298:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     298:298:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364 -> a
     299:303:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364:368 -> a
     304:321:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):367:384 -> a
     322:327:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):423:428 -> a
-    328:328:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    328:328:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     328:328:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):429 -> a
     329:335:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):430:436 -> a
-    336:336:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    336:336:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     336:336:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):429 -> a
     337:342:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):441:446 -> a
     343:348:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):454:459 -> a
     349:366:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):458:475 -> a
     367:376:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):479:488 -> a
-    377:377:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    377:377:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     377:377:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):488 -> a
     378:385:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):489:496 -> a
     386:386:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
@@ -40397,10 +40159,10 @@
     405:406: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):678:679 -> a
     407:407: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):677:677 -> a
     1:1:void removeReferencesToThis(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):304:304 -> b
-    1:1:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> c
+    1:1:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> c
     1:1:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310 -> c
     2:22:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310:330 -> c
-    23:23:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> c
+    23:23:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
     23:23:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):502 -> c
     23:23:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     24:37:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):503:516 -> c
@@ -40426,7 +40188,7 @@
     75:75:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     76:80:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):542:546 -> c
     76:80:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    81:81:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> c
+    81:81:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> c
     81:81:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310 -> c
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.L0.a:
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer -> com.android.tools.r8.D.e.L0.g:
@@ -40523,16 +40285,16 @@
     54:54:boolean com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration.isBuilderInit(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):801:801 -> a
     54:54: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):904 -> a
     55:56: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):939:940 -> a
-    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     57:57: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):940 -> a
     58:59: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):941:942 -> a
-    60:60:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    60:60:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     60:60: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):940 -> a
     61:62: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):945:946 -> a
-    63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     63:63: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):946 -> a
     64:65: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):947:948 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     66:66: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):946 -> a
     67:67: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):952:952 -> a
     68:68:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):882:882 -> a
@@ -40550,7 +40312,7 @@
     372:372:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.IRCode):206:206 -> <init>
     1:28:java.util.Set findAllLocalBuilders():217:244 -> a
     1:28:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
-    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     29:29:java.util.Set findAllLocalBuilders():244 -> a
     29:29:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
     30:32:java.util.Set collectAllLinkedBuilders(com.android.tools.r8.ir.code.Value):257:259 -> a
@@ -40558,7 +40320,7 @@
     30:32:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
     33:36:java.util.Set findAllLocalBuilders():245:248 -> a
     33:36:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     37:37:java.util.Set findAllLocalBuilders():244 -> a
     37:37:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
     38:38:java.util.Set findAllLocalBuilders():253:253 -> a
@@ -40574,20 +40336,20 @@
     89:91: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
     92:93:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):362:363 -> a
     92:93: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
-    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     94:94:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):363 -> a
     94:94: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
     95:99:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):364:368 -> a
     95:99: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
-    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     100:100:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):368 -> a
     100:100:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     101:110:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):369:378 -> a
     101:110: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
-    111:111:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    111:111:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     111:111:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):368 -> a
     111:111: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
-    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     112:112:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):363 -> a
     112:112: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
     113:113:boolean com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration.isBuilderInitWithInitialValue(com.android.tools.r8.ir.code.InvokeMethod):813:813 -> a
@@ -40595,30 +40357,30 @@
     113:113: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
     114:120:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):383:389 -> a
     114:120: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
-    121:121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    121:121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     121:121:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):389 -> a
     121:121: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
     122:125:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):392:395 -> a
     122:125: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
-    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     126:126:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):395 -> a
     126:126: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
     127:136:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):396:405 -> a
     127:136: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
-    137:137:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    137:137:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     137:137:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):395 -> a
     137:137: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
-    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     138:138:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):389 -> a
     138:138: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
     139:140:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):408:409 -> a
     139:140: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
-    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     141:141:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):409 -> a
     141:141: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
     142:151:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):412:421 -> a
     142:151: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
-    152:152:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    152:152:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     152:152:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):409 -> a
     152: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):432:461 -> a
@@ -40627,10 +40389,10 @@
     211:227:void logHistogramOfChains(java.util.List,boolean):548:564 -> a
     228:228:void logHistogramOfChains(java.util.List,boolean):559:559 -> a
     229:230:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):575:576 -> a
-    231:231:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    231:231:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     231:231:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     232:239:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):577:584 -> a
-    240:240:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    240:240:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     240:240:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):584 -> a
     241:269:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):585:613 -> a
     270:275:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):611:616 -> a
@@ -40638,22 +40400,22 @@
     280:284:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):588:592 -> a
     285:289:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):590:594 -> a
     290:298:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):593:601 -> a
-    299:299:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    299:299:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     299:299:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):584 -> a
     300:301:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):621:622 -> a
     302:302:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     302:302:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622 -> a
     303:303:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622:622 -> a
-    304:304:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    304:304:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     304:304:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     305:314:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):628:637 -> a
     305:314:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
-    315:315:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    315:315:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     315:315:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):637 -> a
     315:315:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
     316:332:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):638:654 -> a
     316:332:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
-    333:333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    333:333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     333:333:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):637 -> a
     333:333:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
     334:379:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):666:711 -> a
@@ -40661,44 +40423,44 @@
     380:383:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):712 -> a
     384:384:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):713:713 -> a
     385:391:void removeTrivialBuilders():728:734 -> a
-    392:392:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    392:392:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     392:392:void removeTrivialBuilders():734 -> a
     393:399:void removeTrivialBuilders():735:741 -> a
-    400:400:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    400:400:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     400:400:void removeTrivialBuilders():741 -> a
     401:402:void removeTrivialBuilders():741:742 -> a
-    403:403:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    403:403:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     403:403:void removeTrivialBuilders():741 -> a
     404:404:void removeTrivialBuilders():747:747 -> a
-    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     405:405:void removeTrivialBuilders():747 -> a
     406:412:void removeTrivialBuilders():748:754 -> a
-    413:413:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    413:413:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     413:413:void removeTrivialBuilders():754 -> a
     414:415:void removeTrivialBuilders():754:755 -> a
-    416:416:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    416:416:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     416:416:void removeTrivialBuilders():754 -> a
     417:421:void removeTrivialBuilders():758:762 -> a
-    422:422:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    422:422:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     422:422:void removeTrivialBuilders():762 -> a
     423:424:void removeTrivialBuilders():762:763 -> a
-    425:425:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    425:425:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     425:425:void removeTrivialBuilders():762 -> a
     426:426:void removeTrivialBuilders():767:767 -> a
-    427:427:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    427:427:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     427:427:void removeTrivialBuilders():767 -> a
     428:433:void removeTrivialBuilders():767:772 -> a
-    434:434:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    434:434:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     434:434:void removeTrivialBuilders():767 -> a
     435:435:void removeTrivialBuilders():777:777 -> a
-    436:436:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    436:436:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     436:436:void removeTrivialBuilders():777 -> a
     437:446:void removeTrivialBuilders():778:787 -> a
-    447:447:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    447:447:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     447:447:void removeTrivialBuilders():777 -> a
-    448:448:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    448:448:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     448:448:void removeTrivialBuilders():747 -> a
-    449:449:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    449:449:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     449:449:void removeTrivialBuilders():734 -> 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):469:507 -> b
@@ -40726,58 +40488,58 @@
     38:39:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:101 -> a
     40: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
-    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     45:45:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):137 -> a
     46:58:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):138:150 -> a
-    59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     59:59:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):150 -> a
     60:65:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):151:156 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     66:66:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):156 -> a
     67:75:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):157:165 -> a
-    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     76:76:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):165 -> a
     77:79:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):166:168 -> a
-    80:80:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    80:80:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     80:80:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):165 -> a
     81:96:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):172:187 -> a
     97:102:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):185:190 -> a
     103:105:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):189:191 -> a
-    106:106:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    106:106:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     106:106:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):156 -> a
-    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     107:107:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):150 -> a
     108:109:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):195:196 -> a
-    110:110:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    110:110:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     110:110:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):196 -> a
     111:119:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):197:205 -> a
     120:125:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):203:208 -> a
-    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     126:126:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):196 -> a
     127:167:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):215:255 -> a
-    168:168:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    168:168:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     168:168:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):255 -> a
     169:180:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):256:267 -> a
-    181:181:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
+    181:181:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
     181:181:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):268 -> a
     182:183:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):270:271 -> a
-    184:184:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    184:184:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     184:184:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):271 -> a
     185:190:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):272:277 -> a
-    191:191:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
+    191:191:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
     191:191:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):278 -> a
-    192:192:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    192:192:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     192:192:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):271 -> a
     193:195:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):280:282 -> a
-    196:196:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    196:196:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     196:196:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):282 -> a
     197:202:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):283:288 -> a
-    203:203:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
+    203:203:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
     203:203:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):289 -> a
     204:205:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):292:293 -> a
-    206:206:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    206:206:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     206:206:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):282 -> a
-    207:207:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    207:207:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     207:207:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):255 -> a
     208:209:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):296:297 -> a
     210:210:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
@@ -40787,10 +40549,10 @@
     216:216:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):235:235 -> a
     217:217:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):241:241 -> a
     218:221:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):304:307 -> a
-    222:222:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    222:222:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     222:222:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):309 -> a
     223:252:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):310:339 -> a
-    253:253:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    253:253:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     253:253:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):339 -> a
     254:283:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):340:369 -> a
     284:284:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
@@ -40811,7 +40573,7 @@
     394:395:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):453:454 -> a
     396:404:void logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):501:509 -> a
     396:404:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):456 -> a
-    405:405:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    405:405:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     405:405:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):339 -> a
     406:407:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):461:462 -> a
     408:408:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
@@ -40827,7 +40589,7 @@
     9:9:java.lang.Integer lambda$computeTrivialOperationsOnConstString$15(com.android.tools.r8.graph.DexString,java.lang.Integer):245:245 -> b
     10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):470:475 -> b
     16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):517:517 -> b
-    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> b
+    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> b
     17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):518 -> b
     18:38:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):519:539 -> b
     39:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):537:580 -> b
@@ -40849,16 +40611,16 @@
     1:1:void <init>():590:590 -> <init>
     1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():593:593 -> a
     2:17: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):602:617 -> a
-    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     18:18: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):617 -> a
     19:19: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):618:618 -> a
-    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     20:20: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):617 -> a
     21:22:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):620:621 -> a
-    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     23:23: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):621 -> a
     24:24: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):622:622 -> a
-    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     25:25: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):621 -> a
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> com.android.tools.r8.D.f.c:
     com.android.tools.r8.graph.AppView appView -> a
@@ -40879,541 +40641,541 @@
     java.util.List inactive -> l
     int firstParallelMoveTemporary -> p
     java.util.List active -> k
-    1:1:void <clinit>():87:87 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):189:189 -> <init>
-    2:57:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):143:198 -> <init>
+    1:1:void <clinit>():85:85 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):187:187 -> <init>
+    2:57:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):141:196 -> <init>
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
     boolean longHalfOverlappingLong(int,int) -> a
-    1:19:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):249:267 -> a
-    20:46:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):265:291 -> a
-    47:47:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    47:47:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):292 -> a
-    48:52:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):293:297 -> a
-    53:53:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    53:53:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):300 -> a
-    54:62:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):302:310 -> a
-    63:63:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    63:63:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):310 -> a
-    64:89:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):311:336 -> a
-    90:90:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
-    90:90:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):336 -> a
-    91:93:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):337:339 -> a
-    94:102:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):461:469 -> a
-    94:102:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    103:103:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
-    103:103:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):469 -> a
-    103:103:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    104:124:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):471:491 -> a
-    104:124:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    125:125:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    125:125:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):494 -> a
-    125:125:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    126:126:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):494:494 -> a
-    126:126:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    127:127:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    127:127:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):496 -> a
-    127:127:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    128:130:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):462:464 -> a
-    128:130:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    131:131: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
-    131:131:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):464 -> a
-    131:131:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    132:132:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):464:464 -> a
-    132:132:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    133:133:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):347:347 -> a
-    134:134:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    134:134:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):348 -> a
-    135:156:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):349:370 -> a
-    157:157:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    157:157:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):371 -> a
-    158:197:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):372:411 -> a
-    198:198:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    198:198:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):414 -> a
-    199:200:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):417:418 -> a
-    201:201:int lambda$computeDebugInfo$0(com.android.tools.r8.ir.regalloc.LiveRange):261:261 -> a
-    202:203:boolean lambda$computeDebugInfo$2(java.util.Set,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):319:320 -> a
-    204:204:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):425:425 -> a
-    205:206:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):430:431 -> a
-    205:206:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):425 -> a
-    207:208:boolean usesValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):436:437 -> a
-    207:208:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):432 -> a
-    207:208:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):425 -> a
-    209:215:boolean valuesContain(com.android.tools.r8.ir.code.Value,java.util.Collection):441:447 -> a
-    216:239:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):504:527 -> a
-    240:259:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):510:529 -> a
-    260:264:void addRegisterIfUsed(java.util.Set,com.android.tools.r8.ir.regalloc.LiveIntervals):576:580 -> a
-    265:277:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):600:612 -> a
-    278:279:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):797:798 -> a
-    278:279:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):614 -> a
-    280:282:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):605:607 -> a
-    283:283:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    283:283:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    283:283:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):607 -> a
-    284:284:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):607:607 -> a
-    285:285:com.android.tools.r8.utils.InternalOptions options():627:627 -> a
-    286:286:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):645:645 -> a
-    287:298:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):778:789 -> a
-    287:298:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):648 -> a
-    299:299:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):649:649 -> a
-    300:308:void pinArgumentRegisters():2946:2954 -> a
-    300:308:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):652 -> a
-    309:309:void pinArgumentRegisters():2951:2951 -> a
-    309:309:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):652 -> a
-    310:371:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):826:887 -> a
-    310:371:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    372:372:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    372:372:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):888 -> a
-    372:372:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    373:394:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):893:914 -> a
-    373:394:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    395:401:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1054:1060 -> a
-    395:401:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> a
-    395:401:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    402:402:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    402:402:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1060 -> a
-    402:402:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> a
-    402:402:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    403:404:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1061:1062 -> a
-    403:404:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> a
-    403:404:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    405:411:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1073:1079 -> a
-    405:411:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
-    405:411:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    412:412:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    412:412:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1079 -> a
-    412:412:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
-    412:412:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    413:418:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1080:1085 -> a
-    413:418:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
-    413: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):340:340 -> a
-    419:419:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1085 -> 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:420:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1086:1086 -> a
-    420:420:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
-    420:420:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    421:486:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1101:1166 -> a
-    421:486:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):922 -> a
-    421:486:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    487:536:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):923:972 -> a
-    487:536:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    537:549:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1608:1620 -> a
-    537:549:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    537:549:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    550:552:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    550:552:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1621 -> a
-    550:552:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    550:552:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    553:562:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1626:1635 -> a
-    553:562:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    553:562:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    563:563:com.android.tools.r8.utils.InternalOptions options():627:627 -> a
-    563:563:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1637 -> a
-    563:563:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    563:563:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    564:609:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1637:1682 -> a
-    564:609:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    564:609:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    610:610:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    610:610:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1683 -> a
-    610:610:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    610:610:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    611:615:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1684:1688 -> a
-    611:615:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    611:615:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    616:616:int toInstructionPosition(int):1390:1390 -> a
-    616:616:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1688 -> a
-    616:616:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    616:616:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    617:628:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1693:1704 -> a
-    617:628:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    617:628:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    629:637:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1027:1035 -> a
-    629:637:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1704 -> a
-    629:637:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    629:637:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    638:668:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1783:1813 -> a
-    638:668:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1707 -> a
-    638:668:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    638:668:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    669:697:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1713:1741 -> a
-    669:697:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    669:697:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    698:700:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    698:700:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
-    698:700:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    698:700:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    701:701:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1743:1743 -> a
-    701:701:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    701:701:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    702:720:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1982:2000 -> a
-    702:720:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    702:720:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    702:720:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    721:730:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1999:2008 -> a
-    721:730:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    721:730:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    721:730:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    731:731:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    731:731:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2009 -> a
-    731:731:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    731:731:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    731:731:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    732:804:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2010:2082 -> a
-    732:804:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    732:804:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    732:804:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    805:812:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1255:1262 -> a
-    805:812:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2084 -> a
-    805:812:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    805:812:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    805:812:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    813:813:void increaseCapacity(int):2960:2960 -> a
-    813:813:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1262 -> a
-    813:813:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2084 -> a
-    813:813:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    813:813:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    813:813:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    814:816:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    814:816:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2085 -> a
-    814:816:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    814:816:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    814:816:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    817:823:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2086:2092 -> a
-    817:823:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    817:823:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    817:823:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    824:824:void increaseCapacity(int):2960:2960 -> a
-    824:824:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2093 -> a
-    824:824:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    824:824:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    824:824:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    825:832:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2096:2103 -> a
-    825:832:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    825:832:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    825:832:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    833:834:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1750:1751 -> a
-    833:834:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    833:834:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    835:835:void increaseCapacity(int):2960:2960 -> a
-    835:835:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1752 -> a
-    835:835:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    835:835:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    836:836:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1755:1755 -> a
-    836:836:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    836:836:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    837:839:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    837:839:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1757 -> a
-    837:839:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    837:839:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    840:848:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1759:1767 -> a
-    840:848:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    840:848:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    849:851:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    849:851:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1768 -> a
-    849:851:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    849: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):1769:1769 -> 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:898:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):656:701 -> a
-    899:909:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674:684 -> a
-    910:910:com.android.tools.r8.utils.InternalOptions options():627:627 -> a
-    910:910:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):685 -> a
-    911:914:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):685:688 -> a
-    915:915:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):662:662 -> a
-    916:916:com.android.tools.r8.utils.InternalOptions options():627:627 -> a
-    916:916:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):663 -> a
-    917:923:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):663:669 -> a
-    924:964:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):666:706 -> a
-    965:968:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):705:708 -> a
-    969:969:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):707:707 -> a
-    970:977:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):764:771 -> a
-    978:982:int realRegisterNumberFromAllocated(int):816:820 -> a
-    983:1021:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode) -> a
-    1022:1023:void lambda$invariantsHold$3(java.util.TreeSet,int):991:992 -> a
-    1024:1030:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1175:1181 -> a
-    1031:1031:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1031:1031:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1182 -> a
-    1032:1032:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1183:1183 -> a
-    1033:1043:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1180:1190 -> a
-    1044:1047:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1238:1241 -> a
-    1044:1047:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
-    1048:1048:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1048:1048:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1245 -> a
-    1048:1048:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
-    1049:1049:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1244:1244 -> a
-    1049:1049:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
-    1050:1050:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1194:1194 -> a
-    1051:1064:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1192:1205 -> a
-    1065:1065:int getFreeConsecutiveRegisters(int):2973:2973 -> a
-    1065:1065:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
-    1066:1067:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1208:1209 -> a
-    1068:1073:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1043:1048 -> a
-    1068:1073:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    1074:1074:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1047:1047 -> a
-    1074:1074:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    1075:1075:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1046:1046 -> a
-    1075:1075:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    1076:1089:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1211:1224 -> a
-    1090:1114:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1207:1231 -> a
-    1115:1134:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1267:1286 -> a
-    1135:1142:boolean registersAreFreeAndConsecutive(int,boolean):3029:3036 -> a
-    1135:1142:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1286 -> a
-    1143:1168:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1287:1312 -> a
-    1169:1199:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1328:1358 -> a
-    1200:1200:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1200:1200:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1359 -> a
-    1201:1217:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1366:1382 -> a
-    1218:1224:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1833:1839 -> a
-    1225:1237:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1538:1550 -> a
-    1225:1237:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1840 -> a
-    1238:1238:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1844:1844 -> a
-    1239:1243:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1432:1436 -> a
-    1239:1243:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1845 -> a
-    1244:1246:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    1244:1246:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1848 -> a
-    1247:1248:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1856:1857 -> a
-    1249:1278:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1862:1891 -> a
-    1249:1278:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1858 -> a
-    1279:1291:int getLargestCandidate(int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1912:1924 -> a
-    1292:1297: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):1942:1947 -> a
-    1298:1310: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):1962:1974 -> a
-    1311:1313:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2110:2112 -> a
-    1314:1318:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2120:2124 -> a
-    1319:1323:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2132:2136 -> a
-    1319:1323:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2127 -> a
-    1324:1324:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1324:1324:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2137 -> a
-    1324:1324:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2127 -> a
-    1325:1351:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2138:2164 -> a
-    1325:1351:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2127 -> a
-    1352:1354: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):2328:2330 -> a
-    1355:1355:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1355:1355: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 -> a
-    1356:1363: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):2332:2339 -> a
-    1364:1399: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):2447:2482 -> a
-    1400:1400:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    1400:1400:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2654 -> a
-    1400:1400: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):2482 -> a
-    1401:1407: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):2482:2488 -> a
-    1408:1459:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2521:2572 -> a
-    1460:1466:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2569:2575 -> a
-    1467:1467:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    1467:1467:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2575 -> a
-    1468:1475:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2575:2582 -> a
-    1476:1476:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    1476:1476:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2654 -> a
-    1476:1476:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2582 -> a
-    1477:1514:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2582:2619 -> a
-    1515:1516:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2646:2647 -> a
-    1515:1516:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2623 -> a
-    1517:1534:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2620:2637 -> a
-    1535:1557:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2723:2745 -> a
-    1558:1558:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2767:2767 -> a
-    1559:1563:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2872:2876 -> a
-    1559:1563:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2767 -> a
-    1564:1597:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2768:2801 -> a
-    1598:1599:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():744:745 -> a
-    1598:1599:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2803 -> a
-    1600:1600:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2804:2804 -> a
-    1601:1602:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2752:2753 -> a
-    1601:1602:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2804 -> a
-    1603:1604:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2805:2806 -> a
-    1605:1608:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2758:2761 -> a
-    1605:1608:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2807 -> a
-    1609:1633:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2809:2833 -> a
-    1634:1660:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2841:2867 -> a
-    1634:1660:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2834 -> a
-    1661:1661:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2775:2775 -> a
-    1662:1706:int getFreeConsecutiveRegisters(int,boolean):2977:3021 -> a
-    1707:1718:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):2983:2994 -> a
-    1719:1722:int getNextFreeRegister(java.util.Iterator):3045:3048 -> a
-    1723:1735:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3052:3064 -> a
-    1736:1747:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3070:3081 -> a
-    1748:1748:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3176:3176 -> a
+    1:19:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):247:265 -> a
+    20:45:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):263:288 -> a
+    46:46:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    46:46:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):289 -> a
+    47:51:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):290:294 -> a
+    52:52:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    52:52:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):297 -> a
+    53:61:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):299:307 -> a
+    62:62:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    62:62:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):307 -> a
+    63:88:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):308:333 -> a
+    89:89:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
+    89:89:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):333 -> a
+    90:92:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):334:336 -> a
+    93:101:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):458:466 -> a
+    93:101:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    102:102:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
+    102:102:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):466 -> a
+    102:102:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    103:123:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):468:488 -> a
+    103:123:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    124:124:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    124:124:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491 -> a
+    124:124:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    125:125:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491:491 -> a
+    125:125:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    126:126:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    126:126:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):493 -> a
+    126:126:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    127:129:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):459:461 -> a
+    127:129:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    130:130: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
+    130:130:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):461 -> a
+    130:130:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    131:131:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):461:461 -> a
+    131:131:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    132:132:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344:344 -> a
+    133:133:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    133:133:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):345 -> a
+    134:155:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):346:367 -> a
+    156:156:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    156:156:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):368 -> a
+    157:196:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):369:408 -> a
+    197:197:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    197:197:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):411 -> a
+    198:199:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):414:415 -> a
+    200:200:int lambda$computeDebugInfo$0(com.android.tools.r8.ir.regalloc.LiveRange):259:259 -> a
+    201:202:boolean lambda$computeDebugInfo$2(java.util.Set,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):316:317 -> a
+    203:203:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):422:422 -> a
+    204:205:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):427:428 -> a
+    204:205:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):422 -> a
+    206:207:boolean usesValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):433:434 -> a
+    206:207:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):429 -> a
+    206:207:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):422 -> a
+    208:214:boolean valuesContain(com.android.tools.r8.ir.code.Value,java.util.Collection):438:444 -> a
+    215:238:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):501:524 -> a
+    239:258:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):507:526 -> a
+    259:263:void addRegisterIfUsed(java.util.Set,com.android.tools.r8.ir.regalloc.LiveIntervals):573:577 -> a
+    264:276:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):597:609 -> a
+    277:278:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):794:795 -> a
+    277:278:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):611 -> a
+    279:281:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):602:604 -> a
+    282:282:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    282:282:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    282:282:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):604 -> a
+    283:283:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):604:604 -> a
+    284:284:com.android.tools.r8.utils.InternalOptions options():624:624 -> a
+    285:285:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):642:642 -> a
+    286:297:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):775:786 -> a
+    286:297:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):645 -> a
+    298:298:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):646:646 -> a
+    299:307:void pinArgumentRegisters():2943:2951 -> a
+    299:307:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):649 -> a
+    308:308:void pinArgumentRegisters():2948:2948 -> a
+    308:308:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):649 -> a
+    309:370:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):823:884 -> a
+    309:370:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    371:371:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    371:371:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):885 -> a
+    371:371:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    372:393:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):890:911 -> a
+    372:393:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    394:400:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1051:1057 -> a
+    394:400:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):913 -> a
+    394:400:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    401:401:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    401:401:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1057 -> a
+    401:401:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):913 -> a
+    401:401:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    402:403:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1058:1059 -> a
+    402:403:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):913 -> a
+    402:403:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    404:410:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1070:1076 -> a
+    404:410:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    404:410:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    411:411:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    411:411:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1076 -> a
+    411:411:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    411:411:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    412:417:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1077:1082 -> a
+    412:417:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    412:417:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    418:418:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    418:418:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1082 -> a
+    418:418:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    418:418:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    419:419:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1083:1083 -> a
+    419:419:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    419:419:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    420:485:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1098:1163 -> a
+    420:485:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):919 -> a
+    420:485:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    486:535:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):920:969 -> a
+    486:535:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    536:548:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1605:1617 -> a
+    536:548:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    536:548:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    549:551:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    549:551:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1618 -> a
+    549:551:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    549:551:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    552:561:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1623:1632 -> a
+    552:561:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    552:561:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    562:562:com.android.tools.r8.utils.InternalOptions options():624:624 -> a
+    562:562:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1634 -> a
+    562:562:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    562:562:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    563:608:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1634:1679 -> a
+    563:608:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    563:608:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    609:609:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    609:609:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1680 -> a
+    609:609:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    609:609:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    610:614:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1681:1685 -> a
+    610:614:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    610:614:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    615:615:int toInstructionPosition(int):1387:1387 -> a
+    615:615:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1685 -> a
+    615:615:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    615:615:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    616:627:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1690:1701 -> a
+    616:627:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    616:627:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    628:636:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1024:1032 -> a
+    628:636:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1701 -> a
+    628:636:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    628:636:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    637:667:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1780:1810 -> a
+    637:667:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1704 -> a
+    637:667:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    637:667:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    668:696:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1710:1738 -> a
+    668:696:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    668:696:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    697:699:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    697:699:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1739 -> a
+    697:699:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    697:699:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    700:700:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1740:1740 -> a
+    700:700:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    700:700:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    701:719:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1979:1997 -> a
+    701:719:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    701:719:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    701:719:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    720:729:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1996:2005 -> a
+    720:729:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    720:729:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    720:729:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    730:730:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    730:730:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2006 -> a
+    730:730:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    730:730:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    730:730:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    731:803:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2007:2079 -> a
+    731:803:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    731:803:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    731:803:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    804:811:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1252:1259 -> a
+    804:811:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2081 -> a
+    804:811:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    804:811:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    804:811:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    812:812:void increaseCapacity(int):2957:2957 -> a
+    812:812:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1259 -> a
+    812:812:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2081 -> a
+    812:812:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    812:812:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    812:812:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    813:815:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    813:815:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2082 -> a
+    813:815:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    813:815:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    813:815:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    816:822:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2083:2089 -> a
+    816:822:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    816:822:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    816:822:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    823:823:void increaseCapacity(int):2957:2957 -> a
+    823:823:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2090 -> a
+    823:823:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    823:823:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    823:823:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    824:831:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2093:2100 -> a
+    824:831:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    824:831:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    824:831:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    832:833:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1747:1748 -> a
+    832:833:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    832:833:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    834:834:void increaseCapacity(int):2957:2957 -> a
+    834:834:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1749 -> a
+    834:834:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    834:834:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    835:835:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1752:1752 -> a
+    835:835:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    835:835:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    836:838:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    836:838:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> a
+    836:838:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    836:838:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    839:847:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1756:1764 -> a
+    839:847:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    839:847:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    848:850:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    848:850:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1765 -> a
+    848:850:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    848:850:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    851:851:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766:1766 -> a
+    851:851:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    851:851:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    852:897:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):653:698 -> a
+    898:908:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):671:681 -> a
+    909:909:com.android.tools.r8.utils.InternalOptions options():624:624 -> a
+    909:909:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):682 -> a
+    910:913:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):682:685 -> a
+    914:914:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):659:659 -> a
+    915:915:com.android.tools.r8.utils.InternalOptions options():624:624 -> a
+    915:915:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):660 -> a
+    916:922:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):660:666 -> a
+    923:963:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):663:703 -> a
+    964:967:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):702:705 -> a
+    968:968:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):704:704 -> a
+    969:976:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):761:768 -> a
+    977:981:int realRegisterNumberFromAllocated(int):813:817 -> a
+    982:1020:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):980:1018 -> a
+    1021:1022:void lambda$invariantsHold$3(java.util.TreeSet,int):988:989 -> a
+    1023:1029:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1172:1178 -> a
+    1030:1030:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1030:1030:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1179 -> a
+    1031:1031:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1180:1180 -> a
+    1032:1042:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1177:1187 -> a
+    1043:1046:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1235:1238 -> a
+    1043:1046:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1190 -> a
+    1047:1047:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1047:1047:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1242 -> a
+    1047:1047:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1190 -> a
+    1048:1048:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1241:1241 -> a
+    1048:1048:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1190 -> a
+    1049:1049:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1191:1191 -> a
+    1050:1063:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1189:1202 -> a
+    1064:1064:int getFreeConsecutiveRegisters(int):2970:2970 -> a
+    1064:1064:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1203 -> a
+    1065:1066:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1205:1206 -> a
+    1067:1072:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1040:1045 -> a
+    1067:1072:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
+    1073:1073:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1044:1044 -> a
+    1073:1073:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
+    1074:1074:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1043:1043 -> a
+    1074:1074:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
+    1075:1088:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1208:1221 -> a
+    1089:1113:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1204:1228 -> a
+    1114:1133:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1264:1283 -> a
+    1134:1141:boolean registersAreFreeAndConsecutive(int,boolean):3026:3033 -> a
+    1134:1141:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1283 -> a
+    1142:1167:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1284:1309 -> a
+    1168:1198:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1325:1355 -> a
+    1199:1199:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1199:1199:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1356 -> a
+    1200:1216:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1363:1379 -> a
+    1217:1223:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1830:1836 -> a
+    1224:1236:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1535:1547 -> a
+    1224:1236:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1837 -> a
+    1237:1237:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1841:1841 -> a
+    1238:1242:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1429:1433 -> a
+    1238:1242:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1842 -> a
+    1243:1245:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    1243:1245:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1845 -> a
+    1246:1247:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1853:1854 -> a
+    1248:1277:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1859:1888 -> a
+    1248:1277:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1855 -> a
+    1278:1290:int getLargestCandidate(int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1909:1921 -> a
+    1291:1296: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):1939:1944 -> a
+    1297:1309: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):1959:1971 -> a
+    1310:1312:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2107:2109 -> a
+    1313:1317:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2117:2121 -> a
+    1318:1322:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2129:2133 -> a
+    1318:1322:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2124 -> a
+    1323:1323:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1323:1323:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2134 -> a
+    1323:1323:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2124 -> a
+    1324:1350:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2135:2161 -> a
+    1324:1350:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2124 -> a
+    1351:1353: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):2325:2327 -> a
+    1354:1354:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1354:1354: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):2328 -> a
+    1355:1362: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):2329:2336 -> a
+    1363:1398: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):2444:2479 -> a
+    1399:1399:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    1399:1399:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
+    1399:1399: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):2479 -> a
+    1400:1406: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):2479:2485 -> a
+    1407:1458:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2518:2569 -> a
+    1459:1465:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2566:2572 -> a
+    1466:1466:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    1466:1466:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572 -> a
+    1467:1474:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572:2579 -> a
+    1475:1475:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    1475:1475:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
+    1475:1475:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579 -> a
+    1476:1513:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579:2616 -> a
+    1514:1515:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2643:2644 -> a
+    1514:1515:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2620 -> a
+    1516:1533:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2617:2634 -> a
+    1534:1556:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2720:2742 -> a
+    1557:1557:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2764:2764 -> a
+    1558:1562:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2869:2873 -> a
+    1558:1562:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2764 -> a
+    1563:1596:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2765:2798 -> a
+    1597:1598:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():750:751 -> a
+    1597:1598:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2800 -> a
+    1599:1599:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2801:2801 -> a
+    1600:1601:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2749:2750 -> a
+    1600:1601:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2801 -> a
+    1602:1603:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2802:2803 -> a
+    1604:1607:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2755:2758 -> a
+    1604:1607:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2804 -> a
+    1608:1632:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2806:2830 -> a
+    1633:1659:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2838:2864 -> a
+    1633:1659:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2831 -> a
+    1660:1660:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2772:2772 -> a
+    1661:1705:int getFreeConsecutiveRegisters(int,boolean):2974:3018 -> a
+    1706:1717:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):2980:2991 -> a
+    1718:1721:int getNextFreeRegister(java.util.Iterator):3042:3045 -> a
+    1722:1734:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3049:3061 -> a
+    1735:1746:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3067:3078 -> a
+    1747:1747:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3173:3173 -> a
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
-    1:1:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):309:309 -> b
-    2:4:int registersUsed():591:593 -> b
-    5:6:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):619:620 -> b
-    7:8:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):797:798 -> b
-    7:8:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):620 -> b
-    9:9:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):622:622 -> b
-    10:10:com.android.tools.r8.utils.InternalOptions options():627:627 -> b
-    10:10:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1409 -> b
-    11:28:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1409:1426 -> b
-    29:34:int unadjustedRealRegisterFromAllocated(int):802:807 -> b
-    35:36:void lambda$invariantsHold$4(java.util.TreeSet,int):1008:1009 -> b
-    37:41:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1432:1436 -> b
-    42:43:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2169:2170 -> b
-    44:44:boolean atLeastOneOfRegistersAreTaken(int,boolean):3126:3126 -> b
-    44:44:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2170 -> b
-    45:91:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2170:2216 -> b
-    92:114:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2284:2306 -> b
-    92:114:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2219 -> b
-    115:115:int toGapPosition(int):1394:1394 -> b
-    115:115:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2306 -> b
-    115:115:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2219 -> b
-    116:129:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2306:2319 -> b
-    116:129:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2219 -> b
-    130:130:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2220:2220 -> b
-    131:138:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2233:2240 -> b
-    131:138:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2221 -> b
-    139:166:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2247:2274 -> b
-    139:166:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2223 -> b
-    167:168:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2228:2229 -> b
-    169:173:void increaseCapacity(int,boolean):2965:2969 -> b
-    1:1:void allocateRegisters():207:207 -> c
-    2:11:boolean noLinkedValues():3130:3139 -> c
-    2:11:void allocateRegisters():207 -> c
-    12:12:boolean noLinkedValues():3138:3138 -> c
-    12:12:void allocateRegisters():207 -> c
-    13:14:void allocateRegisters():208:209 -> c
-    15:63:void transformBridgeMethod():2667:2715 -> c
-    15:63:void allocateRegisters():210 -> c
-    64:67:void computeNeedsRegister():2935:2938 -> c
-    64:67:void allocateRegisters():212 -> c
-    68:68:void constrainArgumentIntervals():2912:2912 -> c
-    68:68:void allocateRegisters():213 -> c
-    69:75:void createArgumentLiveIntervals(java.util.List):2886:2892 -> c
-    69:75:void constrainArgumentIntervals():2913 -> c
-    69:75:void allocateRegisters():213 -> c
-    76:84:void linkArgumentValuesAndIntervals(java.util.List):2898:2906 -> c
-    76:84:void constrainArgumentIntervals():2914 -> c
-    76:84:void allocateRegisters():213 -> c
-    85:87:void insertRangeInvokeMoves():2918:2920 -> c
-    85:87:void allocateRegisters():214 -> c
-    88:88:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> c
-    88:88:void insertRangeInvokeMoves():2921 -> c
-    88:88:void allocateRegisters():214 -> c
-    89:89:void insertRangeInvokeMoves():2922:2922 -> c
-    89:89:void allocateRegisters():214 -> c
-    90:90:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> c
-    90:90:void insertRangeInvokeMoves():2924 -> c
-    90:90:void allocateRegisters():214 -> c
-    91:91:void insertRangeInvokeMoves():2926:2926 -> c
-    91:91:void allocateRegisters():214 -> c
-    92:92:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> c
-    92:92:void insertRangeInvokeMoves():2928 -> c
-    92:92:void allocateRegisters():214 -> c
-    93:94:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():631:632 -> c
-    93:94:void allocateRegisters():215 -> c
-    95:95:com.android.tools.r8.utils.InternalOptions options():627:627 -> c
-    95:95:void computeLiveRanges():2493 -> c
-    95:95:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    95:95:void allocateRegisters():215 -> c
-    96:96:void computeLiveRanges():2493:2493 -> c
-    96:96:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    96:96:void allocateRegisters():215 -> c
-    97:97:com.android.tools.r8.utils.InternalOptions options():627:627 -> c
-    97:97:void computeLiveRanges():2498 -> c
-    97:97:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    97:97:void allocateRegisters():215 -> c
-    98:98:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1163:1163 -> c
-    98:98:void computeLiveRanges():2498 -> c
-    98:98:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    98:98:void allocateRegisters():215 -> c
-    99:99:com.android.tools.r8.utils.InternalOptions options():627:627 -> c
-    99:99:void computeLiveRanges():2498 -> c
-    99:99:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    99:99:void allocateRegisters():215 -> c
-    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1172:1172 -> c
-    100:100:void computeLiveRanges():2498 -> c
-    100:100:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    100:100:void allocateRegisters():215 -> c
-    101:110:void computeLiveRanges():2498:2507 -> c
-    101:110:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    101:110:void allocateRegisters():215 -> c
-    111:111:void performAllocation():640:640 -> c
-    111:111:void allocateRegisters():216 -> c
-    112:116:void allocateRegisters():217:221 -> c
-    117:117:com.android.tools.r8.utils.InternalOptions options():627:627 -> c
-    117:117:void allocateRegisters():226 -> c
-    118:121:void allocateRegisters():226:229 -> c
-    122:122:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> c
-    122:122:void allocateRegisters():229 -> c
-    123:127:void allocateRegisters():230:234 -> c
-    128:128:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> c
-    128:128:void allocateRegisters():229 -> c
-    129:129:void allocateRegisters():238:238 -> c
-    130:135:void clearState():534:539 -> c
-    130:135:void allocateRegisters():239 -> c
-    136:136:com.android.tools.r8.utils.InternalOptions options():627:627 -> c
-    136:136:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502 -> c
-    137:137:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1178:1178 -> c
-    137:137:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502 -> c
-    138:158:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1505:1525 -> c
-    159:171:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1538:1550 -> c
-    172:173:boolean registerIsFree(int):3106:3107 -> c
-    174:174:boolean registersAreFree(int,boolean):3113:3113 -> c
-    1:1:int highestUsedRegister():586:586 -> d
-    2:2:com.android.tools.r8.utils.InternalOptions options():627:627 -> d
-    2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1211:1211 -> d
-    3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    4:4:com.android.tools.r8.utils.InternalOptions options():627:627 -> d
-    4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1385:1385 -> d
-    5:5:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    6:24:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
+    1:1:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):306:306 -> b
+    2:4:int registersUsed():588:590 -> b
+    5:6:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):616:617 -> b
+    7:8:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):794:795 -> b
+    7:8:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):617 -> b
+    9:9:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):619:619 -> b
+    10:10:com.android.tools.r8.utils.InternalOptions options():624:624 -> b
+    10:10:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1406 -> b
+    11:28:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1406:1423 -> b
+    29:34:int unadjustedRealRegisterFromAllocated(int):799:804 -> b
+    35:36:void lambda$invariantsHold$4(java.util.TreeSet,int):1005:1006 -> b
+    37:41:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1429:1433 -> b
+    42:43:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2166:2167 -> b
+    44:44:boolean atLeastOneOfRegistersAreTaken(int,boolean):3123:3123 -> b
+    44:44:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2167 -> b
+    45:91:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2167:2213 -> b
+    92:114:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2281:2303 -> b
+    92:114:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2216 -> b
+    115:115:int toGapPosition(int):1391:1391 -> b
+    115:115:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2303 -> b
+    115:115:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2216 -> b
+    116:129:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2303:2316 -> b
+    116:129:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2216 -> b
+    130:130:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2217:2217 -> b
+    131:138:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2230:2237 -> b
+    131:138:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2218 -> b
+    139:166:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2244:2271 -> b
+    139:166:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2220 -> b
+    167:168:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2225:2226 -> b
+    169:173:void increaseCapacity(int,boolean):2962:2966 -> b
+    1:1:void allocateRegisters():205:205 -> c
+    2:11:boolean noLinkedValues():3127:3136 -> c
+    2:11:void allocateRegisters():205 -> c
+    12:12:boolean noLinkedValues():3135:3135 -> c
+    12:12:void allocateRegisters():205 -> c
+    13:14:void allocateRegisters():206:207 -> c
+    15:63:void transformBridgeMethod():2664:2712 -> c
+    15:63:void allocateRegisters():208 -> c
+    64:67:void computeNeedsRegister():2932:2935 -> c
+    64:67:void allocateRegisters():210 -> c
+    68:68:void constrainArgumentIntervals():2909:2909 -> c
+    68:68:void allocateRegisters():211 -> c
+    69:75:void createArgumentLiveIntervals(java.util.List):2883:2889 -> c
+    69:75:void constrainArgumentIntervals():2910 -> c
+    69:75:void allocateRegisters():211 -> c
+    76:84:void linkArgumentValuesAndIntervals(java.util.List):2895:2903 -> c
+    76:84:void constrainArgumentIntervals():2911 -> c
+    76:84:void allocateRegisters():211 -> c
+    85:87:void insertRangeInvokeMoves():2915:2917 -> c
+    85:87:void allocateRegisters():212 -> c
+    88:88:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> c
+    88:88:void insertRangeInvokeMoves():2918 -> c
+    88:88:void allocateRegisters():212 -> c
+    89:89:void insertRangeInvokeMoves():2919:2919 -> c
+    89:89:void allocateRegisters():212 -> c
+    90:90:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> c
+    90:90:void insertRangeInvokeMoves():2921 -> c
+    90:90:void allocateRegisters():212 -> c
+    91:91:void insertRangeInvokeMoves():2923:2923 -> c
+    91:91:void allocateRegisters():212 -> c
+    92:92:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> c
+    92:92:void insertRangeInvokeMoves():2925 -> c
+    92:92:void allocateRegisters():212 -> c
+    93:94:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():628:629 -> c
+    93:94:void allocateRegisters():213 -> c
+    95:95:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
+    95:95:void computeLiveRanges():2490 -> c
+    95:95:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    95:95:void allocateRegisters():213 -> c
+    96:96:void computeLiveRanges():2490:2490 -> c
+    96:96:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    96:96:void allocateRegisters():213 -> c
+    97:97:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
+    97:97:void computeLiveRanges():2495 -> c
+    97:97:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    97:97:void allocateRegisters():213 -> c
+    98:98:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1158:1158 -> c
+    98:98:void computeLiveRanges():2495 -> c
+    98:98:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    98:98:void allocateRegisters():213 -> c
+    99:99:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
+    99:99:void computeLiveRanges():2495 -> c
+    99:99:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    99:99:void allocateRegisters():213 -> c
+    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1167:1167 -> c
+    100:100:void computeLiveRanges():2495 -> c
+    100:100:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    100:100:void allocateRegisters():213 -> c
+    101:110:void computeLiveRanges():2495:2504 -> c
+    101:110:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    101:110:void allocateRegisters():213 -> c
+    111:111:void performAllocation():637:637 -> c
+    111:111:void allocateRegisters():214 -> c
+    112:116:void allocateRegisters():215:219 -> c
+    117:117:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
+    117:117:void allocateRegisters():224 -> c
+    118:121:void allocateRegisters():224:227 -> c
+    122:122:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
+    122:122:void allocateRegisters():227 -> c
+    123:127:void allocateRegisters():228:232 -> c
+    128:128:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
+    128:128:void allocateRegisters():227 -> c
+    129:129:void allocateRegisters():236:236 -> c
+    130:135:void clearState():531:536 -> c
+    130:135:void allocateRegisters():237 -> c
+    136:136:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
+    136:136:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1499 -> c
+    137:137:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1173:1173 -> c
+    137:137:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1499 -> c
+    138:158:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502:1522 -> c
+    159:171:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1535:1547 -> c
+    172:173:boolean registerIsFree(int):3103:3104 -> c
+    174:174:boolean registersAreFree(int,boolean):3110:3110 -> c
+    1:1:int highestUsedRegister():583:583 -> d
+    2:2:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
+    2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> d
+    3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    4:4:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
+    4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1380:1380 -> d
+    5:5:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    6:24:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1459 -> d
     25:25:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
-    25:25:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1462 -> d
-    26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472:1472 -> d
-    27:27:com.android.tools.r8.utils.InternalOptions options():627:627 -> 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 com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1211:1211 -> d
-    28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    29:29:com.android.tools.r8.utils.InternalOptions options():627:627 -> 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:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1385:1385 -> d
-    30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    30:30:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    31:49:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
-    31:49:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
+    25:25:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1459 -> d
+    26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469:1469 -> d
+    27:27:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
+    27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> d
+    28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    29:29:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
+    29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1380:1380 -> d
+    30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    30:30:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    31:49:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1459 -> d
+    31:49:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
     50:50:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
-    50:50:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1462 -> d
-    50:50:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    51:66:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472:1487 -> d
-    1:11:boolean overlapsMoveExceptionInterval(com.android.tools.r8.ir.regalloc.LiveIntervals):1590:1600 -> e
-    12:12:void clearUserInfo():2658:2658 -> e
-    1:26:boolean computeUnusedRegisters():546:571 -> f
-    27:28:boolean registersForIntervalsAreTaken(com.android.tools.r8.ir.regalloc.LiveIntervals):3121:3122 -> f
-    29:29:boolean registersAreTaken(int,boolean):3117:3117 -> f
-    29:29:boolean registersForIntervalsAreTaken(com.android.tools.r8.ir.regalloc.LiveIntervals):3122 -> f
-    1:2:int getMoveExceptionRegister():185:186 -> g
-    3:3:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3095:3095 -> g
-    4:7:void takeFreeRegisters(int,boolean):3087:3090 -> g
-    4:7:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3095 -> g
-    8:11:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3097:3100 -> g
-    1:1:boolean hasDedicatedMoveExceptionRegister():177:177 -> h
-    1:2:void computeRematerializableBits():2373:2374 -> i
-    1:2:void insertMoves():2349 -> i
-    3:12:void insertMoves():2351:2360 -> i
-    13:13:int toGapPosition(int):1394:1394 -> i
-    13:13:void insertMoves():2361 -> i
-    14:14:void insertMoves():2361:2361 -> i
-    15:15:void insertMoves():2359:2359 -> i
-    16:58:void resolveControlFlow(com.android.tools.r8.ir.regalloc.SpillMoveSet):2392:2434 -> i
-    16:58:void insertMoves():2367 -> i
-    59:60:void insertMoves():2368:2369 -> i
-    1:3:void removeSpillAndPhiMoves():752:754 -> j
-    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> j
-    4:4:void removeSpillAndPhiMoves():755 -> j
-    5:6:void removeSpillAndPhiMoves():756:757 -> j
-    1:28:boolean unsplitArguments():719:746 -> k
-    1:20:java.lang.String toString():3147:3166 -> toString
+    50:50:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1459 -> d
+    50:50:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    51:66:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469:1484 -> d
+    1:11:boolean overlapsMoveExceptionInterval(com.android.tools.r8.ir.regalloc.LiveIntervals):1587:1597 -> e
+    12:12:void clearUserInfo():2655:2655 -> e
+    1:26:boolean computeUnusedRegisters():543:568 -> f
+    27:28:boolean registersForIntervalsAreTaken(com.android.tools.r8.ir.regalloc.LiveIntervals):3118:3119 -> f
+    29:29:boolean registersAreTaken(int,boolean):3114:3114 -> f
+    29:29:boolean registersForIntervalsAreTaken(com.android.tools.r8.ir.regalloc.LiveIntervals):3119 -> f
+    1:2:int getMoveExceptionRegister():183:184 -> g
+    3:3:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3092:3092 -> g
+    4:7:void takeFreeRegisters(int,boolean):3084:3087 -> g
+    4:7:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3092 -> g
+    8:11:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3094:3097 -> g
+    1:1:boolean hasDedicatedMoveExceptionRegister():175:175 -> h
+    1:2:void computeRematerializableBits():2370:2371 -> i
+    1:2:void insertMoves():2346 -> i
+    3:12:void insertMoves():2348:2357 -> i
+    13:13:int toGapPosition(int):1391:1391 -> i
+    13:13:void insertMoves():2358 -> i
+    14:14:void insertMoves():2358:2358 -> i
+    15:15:void insertMoves():2356:2356 -> i
+    16:58:void resolveControlFlow(com.android.tools.r8.ir.regalloc.SpillMoveSet):2389:2431 -> i
+    16:58:void insertMoves():2364 -> i
+    59:60:void insertMoves():2365:2366 -> i
+    1:3:void removeSpillAndPhiMoves():749:751 -> j
+    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
+    4:4:void removeSpillAndPhiMoves():752 -> j
+    5:6:void removeSpillAndPhiMoves():753:754 -> j
+    1:28:boolean unsplitArguments():716:743 -> k
+    1:20:java.lang.String toString():3144:3163 -> toString
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode -> com.android.tools.r8.D.f.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>
+    1:3:void <clinit>():92:94 -> <clinit>
+    4:4:void <clinit>():91:91 -> <clinit>
+    1:1:void <init>(java.lang.String,int):91:91 -> <init>
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange -> com.android.tools.r8.D.f.b:
     com.android.tools.r8.graph.DebugLocalInfo local -> b
     boolean $assertionsDisabled -> f
@@ -41421,13 +41183,13 @@
     com.android.tools.r8.ir.code.Value value -> a
     int end -> e
     int register -> c
-    1:1:void <clinit>():99:99 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.ir.code.Value,int,int,int):106:112 -> <init>
-    1:3:int compareTo(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):117:119 -> a
-    1:1:int compareTo(java.lang.Object):99:99 -> compareTo
-    2:4:int compareTo(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):117:119 -> compareTo
-    2:4:int compareTo(java.lang.Object):99 -> compareTo
-    1:1:java.lang.String toString():124:124 -> toString
+    1:1:void <clinit>():97:97 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.ir.code.Value,int,int,int):104:110 -> <init>
+    1:3:int compareTo(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):115:117 -> a
+    1:1:int compareTo(java.lang.Object):97:97 -> compareTo
+    2:4:int compareTo(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):115:117 -> compareTo
+    2:4:int compareTo(java.lang.Object):97 -> compareTo
+    1:1:java.lang.String toString():122:122 -> toString
 com.android.tools.r8.ir.regalloc.LiveIntervals -> com.android.tools.r8.D.f.d:
     boolean spilled -> m
     boolean usedInMonitorOperations -> n
@@ -41761,11 +41523,11 @@
     1:2:void addInResolutionMove(int,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):122:123 -> a
     3:3:java.util.Set lambda$addInMove$1(java.lang.Integer):147:147 -> a
     4:9:int scheduleAndInsertMoves(int):167:172 -> a
-    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     10:10:int scheduleAndInsertMoves(int):173 -> a
     11:17:int scheduleAndInsertMoves(int):176:182 -> a
     18:32:int scheduleAndInsertMoves(int):178:192 -> a
-    33:33:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    33:33:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     33:33:int scheduleAndInsertMoves(int):194 -> a
     34:34:int scheduleAndInsertMoves(int):197:197 -> a
     35:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement moveTypeForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):201:208 -> a
@@ -41792,7 +41554,7 @@
     86:90:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):316:320 -> a
     91:99:void removeArgumentRestores(java.util.Set):332:340 -> a
     100:124:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):347:371 -> a
-    125:125:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1147:1147 -> a
+    125:125:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1142:1142 -> a
     125:125:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371 -> a
     126:131:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371:376 -> a
     132:136:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):375:379 -> a
@@ -42057,7 +41819,27 @@
     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.E.a.a.a.e.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanListIterator -> com.android.tools.r8.E.a.a.a.e.c:
+    1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.<init>():34:34 -> <init>
+    1:1:void <init>():35 -> <init>
+    1:1:void add(java.lang.Object):34:34 -> add
+    2:2:void add(java.lang.Boolean):83:83 -> add
+    2:2:void add(java.lang.Object):34 -> add
+    3:3:void add(boolean):57:57 -> add
+    3:3:void add(java.lang.Boolean):83 -> add
+    3:3:void add(java.lang.Object):34 -> add
+    1:1:boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator.previousBoolean():62:62 -> previous
+    1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():56 -> previous
+    1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():0 -> previous
+    1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():33 -> previous
+    1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():0 -> previous
+    1:1:void set(java.lang.Object):34:34 -> set
+    2:2:void set(java.lang.Boolean):70:70 -> set
+    2:2:void set(java.lang.Object):34 -> set
+    3:3:void set(boolean):46:46 -> set
+    3:3:void set(java.lang.Boolean):70 -> set
+    3:3:void set(java.lang.Object):34 -> set
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanSet -> com.android.tools.r8.E.a.a.a.e.d:
     1:1:void <init>():32:32 -> <init>
     1:1:boolean rem(boolean):87:87 -> c
     boolean remove(boolean) -> d
@@ -42066,7 +41848,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.E.a.a.a.e.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.E.a.a.a.e.f:
     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
@@ -42086,7 +41868,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():119:119 -> iterator
     2:2:java.util.Iterator iterator():29 -> iterator
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.E.a.a.a.e.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.E.a.a.a.e.e:
     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>
@@ -42094,13 +41876,14 @@
     1:2:boolean nextBoolean():129:130 -> nextBoolean
     3:3:boolean nextBoolean():129:129 -> nextBoolean
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.E.a.a.a.e.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.E.a.a.a.e.g:
     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.E.a.a.a.e.g:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.E.a.a.a.e.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanBidirectionalIterator -> com.android.tools.r8.E.a.a.a.e.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.E.a.a.a.e.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.E.a.a.a.e.k:
     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.E.a.a.a.e.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.E.a.a.a.e.j:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):369:371 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):370:370 -> <init>
@@ -42115,13 +41898,8 @@
     1:1:int hashCode():517:517 -> hashCode
     1:1:boolean isEmpty():391:391 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400:400 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):747:747 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400:400 -> iterator
-    3:3:java.util.Iterator iterator():365 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):747:747 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400 -> iterator
-    4:4:java.util.Iterator iterator():365 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400:400 -> iterator
+    2:2:java.util.Iterator iterator():365 -> iterator
     1:1:boolean remove(java.lang.Object):465:465 -> remove
     1:1:boolean removeAll(java.util.Collection):442:442 -> removeAll
     1:1:boolean retainAll(java.util.Collection):447:447 -> retainAll
@@ -42129,12 +41907,21 @@
     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.E.a.a.a.e.j:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.E.a.a.a.e.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.E.a.a.a.e.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.E.a.a.a.e.o:
+    com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator EMPTY_ITERATOR -> a
+    1:1:void <clinit>():103:103 -> <clinit>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):747:747 -> a
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator -> com.android.tools.r8.E.a.a.a.e.m:
+    1:1:void <init>():42:42 -> <init>
+    1:1:java.lang.Object clone():87:87 -> clone
+    1:1:boolean nextBoolean():57:57 -> nextBoolean
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.E.a.a.a.e.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):724:725 -> <init>
     1:1:boolean hasNext():730:730 -> hasNext
     1:1:boolean nextBoolean():735:735 -> nextBoolean
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSet -> com.android.tools.r8.E.a.a.a.e.p:
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> com.android.tools.r8.E.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>
@@ -42335,18 +42122,7 @@
     1:1:boolean add(int):68:68 -> a
     2:2:boolean add(java.lang.Integer):114:114 -> a
     3:4:int[] toArray(int[]):148:149 -> a
-    5:5:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312:312 -> a
-    5:5:int[] toArray(int[]):149 -> a
-    6:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:292 -> a
-    6:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    6:9:int[] toArray(int[]):149 -> a
-    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:289 -> a
-    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    10:10:int[] toArray(int[]):149 -> a
-    11:11:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
-    11:11:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    11:11:int[] toArray(int[]):149 -> a
-    12:13:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
+    5:6:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
     1:1:boolean add(java.lang.Object):36:36 -> add
     1:4:boolean rem(int):94:97 -> b
     1:1:boolean contains(java.lang.Object):129:129 -> contains
@@ -44387,8 +44163,6 @@
     1:1:boolean isEmpty():391:391 -> isEmpty
     1:1:java.util.Iterator iterator():365:365 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():400:400 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):830:830 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():400 -> iterator
     1:1:boolean remove(java.lang.Object):465:465 -> remove
     1:1:boolean removeAll(java.util.Collection):442:442 -> removeAll
     1:1:boolean retainAll(java.util.Collection):447:447 -> retainAll
@@ -44401,6 +44175,15 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.E.a.a.a.f.P0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator singleton(int):159:159 -> a
+    2:2:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312:312 -> a
+    3:6:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:292 -> a
+    3:6:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    7:7:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:289 -> a
+    7:7:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    8:8:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
+    8:8:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):830:830 -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.E.a.a.a.f.M0:
     1:1:void <init>():42:42 -> <init>
     1:1:int previousInt():62:62 -> c
@@ -44495,18 +44278,22 @@
     1:2:int[] toIntArray():364:365 -> f
     1:1:int removeInt(int):353:353 -> g
     1:2:int getInt(int):342:343 -> getInt
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376:376 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():332 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376:376 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376:376 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376 -> iterator
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> iterator
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376 -> iterator
     3:3:java.util.Iterator iterator():332 -> iterator
-    1:1:java.util.ListIterator listIterator():332:332 -> listIterator
-    2:2:java.util.ListIterator listIterator(int):332:332 -> listIterator
+    1:1:java.util.ListIterator listIterator(int):332:332 -> 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 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
-    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):382:383 -> listIterator
-    7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):381:381 -> listIterator
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):382 -> listIterator
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):383:383 -> listIterator
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):381:381 -> listIterator
+    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> listIterator
+    6:6:java.util.ListIterator listIterator():332 -> 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
@@ -44850,10 +44637,11 @@
     2:4:boolean rem(long):87 -> c
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:7:int hashCode():57:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap -> com.android.tools.r8.E.a.a.a.g.k:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.E.a.a.a.g.i:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.g.j:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.E.a.a.a.g.m:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceFunction -> com.android.tools.r8.E.a.a.a.g.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap -> com.android.tools.r8.E.a.a.a.g.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.E.a.a.a.g.j:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.g.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.E.a.a.a.g.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
     java.lang.Object[] value -> b
     float f -> h
@@ -44923,7 +44711,7 @@
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():794:815 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.g.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.g.m:
     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
@@ -44931,7 +44719,7 @@
     1:1:java.util.Iterator iterator():794:794 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.g.m$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.g.n$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>
@@ -44939,13 +44727,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.g.m$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.g.n$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):721:722 -> <init>
     1:1:java.lang.Long next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
     1:1:long nextLong():727:727 -> nextLong
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.E.a.a.a.g.m$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.E.a.a.a.g.n$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>
@@ -44954,7 +44742,7 @@
     1:1:java.util.Iterator iterator():737:737 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():740:740 -> iterator
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.g.m$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.g.n$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>
@@ -44965,7 +44753,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.g.m$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.g.n$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>
@@ -44975,7 +44763,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.g.m$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.g.n$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
@@ -44996,11 +44784,11 @@
     25:25:void remove():580 -> remove
     26:27:void remove():583:584 -> remove
     28:28:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.g.m$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.g.n$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.E.a.a.a.g.o:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.E.a.a.a.g.p:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -45029,7 +44817,7 @@
     3:4:java.util.ListIterator listIterator(int):48 -> listIterator
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.E.a.a.a.g.n:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.E.a.a.a.g.o:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -45048,15 +44836,17 @@
     1:1:int previousIndex():520:520 -> previousIndex
     1:9:void remove():534:542 -> remove
     10:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.E.a.a.a.g.p:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.E.a.a.a.g.q:
     long previousLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.E.a.a.a.g.q:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.E.a.a.a.g.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.E.a.a.a.g.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.E.a.a.a.g.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.E.a.a.a.g.t:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long set(int,long) -> b
     long removeLong(int) -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.E.a.a.a.g.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.E.a.a.a.g.u:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongStack -> com.android.tools.r8.E.a.a.a.g.v:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.E.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>
@@ -45077,10 +44867,7 @@
     1:1:int hashCode():310:310 -> hashCode
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> hashCode
     2:2:int hashCode():311 -> hashCode
-    3:3:int hashCode():311:311 -> hashCode
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet.iterator():136:136 -> hashCode
-    4:4:int hashCode():311 -> hashCode
-    5:5:int hashCode():313:313 -> hashCode
+    3:5:int hashCode():311:313 -> hashCode
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Boolean):123:125 -> put
@@ -45101,13 +44888,10 @@
     1:1:java.lang.String toString():328:328 -> toString
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> toString
     2:2:java.lang.String toString():329 -> toString
-    3:3:java.lang.String toString():329:329 -> toString
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet.iterator():136:136 -> toString
-    4:4:java.lang.String toString():329 -> toString
-    5:15:java.lang.String toString():330:340 -> toString
-    16:16:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> toString
-    16:16:java.lang.String toString():341 -> toString
-    17:20:java.lang.String toString():341:344 -> toString
+    3:14:java.lang.String toString():329:340 -> toString
+    15:15:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> toString
+    15:15:java.lang.String toString():341 -> toString
+    16:19:java.lang.String toString():341:344 -> toString
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry -> com.android.tools.r8.E.a.a.a.h.a:
     java.lang.Object key -> a
     boolean value -> b
@@ -45498,8 +45282,10 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.E.a.a.a.h.z:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.E.a.a.a.h.C:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanFunction -> com.android.tools.r8.E.a.a.a.h.z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.E.a.a.a.h.B:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.h.A:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.E.a.a.a.h.E:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -45530,8 +45316,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.E.a.a.a.h.A:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.E.a.a.a.h.C$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.E.a.a.a.h.C:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.E.a.a.a.h.E$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>
@@ -45541,7 +45327,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.E.a.a.a.h.B:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.E.a.a.a.h.D:
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> c
     int curr -> a
@@ -45553,10 +45339,10 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.E.a.a.a.h.D:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.E.a.a.a.h.F:
     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.E.a.a.a.h.F:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.E.a.a.a.h.H:
     float f -> l
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
@@ -45634,7 +45420,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.E:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.G:
     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:void clear():1614:1614 -> clear
@@ -45642,7 +45428,7 @@
     1:1:java.util.Iterator iterator():1596:1596 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.F$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.H$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>
@@ -45657,14 +45443,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.E.a.a.a.h.F$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.H$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.E.a.a.a.h.F$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.E.a.a.a.h.H$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>
@@ -45686,7 +45472,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.E.a.a.a.h.F$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.H$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>
@@ -45705,7 +45491,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.E.a.a.a.h.F$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.H$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>
@@ -45733,7 +45519,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.E.a.a.a.h.F$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.H$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -45754,7 +45540,7 @@
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1185:1185 -> remove
     49:49:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.F$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.H$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
@@ -45769,12 +45555,15 @@
     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.E.a.a.a.h.H:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.E.a.a.a.h.K:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.E.a.a.a.h.G:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.E.a.a.a.h.I:
     int getIntValue() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.E.a.a.a.h.I:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.E.a.a.a.h.K:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.h.J:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap -> com.android.tools.r8.E.a.a.a.h.M:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.E.a.a.a.h.L:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectFunction -> com.android.tools.r8.E.a.a.a.h.N:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.E.a.a.a.h.P:
     float f -> l
     java.lang.Object[] value -> b
     int maxFill -> j
@@ -45850,7 +45639,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1529:1550 -> values
     1:22:java.util.Collection values():85 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.E.a.a.a.h.J:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.E.a.a.a.h.O:
     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
@@ -45858,7 +45647,7 @@
     1:1:java.util.Iterator iterator():1529:1529 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1532:1532 -> iterator
     1:1:int size():1537:1537 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.K$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.P$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>
@@ -45873,14 +45662,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.E.a.a.a.h.K$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.P$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.E.a.a.a.h.K$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.E.a.a.a.h.P$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>
@@ -45902,7 +45691,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.E.a.a.a.h.K$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.P$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>
@@ -45912,7 +45701,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.E.a.a.a.h.K$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.P$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>
@@ -45940,7 +45729,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.E.a.a.a.h.K$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.P$f:
     int index -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> e
     int next -> b
@@ -45961,17 +45750,18 @@
     1:49:void remove():1102:1150 -> remove
     50:50:void remove():1144:1144 -> remove
     51:51:void remove():1103:1103 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.K$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.P$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.E.a.a.a.h.M:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.E.a.a.a.h.L:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.E.a.a.a.h.N:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.E.a.a.a.h.P:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.E.a.a.a.h.S:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.E.a.a.a.h.Q:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap -> com.android.tools.r8.E.a.a.a.h.U:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.E.a.a.a.h.T:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.E.a.a.a.h.W:
     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
@@ -45991,7 +45781,7 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.E.a.a.a.h.O:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.E.a.a.a.h.V:
     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>
@@ -45999,15 +45789,15 @@
     1:2:java.lang.Object next():129:130 -> next
     3:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.E.a.a.a.h.Q:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.E.a.a.a.h.X:
     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.E.a.a.a.h.S:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.E.a.a.a.h.T:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections -> com.android.tools.r8.E.a.a.a.h.W:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.E.a.a.a.h.Y:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.E.a.a.a.h.Z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections -> com.android.tools.r8.E.a.a.a.h.c0:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):383:383 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):383:383 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.E.a.a.a.h.U:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.E.a.a.a.h.a0:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():55:55 -> iterator
@@ -46018,7 +45808,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.E.a.a.a.h.V:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.E.a.a.a.h.b0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):276:278 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):277:277 -> <init>
@@ -46031,13 +45821,8 @@
     1:1:int hashCode():364:364 -> hashCode
     1:1:boolean isEmpty():298:298 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307:307 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):762:762 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307:307 -> iterator
-    3:3:java.util.Iterator iterator():272 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):762:762 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307 -> iterator
-    4:4:java.util.Iterator iterator():272 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307:307 -> iterator
+    2:2:java.util.Iterator iterator():272 -> iterator
     1:1:boolean remove(java.lang.Object):288:288 -> remove
     1:1:boolean removeAll(java.util.Collection):349:349 -> removeAll
     1:1:boolean retainAll(java.util.Collection):354:354 -> retainAll
@@ -46045,35 +45830,37 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):329:329 -> toArray
     2:2:java.lang.Object[] toArray():334:334 -> toArray
     1:1:java.lang.String toString():359:359 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.E.a.a.a.h.X:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.E.a.a.a.h.a0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterable -> com.android.tools.r8.E.a.a.a.h.d0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.E.a.a.a.h.e0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.E.a.a.a.h.h0:
     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.E.a.a.a.h.Y:
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):762:762 -> a
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.E.a.a.a.h.f0:
     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.E.a.a.a.h.Z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.E.a.a.a.h.g0:
     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.ObjectListIterator -> com.android.tools.r8.E.a.a.a.h.b0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.E.a.a.a.h.c0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.E.a.a.a.h.e0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.E.a.a.a.h.i0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.E.a.a.a.h.j0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.E.a.a.a.h.l0:
     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.E.a.a.a.h.d0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.E.a.a.a.h.k0:
     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.E.a.a.a.h.f0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.E.a.a.a.h.h0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.E.a.a.a.h.m0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.E.a.a.a.h.o0:
     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.E.a.a.a.h.g0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.E.a.a.a.h.n0:
     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
@@ -46084,10 +45871,11 @@
     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.E.a.a.a.h.k0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.E.a.a.a.h.i0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.h.j0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.E.a.a.a.h.m0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunction -> com.android.tools.r8.E.a.a.a.h.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.E.a.a.a.h.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.E.a.a.a.h.q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.h.r0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.E.a.a.a.h.u0:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> k
     float f -> h
     java.lang.Object[] key -> a
@@ -46158,7 +45946,7 @@
     1:1:int size():384:384 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values():803:824 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.l0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.t0:
     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
@@ -46166,7 +45954,7 @@
     1:1:java.util.Iterator iterator():803:803 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():806:806 -> iterator
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.m0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.u0$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>
@@ -46174,11 +45962,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry next():614:614 -> next
     1:1:java.lang.Object next():609 -> next
     1:2:void remove():619:620 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.m0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.u0$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.E.a.a.a.h.m0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.E.a.a.a.h.u0$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>
@@ -46188,7 +45976,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():743:743 -> iterator
     1:3:boolean remove(java.lang.Object):758:760 -> remove
     1:1:int size():748:748 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.m0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.u0$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>
@@ -46206,7 +45994,7 @@
     5:5:java.lang.Boolean setValue(java.lang.Boolean):473:473 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):423 -> setValue
     1:1:java.lang.String toString():491:491 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.m0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.u0$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>
@@ -46216,7 +46004,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():636:636 -> iterator
     1:29:boolean remove(java.lang.Object):668:696 -> remove
     1:1:int size():705:705 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.m0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.u0$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
@@ -46237,13 +46025,13 @@
     24:24:void remove():589 -> remove
     25:26:void remove():592:593 -> remove
     27:27:void remove():585:585 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.m0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.u0$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):785:786 -> <init>
     1:1:java.lang.Boolean next():797:797 -> next
     1:1:java.lang.Object next():784 -> next
     1:1:boolean nextBoolean():791:791 -> nextBoolean
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.E.a.a.a.h.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.E.a.a.a.h.x0:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -46272,8 +46060,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.E.a.a.a.h.n0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.E.a.a.a.h.p0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.E.a.a.a.h.v0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.E.a.a.a.h.x0$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>
@@ -46283,7 +46071,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.E.a.a.a.h.o0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.E.a.a.a.h.w0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -46295,10 +46083,10 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.E.a.a.a.h.q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.E.a.a.a.h.y0:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.E.a.a.a.h.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.E.a.a.a.h.A0:
     float f -> l
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
@@ -46375,7 +46163,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.r0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.z0:
     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:void clear():1614:1614 -> clear
@@ -46383,7 +46171,7 @@
     1:1:java.util.Iterator iterator():1596:1596 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.s0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.A0$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>
@@ -46398,14 +46186,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.E.a.a.a.h.s0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.A0$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.E.a.a.a.h.s0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.E.a.a.a.h.A0$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>
@@ -46427,7 +46215,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.E.a.a.a.h.s0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.A0$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>
@@ -46446,7 +46234,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.E.a.a.a.h.s0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.A0$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>
@@ -46474,7 +46262,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.E.a.a.a.h.s0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.A0$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -46495,7 +46283,7 @@
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1185:1185 -> remove
     49:49:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.s0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.A0$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
@@ -46510,12 +46298,12 @@
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void set(java.lang.Integer):1559:1559 -> set
     2:2:void set(java.lang.Object):1544 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.E.a.a.a.h.v0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.E.a.a.a.h.D0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.E.a.a.a.h.t0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.E.a.a.a.h.B0:
     int getIntValue() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.h.u0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.E.a.a.a.h.x0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.h.C0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.E.a.a.a.h.F0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     java.lang.Object[] key -> b
@@ -46579,7 +46367,7 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.w0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.E0:
     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:void clear():866:866 -> clear
@@ -46587,7 +46375,7 @@
     1:1:java.util.Iterator iterator():848:848 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.x0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.F0$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>
@@ -46595,11 +46383,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.x0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.F0$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.E.a.a.a.h.x0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.E.a.a.a.h.F0$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>
@@ -46609,7 +46397,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.x0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.F0$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>
@@ -46628,7 +46416,7 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.x0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.F0$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>
@@ -46638,7 +46426,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.x0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.F0$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
@@ -46659,14 +46447,15 @@
     24:24:void remove():634 -> remove
     25:26:void remove():637:638 -> remove
     27:27:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.x0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.F0$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):830:831 -> <init>
     1:1:java.lang.Integer next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
     1:1:int nextInt():836:836 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.E.a.a.a.h.y0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.E.a.a.a.h.A0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap -> com.android.tools.r8.E.a.a.a.h.H0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.E.a.a.a.h.G0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.E.a.a.a.h.J0:
     java.lang.Object[] a -> b
     boolean wrapped -> a
     int size -> c
@@ -46702,7 +46491,7 @@
     1:3:java.lang.Object set(int,java.lang.Object):357:359 -> set
     4:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.E.a.a.a.h.z0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.E.a.a.a.h.I0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -46721,7 +46510,7 @@
     10:10:void remove():538:538 -> remove
     1:2:void set(java.lang.Object):533:534 -> set
     3:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.E.a.a.a.h.C0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.E.a.a.a.h.L0:
     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
@@ -46741,7 +46530,7 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.E.a.a.a.h.B0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.E.a.a.a.h.K0:
     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>
@@ -46749,8 +46538,8 @@
     1:2:java.lang.Object next():129:130 -> next
     3:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.E.a.a.a.h.D0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.E.a.a.a.h.E0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.E.a.a.a.h.M0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.E.a.a.a.h.N0:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():55:55 -> iterator
@@ -46760,7 +46549,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.E.a.a.a.h.F0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.E.a.a.a.h.O0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):276:278 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):277:277 -> <init>
@@ -46774,8 +46563,6 @@
     1:1:boolean isEmpty():298:298 -> isEmpty
     1:1:java.util.Iterator iterator():272:272 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307:307 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):762:762 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307 -> iterator
     1:1:boolean remove(java.lang.Object):288:288 -> remove
     1:1:boolean removeAll(java.util.Collection):349:349 -> removeAll
     1:1:boolean retainAll(java.util.Collection):354:354 -> retainAll
@@ -46783,9 +46570,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.E.a.a.a.h.G0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.E.a.a.a.h.P0:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.E.a.a.a.h.I0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.E.a.a.a.h.R0:
     java.lang.Object[] key -> a
     float f -> g
     int size -> f
@@ -46835,8 +46622,8 @@
     2:5:boolean remove(java.lang.Object):332 -> remove
     6:13:boolean remove(java.lang.Object):336:343 -> remove
     1:1:int size():380:380 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.E.a.a.a.h.H0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.E.a.a.a.h.I0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.E.a.a.a.h.Q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.E.a.a.a.h.R0$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
@@ -46857,16 +46644,16 @@
     23:23:void remove():500 -> remove
     24:25:void remove():503:504 -> remove
     26:26:void remove():496:496 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.E.a.a.a.h.J0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.E.a.a.a.h.L0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.E.a.a.a.h.S0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.E.a.a.a.h.U0:
     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.E.a.a.a.h.K0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.E.a.a.a.h.T0:
     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.E.a.a.a.h.M0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.E.a.a.a.h.V0:
 com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.F.b:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
@@ -46878,16 +46665,16 @@
     com.android.tools.r8.dex.Marker marker -> f
     1:1:void <clinit>():62:62 -> <clinit>
     1:9:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.Marker,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):86:94 -> <init>
-    1:1:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():66:66 -> a
+    1:1:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():64:64 -> a
     1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):349 -> a
     2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):348:348 -> a
-    3:3:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():66:66 -> a
+    3:3:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():64:64 -> a
     3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):351 -> a
     4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):350:357 -> a
     12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):355:355 -> a
     13:17:void write(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):98:102 -> a
     18:26:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):108:116 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     27:27:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):116 -> a
     28:28:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):119:119 -> a
     29:40:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117:128 -> a
@@ -46906,7 +46693,7 @@
     123:127:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):195 -> a
     128:128:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:196 -> a
     129:132:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):200:203 -> a
-    133:133:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    133:133:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     133:133:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):204 -> a
     134:138:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):203:207 -> a
     139:146:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):222:229 -> a
@@ -47164,11 +46951,13 @@
     14005:14005:int com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.mapCapacity(int):134:134 -> a
     14005:14005:int com.android.tools.r8.jetbrains.kotlin.collections.MapsKt.mapCapacity(int):0 -> a
     14006:14007:java.util.Collection com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toCollection(java.lang.Iterable,java.util.Collection):1153:1154 -> a
-    1:2:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1184:1185 -> b
-    3:1196:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1193 -> b
-    3:1196:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1185 -> b
-    1197:1197:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1186:1186 -> b
-    1198:1199:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.indexOf(int[],int):1317:1318 -> b
+    1:1:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.SetsKt__SetsKt.emptySet():34:34 -> b
+    1:1:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.SetsKt.emptySet():0 -> b
+    2:3:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1184:1185 -> b
+    4:1197:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1193 -> b
+    4:1197:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1185 -> b
+    1198:1198:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1186:1186 -> b
+    1199:1200:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.indexOf(int[],int):1317:1318 -> b
     1:1207:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):0:1206 -> c
     1:1207:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toSet(java.lang.Iterable):0 -> c
     1208:1208:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1205:1205 -> c
@@ -47463,13 +47252,14 @@
     1:1:java.lang.String toString():54:54 -> toString
 com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.G.a.r.a:
 com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.G.a.r.b:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.G.a.r.e:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.G.a.r.d:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.G.a.r.c:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.G.a.r.f:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty$Getter -> com.android.tools.r8.G.a.r.c:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.G.a.r.e:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.G.a.r.d:
 com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.G.b.a.a:
     1:1:void <init>(java.lang.String,java.lang.Throwable):8:8 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.G.b.a.b.a.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.G.b.a.b.a.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.G.b.a.b.a.m:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List argument_ -> d
@@ -47530,7 +47320,7 @@
     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.G.b.a.b.a.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.G.b.a.b.a.j:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     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 -> f
@@ -47866,7 +47656,9 @@
     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.G.b.a.b.a.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$ValueOrBuilder -> com.android.tools.r8.G.b.a.b.a.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$ArgumentOrBuilder -> com.android.tools.r8.G.b.a.b.a.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.G.b.a.b.a.l:
     java.util.List argument_ -> d
     int bitField0_ -> b
     int id_ -> c
@@ -47907,7 +47699,8 @@
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4377:4389 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder create():4348:4348 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder access$4200():4334 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.G.b.a.b.a.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$AnnotationOrBuilder -> com.android.tools.r8.G.b.a.b.a.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.G.b.a.b.a.q:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class defaultInstance -> u
     java.util.List versionRequirement_ -> r
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -48056,11 +47849,11 @@
     1:1:boolean hasVersionRequirementTable():9340:9340 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class getDefaultInstance():8511:8511 -> q
     1:16:void initFields():9350:9365 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.G.b.a.b.a.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.G.b.a.b.a.o:
     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.G.b.a.b.a.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.G.b.a.b.a.p:
     java.util.List sealedSubclassFqName_ -> q
     java.util.List enumEntry_ -> p
     java.util.List typeAlias_ -> o
@@ -48210,7 +48003,8 @@
     1:79:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class buildPartial():9754:9832 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder create():9697:9697 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder access$8700():9684 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.G.b.a.b.a.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ClassOrBuilder -> com.android.tools.r8.G.b.a.b.a.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.G.b.a.b.a.u:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List versionRequirement_ -> f
     java.util.List valueParameter_ -> e
@@ -48264,11 +48058,11 @@
     1:1:boolean hasFlags():13501:13501 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstance():13381:13381 -> i
     1:3:void initFields():13586:13588 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.G.b.a.b.a.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.G.b.a.b.a.s:
     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.G.b.a.b.a.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.G.b.a.b.a.t:
     java.util.List valueParameter_ -> f
     int bitField0_ -> d
     int flags_ -> e
@@ -48311,7 +48105,8 @@
     1:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():13772:13789 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder create():13741:13741 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder access$12500():13728 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.G.b.a.b.a.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ConstructorOrBuilder -> com.android.tools.r8.G.b.a.b.a.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.G.b.a.b.a.y:
     java.util.List effect_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract defaultInstance -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> e
@@ -48358,11 +48153,11 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():23312 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getDefaultInstance():23325:23325 -> e
     1:1:void initFields():23439:23439 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.G.b.a.b.a.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.G.b.a.b.a.w:
     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.G.b.a.b.a.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.G.b.a.b.a.x:
     java.util.List effect_ -> c
     int bitField0_ -> b
     1:91:void <init>():23558:23648 -> <init>
@@ -48397,7 +48192,8 @@
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract buildPartial():23592:23598 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder create():23565:23565 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22300():23551 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.G.b.a.b.a.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ContractOrBuilder -> com.android.tools.r8.G.b.a.b.a.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.G.b.a.b.a.E:
     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
@@ -48463,11 +48259,11 @@
     1:1:boolean hasKind():24216:24216 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect getDefaultInstance():23855:23855 -> k
     1:4:void initFields():24226:24229 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.G.b.a.b.a.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.G.b.a.b.a.A:
     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.G.b.a.b.a.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.G.b.a.b.a.B:
     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
@@ -48532,7 +48328,7 @@
     1:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect buildPartial():24415:24435 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder create():24382:24382 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$22800():24368 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.G.b.a.b.a.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.G.b.a.b.a.C:
     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 RETURNS_CONSTANT -> b
@@ -48543,7 +48339,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.G.b.a.b.a.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.G.b.a.b.a.D:
     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 AT_LEAST_ONCE -> d
@@ -48554,7 +48350,8 @@
     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.G.b.a.b.a.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EffectOrBuilder -> com.android.tools.r8.G.b.a.b.a.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.G.b.a.b.a.I:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry defaultInstance -> f
@@ -48594,11 +48391,11 @@
     1:1:boolean hasName():20550:20550 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstance():20471:20471 -> i
     1:1:void initFields():20560:20560 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.G.b.a.b.a.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.G.b.a.b.a.G:
     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.G.b.a.b.a.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.G.b.a.b.a.H:
     int bitField0_ -> d
     int name_ -> e
     1:1:void <init>():20681:20681 -> <init>
@@ -48629,7 +48426,8 @@
     1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry buildPartial():20715:20722 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder create():20688:20688 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder access$19200():20675 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.G.b.a.b.a.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntryOrBuilder -> com.android.tools.r8.G.b.a.b.a.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.G.b.a.b.a.N:
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue constantValue_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -48715,11 +48513,11 @@
     1:1:boolean hasValueParameterReference():25191:25191 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getDefaultInstance():24960:24960 -> o
     1:7:void initFields():25391:25397 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.G.b.a.b.a.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.G.b.a.b.a.K:
     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.G.b.a.b.a.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.G.b.a.b.a.L:
     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
@@ -48799,7 +48597,7 @@
     1:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression buildPartial():25621:25654 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder create():25582:25582 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder access$23700():25568 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.G.b.a.b.a.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.G.b.a.b.a.M:
     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 FALSE -> c
@@ -48810,7 +48608,8 @@
     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.G.b.a.b.a.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ExpressionOrBuilder -> com.android.tools.r8.G.b.a.b.a.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.G.b.a.b.a.S:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> q
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int receiverTypeId_ -> k
@@ -48934,11 +48733,11 @@
     1:1:boolean hasTypeTable():14727:14727 -> x
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getDefaultInstance():14327:14327 -> y
     1:12:void initFields():14786:14797 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.G.b.a.b.a.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.G.b.a.b.a.P:
     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.G.b.a.b.a.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.G.b.a.b.a.Q:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     int returnTypeId_ -> i
@@ -49080,7 +48879,8 @@
     1:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function buildPartial():15096:15150 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder create():15047:15047 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder access$13300():15034 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.G.b.a.b.a.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$FunctionOrBuilder -> com.android.tools.r8.G.b.a.b.a.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.G.b.a.b.a.W:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> h
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -49155,11 +48955,11 @@
     1:1:boolean hasVersionRequirementTable():11825:11825 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package getDefaultInstance():11572:11572 -> k
     1:5:void initFields():11835:11839 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.G.b.a.b.a.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.G.b.a.b.a.U:
     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.G.b.a.b.a.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.G.b.a.b.a.V:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
     java.util.List property_ -> f
     java.util.List function_ -> e
@@ -49243,7 +49043,8 @@
     1:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package buildPartial():12054:12080 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder create():12019:12019 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder access$10800():12006 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.G.b.a.b.a.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$PackageOrBuilder -> com.android.tools.r8.G.b.a.b.a.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.G.b.a.b.a.a0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property defaultInstance -> q
     int setterFlags_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter setterValueParameter_ -> l
@@ -49358,11 +49159,11 @@
     1:1:boolean hasReturnTypeId():16579:16579 -> x
     1:1:boolean hasSetterFlags():16713:16713 -> y
     1:1:boolean hasSetterValueParameter():16659:16659 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.G.b.a.b.a.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.G.b.a.b.a.Y:
     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.G.b.a.b.a.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.G.b.a.b.a.Z:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -49485,7 +49286,8 @@
     1:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property buildPartial():17055:17108 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder create():17006:17006 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder access$15000():16993 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.G.b.a.b.a.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$PropertyOrBuilder -> com.android.tools.r8.G.b.a.b.a.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.G.b.a.b.a.j0:
     int outerTypeId_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int typeAliasName_ -> l
@@ -49615,11 +49417,11 @@
     1:1:boolean hasFlexibleTypeCapabilitiesId():5728:5728 -> x
     1:1:boolean hasFlexibleUpperBound():5748:5748 -> y
     1:1:boolean hasFlexibleUpperBoundId():5763:5763 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.G.b.a.b.a.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.G.b.a.b.a.c0:
     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.G.b.a.b.a.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.G.b.a.b.a.g0:
     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$Type$Argument$Projection projection_ -> c
@@ -49676,11 +49478,11 @@
     1:1:boolean hasTypeId():5257:5257 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument getDefaultInstance():5041:5041 -> k
     1:3:void initFields():5267:5269 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.G.b.a.b.a.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.G.b.a.b.a.d0:
     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.G.b.a.b.a.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.G.b.a.b.a.e0:
     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
@@ -49734,7 +49536,7 @@
     1:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5440:5455 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder create():5409:5409 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder access$5000():5395 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.G.b.a.b.a.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.G.b.a.b.a.f0:
     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
@@ -49747,7 +49549,8 @@
     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.G.b.a.b.a.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$ArgumentOrBuilder -> com.android.tools.r8.G.b.a.b.a.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.G.b.a.b.a.i0:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -49876,7 +49679,7 @@
     1:61:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type buildPartial():6259:6319 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder create():6206:6206 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder access$5700():6193 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.G.b.a.b.a.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.G.b.a.b.a.m0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int expandedTypeId_ -> j
     int underlyingTypeId_ -> h
@@ -49975,11 +49778,11 @@
     1:1:boolean hasUnderlyingTypeId():19283:19283 -> r
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstance():19027:19027 -> s
     1:9:void initFields():19392:19400 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.G.b.a.b.a.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.G.b.a.b.a.k0:
     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.G.b.a.b.a.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.G.b.a.b.a.l0:
     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
@@ -50081,7 +49884,9 @@
     1:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias buildPartial():19660:19702 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder create():19617:19617 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$17800():19604 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.G.b.a.b.a.d0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAliasOrBuilder -> com.android.tools.r8.G.b.a.b.a.n0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeOrBuilder -> com.android.tools.r8.G.b.a.b.a.o0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.G.b.a.b.a.s0:
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter defaultInstance -> k
@@ -50154,11 +49959,11 @@
     1:1:boolean hasVariance():7510:7510 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getDefaultInstance():7264:7264 -> o
     1:6:void initFields():7578:7583 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.G.b.a.b.a.a0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.G.b.a.b.a.p0:
     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.G.b.a.b.a.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.G.b.a.b.a.q0:
     int name_ -> f
     java.util.List upperBoundId_ -> j
     java.util.List upperBound_ -> i
@@ -50219,7 +50024,7 @@
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7811:7840 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder create():7774:7774 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder access$7600():7761 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.G.b.a.b.a.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.G.b.a.b.a.r0:
     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 OUT -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance INV -> d
@@ -50230,7 +50035,8 @@
     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.G.b.a.b.a.g0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameterOrBuilder -> com.android.tools.r8.G.b.a.b.a.t0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.G.b.a.b.a.w0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List type_ -> c
@@ -50286,11 +50092,11 @@
     1:1:boolean hasFirstNullable():12868:12868 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getDefaultInstance():12738:12738 -> g
     1:2:void initFields():12883:12884 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.G.b.a.b.a.e0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.G.b.a.b.a.u0:
     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.G.b.a.b.a.f0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.G.b.a.b.a.v0:
     java.util.List type_ -> c
     int firstNullable_ -> d
     int bitField0_ -> b
@@ -50329,7 +50135,8 @@
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13046:13058 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder create():13017:13017 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder access$11800():13003 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.G.b.a.b.a.j0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTableOrBuilder -> com.android.tools.r8.G.b.a.b.a.x0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.G.b.a.b.a.A0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter defaultInstance -> k
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -50410,11 +50217,11 @@
     1:1:boolean hasVarargElementTypeId():18270:18270 -> r
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstance():18061:18061 -> s
     1:6:void initFields():18280:18285 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.G.b.a.b.a.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.G.b.a.b.a.y0:
     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.G.b.a.b.a.i0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.G.b.a.b.a.z0:
     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
@@ -50494,7 +50301,8 @@
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18501:18528 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder create():18464:18464 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder access$16700():18451 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.G.b.a.b.a.o0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameterOrBuilder -> com.android.tools.r8.G.b.a.b.a.B0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.G.b.a.b.a.G0:
     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
@@ -50557,11 +50365,11 @@
     1:1:boolean hasVersionKind():21311:21311 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement getDefaultInstance():20937:20937 -> q
     1:6:void initFields():21326:21331 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.G.b.a.b.a.k0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.G.b.a.b.a.C0:
     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.G.b.a.b.a.l0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.G.b.a.b.a.D0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     int errorCode_ -> f
     int message_ -> g
@@ -50616,7 +50424,7 @@
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21523:21550 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder create():21486:21486 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder access$19800():21472 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.G.b.a.b.a.m0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.G.b.a.b.a.E0:
     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
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level WARNING -> b
@@ -50627,7 +50435,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.G.b.a.b.a.n0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.G.b.a.b.a.F0:
     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
@@ -50638,7 +50446,8 @@
     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.G.b.a.b.a.r0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementOrBuilder -> com.android.tools.r8.G.b.a.b.a.H0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.G.b.a.b.a.K0:
     java.util.List requirement_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -50680,11 +50489,11 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():21944 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getDefaultInstance():21957:21957 -> e
     1:1:void initFields():22071:22071 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.G.b.a.b.a.p0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.G.b.a.b.a.I0:
     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.G.b.a.b.a.q0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.G.b.a.b.a.J0:
     java.util.List requirement_ -> c
     int bitField0_ -> b
     1:85:void <init>():22184:22268 -> <init>
@@ -50715,7 +50524,8 @@
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():22218:22224 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder create():22191:22191 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$20900():22177 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.G.b.a.b.a.s0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTableOrBuilder -> com.android.tools.r8.G.b.a.b.a.L0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.G.b.a.b.a.M0.a:
     java.util.List rest -> d
     int[] numbers -> e
     int minor -> b
@@ -50732,7 +50542,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.jvm.JvmProtoBuf -> com.android.tools.r8.G.b.a.b.a.t0.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.G.b.a.b.a.N0.w:
     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
@@ -50747,8 +50557,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.G.b.a.b.a.t0.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.G.b.a.b.a.t0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.G.b.a.b.a.N0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.G.b.a.b.a.N0.d:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     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 -> f
@@ -50798,11 +50608,11 @@
     1:1:boolean hasName():2691:2691 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature getDefaultInstance():2607:2607 -> i
     1:2:void initFields():2724:2725 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.G.b.a.b.a.t0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.G.b.a.b.a.N0.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.G.b.a.b.a.t0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.G.b.a.b.a.N0.c:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -50837,7 +50647,8 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2881:2892 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder create():2852:2852 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder access$2500():2838 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.G.b.a.b.a.t0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignatureOrBuilder -> com.android.tools.r8.G.b.a.b.a.N0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.G.b.a.b.a.N0.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature defaultInstance -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -50887,11 +50698,11 @@
     1:1:boolean hasName():2229:2229 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getDefaultInstance():2145:2145 -> i
     1:2:void initFields():2262:2263 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.G.b.a.b.a.t0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.G.b.a.b.a.N0.f:
     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.G.b.a.b.a.t0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.G.b.a.b.a.N0.g:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -50926,7 +50737,8 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2419:2430 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder create():2390:2390 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder access$1800():2376 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.G.b.a.b.a.t0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignatureOrBuilder -> com.android.tools.r8.G.b.a.b.a.N0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.G.b.a.b.a.N0.l:
     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$JvmPropertySignature defaultInstance -> h
@@ -50983,11 +50795,11 @@
     1:1:boolean hasSyntheticMethod():3232:3232 -> l
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature getDefaultInstance():3087:3087 -> m
     1:4:void initFields():3276:3279 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.G.b.a.b.a.t0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.G.b.a.b.a.N0.j:
     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.G.b.a.b.a.t0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.G.b.a.b.a.N0.k:
     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
@@ -51066,7 +50878,8 @@
     1:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3453:3472 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder create():3420:3420 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder access$3200():3406 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.G.b.a.b.a.t0.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignatureOrBuilder -> com.android.tools.r8.G.b.a.b.a.N0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.G.b.a.b.a.N0.u:
     java.util.List record_ -> 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
@@ -51112,11 +50925,11 @@
     1:1:java.util.List getRecordList():1568:1568 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getDefaultInstance():83:83 -> g
     1:2:void initFields():1633:1634 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.G.b.a.b.a.t0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.G.b.a.b.a.N0.n:
     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.G.b.a.b.a.t0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.G.b.a.b.a.N0.o:
     java.util.List localName_ -> d
     java.util.List record_ -> c
     int bitField0_ -> b
@@ -51151,7 +50964,7 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1804:1815 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder create():1775:1775 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder access$1200():1761 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.G.b.a.b.a.t0.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.G.b.a.b.a.N0.s:
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.lang.Object string_ -> e
@@ -51214,11 +51027,11 @@
     1:1:boolean hasString():626:626 -> k
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record getDefaultInstance():341:341 -> l
     1:6:void initFields():773:778 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.G.b.a.b.a.t0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.G.b.a.b.a.N0.p:
     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.G.b.a.b.a.t0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.G.b.a.b.a.N0.q:
     java.lang.Object string_ -> e
     int predefinedIndex_ -> d
     java.util.List replaceChar_ -> h
@@ -51268,7 +51081,7 @@
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record buildPartial():998:1027 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder create():961:961 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder access$200():947 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.G.b.a.b.a.t0.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.G.b.a.b.a.N0.r:
     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 DESC_TO_CLASS_ID -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation INTERNAL_TO_CLASS_ID -> c
@@ -51279,9 +51092,12 @@
     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.G.b.a.b.a.t0.s.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$RecordOrBuilder -> com.android.tools.r8.G.b.a.b.a.N0.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypesOrBuilder -> com.android.tools.r8.G.b.a.b.a.N0.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.G.b.a.b.a.N0.x.a:
     boolean $assertionsDisabled -> a
     1:13:void <clinit>():15:27 -> <clinit>
+    void $$$reportNull$$$0(int) -> a
     1:4:byte[] decodeBytes(java.lang.String[]):179:182 -> a
     5:82:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.UtfEncodingKt.stringsToBytes(java.lang.String[]):0:77 -> a
     5:82:byte[] decodeBytes(java.lang.String[]):182 -> a
@@ -51294,12 +51110,14 @@
     105:105:byte[] decodeBytes(java.lang.String[]):191 -> a
     106:122:byte[] decode7to8(byte[]):247:263 -> a
     106:122:byte[] decodeBytes(java.lang.String[]):192 -> a
+    123:123:byte[] combineStringArrayIntoBytes(java.lang.String[]):0:0 -> a
+    123:123:byte[] decodeBytes(java.lang.String[]):189 -> a
     1:2:java.lang.String[] dropMarker(java.lang.String[]):199:200 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.G.b.a.b.a.t0.s.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.G.b.a.b.a.N0.x.b:
     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.JvmMetadataVersion -> com.android.tools.r8.G.b.a.b.a.t0.s.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.G.b.a.b.a.N0.x.c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> g
     boolean isStrictSemantics -> f
     1:1:void <clinit>():30:30 -> <clinit>
@@ -51310,7 +51128,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.G.b.a.b.a.t0.s.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.G.b.a.b.a.N0.x.d:
     java.util.List PREDEFINED_STRINGS -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes types -> a
     1:31:void <clinit>():78:108 -> <clinit>
@@ -51340,7 +51158,7 @@
     110:113:void <clinit>():117:120 -> <clinit>
     114:114:void <clinit>():111:111 -> <clinit>
     1:16:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.lang.String[]):13:28 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.G.b.a.b.a.t0.s.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.G.b.a.b.a.N0.x.e:
     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>
@@ -51814,7 +51632,7 @@
     3:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet clone():135:145 -> clone
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet newFieldSet():92:92 -> d
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.G.b.a.b.b.q:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.G.b.a.b.b.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.G.b.a.b.b.y:
     1:1:void <init>():53:53 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):56:56 -> <init>
     1:1:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):73:73 -> a
@@ -51930,7 +51748,8 @@
     2:2:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):246:246 -> a
     1:1:boolean extensionsAreInitialized():233:233 -> e
     1:1:void makeExtensionsImmutable():261:261 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.G.b.a.b.b.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessageOrBuilder -> com.android.tools.r8.G.b.a.b.b.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.G.b.a.b.b.w:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap enumTypeMap -> a
     int number -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType type -> c
@@ -51940,25 +51759,24 @@
     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.G.b.a.b.b.w:
-    java.lang.Object defaultValue -> b
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite messageDefaultInstance -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.G.b.a.b.b.x:
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite containingTypeDefaultInstance -> a
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite messageDefaultInstance -> b
     1:22:void <init>(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.GeneratedMessageLite$ExtensionDescriptor,java.lang.Class):786:807 -> <init>
     23:23:void <init>(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.GeneratedMessageLite$ExtensionDescriptor,java.lang.Class):790:790 -> <init>
     1:1:java.lang.Object singularToFieldSetType(java.lang.Object):885:885 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> a
     2:2:java.lang.Object singularToFieldSetType(java.lang.Object):885 -> a
     3:4:java.lang.Object singularToFieldSetType(java.lang.Object):885:886 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.G.b.a.b.b.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.G.b.a.b.b.B:
     byte[] EMPTY_BYTE_ARRAY -> a
     1:6:void <clinit>():383:388 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.G.b.a.b.b.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.G.b.a.b.b.z:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.G.b.a.b.b.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.G.b.a.b.b.A:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite findValueByNumber(int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.G.b.a.b.b.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.G.b.a.b.b.C:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite unfinishedMessage -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
     2:2:void <init>(java.lang.String):43:43 -> <init>
@@ -51967,7 +51785,7 @@
     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.LiteralByteString -> com.android.tools.r8.G.b.a.b.b.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.G.b.a.b.b.F:
     int hash -> d
     byte[] bytes -> c
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -51989,8 +51807,8 @@
     1:1:java.util.Iterator iterator():52:52 -> iterator
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator iterator():307:307 -> iterator
     1:1:int size():76:76 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.G.b.a.b.b.C:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.G.b.a.b.b.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.G.b.a.b.b.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.G.b.a.b.b.E:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> c
     int limit -> b
     int position -> a
@@ -52001,12 +51819,12 @@
     1:1:java.lang.Object next():310 -> next
     1:3:byte nextByte():330:332 -> nextByte
     1:1:void remove():337:337 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.G.b.a.b.b.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.G.b.a.b.b.G:
     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.G.b.a.b.b.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.G.b.a.b.b.H:
     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.G.b.a.b.b.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.G.b.a.b.b.M:
     int[] minLengthByDepth -> i
     int hash -> h
     int leftLength -> f
@@ -52039,8 +51857,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.G.b.a.b.b.H:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.G.b.a.b.b.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.G.b.a.b.b.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.G.b.a.b.b.J:
     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>
@@ -52062,7 +51880,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.G.b.a.b.b.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.G.b.a.b.b.K:
     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>
@@ -52083,7 +51901,7 @@
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765:765 -> next
     15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> next
     1:1:void remove():770:770 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.G.b.a.b.b.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.G.b.a.b.b.L:
     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
@@ -52094,7 +51912,7 @@
     1:1:java.lang.Object next():782 -> next
     1:5:byte nextByte():803:807 -> nextByte
     1:1:void remove():811:811 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.G.b.a.b.b.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.G.b.a.b.b.S:
     java.util.List entryList -> b
     java.util.Map overflowEntries -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet lazyEntrySet -> e
@@ -52129,7 +51947,7 @@
     1:5:java.util.SortedMap getOverflowEntriesMutable():377:381 -> 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.G.b.a.b.b.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.G.b.a.b.b.N:
     1:1:void <init>(int):100:100 -> <init>
     1:5:void makeImmutable():104:108 -> l
     6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> l
@@ -52139,20 +51957,20 @@
     14:14:void makeImmutable():115 -> l
     15:20:void makeImmutable():116:121 -> l
     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.G.b.a.b.b.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.G.b.a.b.b.Q:
     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.G.b.a.b.b.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.G.b.a.b.b.O:
     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.G.b.a.b.b.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.G.b.a.b.b.P:
     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.G.b.a.b.b.Q$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.G.b.a.b.b.S$a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Comparable key -> a
@@ -52176,7 +51994,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.G.b.a.b.b.Q$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.G.b.a.b.b.S$b:
     java.util.Iterator lazyOverflowIterator -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     boolean nextCalledBeforeRemove -> b
@@ -52189,7 +52007,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.G.b.a.b.b.Q$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.G.b.a.b.b.S$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>
@@ -52201,9 +52019,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.G.b.a.b.b.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.G.b.a.b.b.T:
     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.G.b.a.b.b.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.G.b.a.b.b.U:
     1:6:int incompleteStateFor(byte[],int,int):341:346 -> a
     7:7:int incompleteStateFor(byte[],int,int):344:344 -> a
     1:1:int partialIsValidUtf8(byte[],int,int):252:252 -> b
@@ -52211,10 +52029,10 @@
     2:38:int partialIsValidUtf8NonAscii(byte[],int,int):270:306 -> b
     2:38:int partialIsValidUtf8(byte[],int,int):256 -> b
     2:38:boolean isValidUtf8(byte[],int,int):122 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.G.b.a.b.b.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.G.b.a.b.b.c0:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.G.b.a.b.b.U:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.G.b.a.b.b.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.G.b.a.b.b.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.G.b.a.b.b.a0:
     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
@@ -52243,33 +52061,32 @@
     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.G.b.a.b.b.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.G.b.a.b.b.W:
     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.G.b.a.b.b.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.G.b.a.b.b.X:
     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.G.b.a.b.b.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.G.b.a.b.b.Y:
     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.G.b.a.b.b.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.G.b.a.b.b.Z:
     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.G.b.a.b.b.a0:
-    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
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType[] $VALUES -> k
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType DOUBLE -> e
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType MESSAGE -> j
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BYTE_STRING -> h
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType ENUM -> i
-    java.lang.Object defaultDefault -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType INT -> b
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType LONG -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.G.b.a.b.b.b0:
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType STRING -> f
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BYTE_STRING -> g
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType DOUBLE -> d
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BOOLEAN -> e
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType[] $VALUES -> j
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType ENUM -> h
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType MESSAGE -> i
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType LONG -> b
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType FLOAT -> c
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType INT -> a
     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>
+    1:1:void <init>(java.lang.String,int,java.lang.Object):88:88 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.G.b.a.c.a:
     int[] metadataVersion -> b
     java.lang.String[] data2 -> d
@@ -52290,6 +52107,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader getHeader():25:25 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.G.b.a.c.c:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):29:30 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.G.b.a.c.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -52306,6 +52124,7 @@
     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.G.b.a.c.f:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):84:85 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.G.b.a.c.e:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -52321,6 +52140,7 @@
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.G.b.a.c.g:
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):217:221 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.G.b.a.c.i:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):260:261 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.G.b.a.c.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -52334,6 +52154,7 @@
     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.G.b.a.c.k:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):140:141 -> <init>
     1:1:boolean isLambda():159:159 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.G.b.a.c.j:
@@ -52381,23 +52202,25 @@
     2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106:106 -> a
     3:3:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withValuesConvertedBy(com.android.tools.r8.joptsimple.ValueConverter):126:126 -> a
     3:3:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106 -> a
-    4:4:void addDefaultValue(java.lang.Object):248:248 -> a
-    4:4:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
-    5:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):224:224 -> a
-    5:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
-    6:6:void addDefaultValue(java.lang.Object):248:248 -> a
-    6:6:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):225 -> a
+    4:4:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withValuesConvertedBy(com.android.tools.r8.joptsimple.ValueConverter):124:124 -> a
+    4:4:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106 -> a
+    5:5:void addDefaultValue(java.lang.Object):248:248 -> a
+    5:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
+    6:6:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):224:224 -> a
     6:6:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
-    7:7:void com.android.tools.r8.joptsimple.internal.Objects.ensureNotNull(java.lang.Object):44:44 -> a
-    7:7:void addDefaultValue(java.lang.Object):247 -> a
+    7:7:void addDefaultValue(java.lang.Object):248:248 -> a
     7:7:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):225 -> a
     7:7:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
     8:8:void com.android.tools.r8.joptsimple.internal.Objects.ensureNotNull(java.lang.Object):44:44 -> a
     8:8:void addDefaultValue(java.lang.Object):247 -> a
-    8:8:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
-    9:12:void handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):255:258 -> a
-    13:18:void addArguments(com.android.tools.r8.joptsimple.OptionSet,java.lang.String):262:267 -> a
-    19:19:java.lang.Object convert(java.lang.String):276:276 -> a
+    8:8:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):225 -> a
+    8:8:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
+    9:9:void com.android.tools.r8.joptsimple.internal.Objects.ensureNotNull(java.lang.Object):44:44 -> a
+    9:9:void addDefaultValue(java.lang.Object):247 -> a
+    9:9:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
+    10:13:void handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):255:258 -> a
+    14:19:void addArguments(com.android.tools.r8.joptsimple.OptionSet,java.lang.String):262:267 -> a
+    20:20:java.lang.Object convert(java.lang.String):276:276 -> a
     1:5:boolean canConvertArgument(java.lang.String):280:284 -> b
     6:6:java.lang.Object convert(java.lang.String):276:276 -> b
     6:6:boolean canConvertArgument(java.lang.String):284 -> b
@@ -52917,7 +52740,7 @@
     9:26:void <init>(com.android.tools.r8.kotlin.Kotlin):60:77 -> <init>
     27:27:void <init>(com.android.tools.r8.kotlin.Kotlin):75:75 -> <init>
     1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):62:62 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     2:2:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):62 -> a
     3:3:int getArity(com.android.tools.r8.graph.DexType):85:85 -> a
     4:4:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):81:81 -> a
@@ -53068,6 +52891,7 @@
 com.android.tools.r8.naming.ApplyMappingError -> com.android.tools.r8.K.a:
     1:1:void <init>(java.lang.String,com.android.tools.r8.position.Position):26:26 -> <init>
     1:2:com.android.tools.r8.naming.ApplyMappingError mapToExistingClass(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):31:32 -> a
+    1:2:com.android.tools.r8.naming.ApplyMappingError mapToExistingMember(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38:39 -> b
 com.android.tools.r8.naming.ClassNameMapper -> com.android.tools.r8.K.e:
     java.util.Map signatureMap -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap classNameMappings -> a
@@ -53599,12 +53423,12 @@
     49:49:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):121:121 -> a
     50:85:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):137:172 -> a
     50:85:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):120 -> a
-    86:86:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    86:86:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     86:86:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):172 -> a
     86:86:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):120 -> a
     87:89:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):174:176 -> a
     87:89:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):120 -> a
-    90:90:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    90:90:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     90:90:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):176 -> a
     90:90:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):120 -> a
     91:103:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):179:191 -> a
@@ -53613,115 +53437,113 @@
     104:104:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):138 -> a
     104:104:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):120 -> a
     105:211:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):201:307 -> a
-    212:212:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    212:212:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     212:212:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):307 -> a
-    213:213:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    213:213:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     213:213:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):308 -> a
     214:216:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):310:312 -> a
-    217:217:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    217:217:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     217:217:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):312 -> a
     218:221:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):315:318 -> a
     222:225:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):209:212 -> a
     226:227:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):337:338 -> a
     226:227:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    228:229:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):169:170 -> a
+    228:229:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):147:148 -> a
     228:229:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):338 -> a
     228:229:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    230:236:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):339:345 -> a
-    230:236:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    237:246:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):344:353 -> a
-    237:246:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    247:247:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):352:352 -> a
-    247:247:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    248:267:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:236 -> a
-    268:270:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> a
-    268:270:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> a
-    268:270:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):236 -> a
-    271:276:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):237:242 -> a
-    277:277:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
-    277:277:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
-    278:292:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:259 -> a
-    293:293:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    293:293:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):259 -> a
-    294:294:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    294:294:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):260 -> a
-    295:297:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):262:264 -> a
-    298:298:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    298:298:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):264 -> a
-    299:357:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):267:325 -> a
-    358:364:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
-    365:365:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
-    365:365:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
-    366:369:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:331 -> a
-    370:370:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
-    371:400:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):362:391 -> a
+    230:243:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):339:352 -> a
+    230:243:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    244:244:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):351:351 -> a
+    244:244:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    245:264:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:236 -> a
+    265:267:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> a
+    265:267:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> a
+    265:267:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):236 -> a
+    268:273:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):237:242 -> a
+    274:274:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
+    274:274:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
+    275:289:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:259 -> a
+    290:290:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    290:290:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):259 -> a
+    291:291:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    291:291:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):260 -> a
+    292:294:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):262:264 -> a
+    295:295:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    295:295:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):264 -> a
+    296:354:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):267:325 -> a
+    355:361:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
+    362:362: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
+    362:362:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
+    363:366:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:331 -> a
+    367:367:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
+    368:397:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):361:390 -> a
 com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.K.D:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
     boolean lambda$evaluateTypeArrayContentFromConstructionToUse$0(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:89:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):67:155 -> a
-    90:96:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):108:114 -> a
-    97:97:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    97:97:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):364 -> a
-    98:101:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):364:367 -> a
-    102:103:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):169:170 -> a
-    104:106:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexItemFactory):174:176 -> a
-    107:124:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):198:215 -> a
-    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    125:125:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):307 -> a
-    125:125:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):214 -> a
-    126:134:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):308:316 -> a
-    126:134:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):214 -> a
-    135:135:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    135:135:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):307 -> a
-    135:135:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):214 -> a
-    136:175:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):221:260 -> a
-    176:214:com.android.tools.r8.graph.DexTypeList retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):519:557 -> a
-    176:214:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):260 -> a
-    215:221: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):556:562 -> a
-    215:221:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):260 -> a
-    222:222:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):264:264 -> a
-    223:223:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    223:223:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):385 -> a
-    223:223:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):264 -> a
-    224:227:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):385:388 -> a
-    224:227:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):264 -> a
-    228:230:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):266:268 -> a
-    231:231:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    231:231:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):180 -> a
-    232:234:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):181:183 -> a
-    235:235:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    235:235:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):180 -> a
-    236:238:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):274:276 -> a
-    239:239:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    239:239:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):276 -> a
-    240:240:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):277:277 -> a
-    241:241:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    241:241:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):276 -> a
-    242:269:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):324:351 -> a
-    242:269:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
-    270:270:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    270:270:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):351 -> a
-    270:270:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
-    271:275:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):352:356 -> a
-    271:275:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
-    276:276:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    276:276:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):374 -> a
-    276:276:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):358 -> a
-    276:276:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
-    277:279:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):374:376 -> a
-    277:279:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):358 -> a
-    277:279:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
-    280:280:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):291:291 -> a
-    281:324:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):417:460 -> a
-    325:333:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):396:404 -> a
-    325:333:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):460 -> a
-    334:334:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):403:403 -> a
-    334:334:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):460 -> a
-    335:350:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):465:480 -> a
-    1:3:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):298:300 -> b
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
-    4:4:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):300 -> b
+    1:79:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):55:133 -> a
+    80:86:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):86:92 -> a
+    87:87:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
+    87:87:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):340 -> a
+    88:91:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):340:343 -> a
+    92:93:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):147:148 -> a
+    94:96:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexItemFactory):152:154 -> a
+    97:112:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):176:191 -> a
+    113:113:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    113:113:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):283 -> a
+    113:113:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
+    114:122:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):284:292 -> a
+    114:122:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
+    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    123:123:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):283 -> a
+    123:123:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
+    124:163:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):197:236 -> a
+    164:202: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):495:533 -> a
+    164:202:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):236 -> a
+    203:209: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):532:538 -> a
+    203:209:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):236 -> a
+    210:210:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):240:240 -> a
+    211:211:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    211:211:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):361 -> a
+    211:211:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):240 -> a
+    212:215:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):361:364 -> a
+    212:215:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):240 -> a
+    216:218:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):242:244 -> a
+    219:221:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):250:252 -> a
+    222:222:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    222:222:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):252 -> a
+    223:223:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):253:253 -> a
+    224:224:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    224:224:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):252 -> a
+    225:225:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    225:225:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):158 -> a
+    226:228:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):159:161 -> a
+    229:229:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    229:229:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):158 -> a
+    230:257:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):300:327 -> a
+    230:257:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    258:258:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    258:258:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):327 -> a
+    258:258:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    259:263:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):328:332 -> a
+    259:263:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    264:264:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    264:264:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):350 -> a
+    264:264:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):334 -> a
+    264:264:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    265:267:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):350:352 -> a
+    265:267:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):334 -> a
+    265:267:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    268:268:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):267:267 -> a
+    269:312:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):393:436 -> a
+    313:321:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):372:380 -> a
+    313:321:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):436 -> a
+    322:322:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):379:379 -> a
+    322:322:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):436 -> a
+    323:338:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):441:456 -> a
+    1:3:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):274:276 -> b
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
+    4:4:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):276 -> b
 com.android.tools.r8.naming.InterfaceMethodNameMinifier -> com.android.tools.r8.K.G:
     com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> d
     com.android.tools.r8.graph.AppView appView -> a
@@ -53885,10 +53707,10 @@
     8:8:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):235 -> a
     9:10:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):235:236 -> a
     11:13:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):270:272 -> a
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     14:14:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):272 -> a
     15:17:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):272:274 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     18:18:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):274 -> a
     19:20:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):277:278 -> a
     21:21:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):275:275 -> a
@@ -54289,7 +54111,7 @@
     30:31:java.lang.String lookupPackageName(java.lang.String):125 -> a
     32:32:java.lang.String lookupPackageName(java.lang.String):126:126 -> a
     33:33:void forAllRenamedTypes(java.util.function.Consumer):142:142 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     34:34:void forAllRenamedTypes(java.util.function.Consumer):142 -> a
     35:37:void forAllRenamedTypes(java.util.function.Consumer):143:145 -> a
     38:51:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):152:165 -> a
@@ -54319,145 +54141,148 @@
     java.util.Map additionalFieldNamings -> k
     java.util.Map memberNames -> g
     java.util.Map syntheticCompanionClasses -> h
-    1:1:void <clinit>():63:63 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):82:82 -> <init>
-    2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):69:86 -> <init>
-    1:1:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
-    1:1:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):272 -> a
-    2:6:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):273:277 -> a
-    7:14:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):276:283 -> a
-    15:17:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):161:163 -> a
-    15:17:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):283 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    18:18:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163 -> a
-    18:18:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):283 -> a
-    19:20:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163:164 -> a
-    19:20:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):283 -> a
-    21:21:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):161:161 -> a
-    21:21:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):283 -> a
-    22:22:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):285:285 -> a
-    23:27:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):284:288 -> a
-    28:28:int lambda$new$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):71:71 -> a
-    29:47:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):91:109 -> a
-    48:48:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
-    48:48:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):109 -> a
-    49:52:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):117:120 -> a
-    53:63:void computeDefaultInterfaceMethodMethods():319:329 -> a
-    53:63:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    64:79:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):345:360 -> a
-    64:79:void computeDefaultInterfaceMethodMethods():329 -> a
-    64:79:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):81:81 -> <init>
+    2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):68:85 -> <init>
+    1:1:int lambda$new$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):70:70 -> a
+    2:2:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
+    2:2:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):271 -> a
+    3:7:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):272:276 -> a
+    8:15:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):275:282 -> a
+    16:18:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):161:163 -> a
+    16:18:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    19:19:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163 -> a
+    19:19:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
+    20:21:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163:164 -> a
+    20:21:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
+    22:22:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):161:161 -> a
+    22:22:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
+    23:23:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):284:284 -> a
+    24:28:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):283:287 -> a
+    29:47:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):90:108 -> a
+    48:48:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
+    48:48:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):108 -> a
+    49:52:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):116:119 -> a
+    53:63:void computeDefaultInterfaceMethodMethods():318:328 -> a
+    53:63:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    64:79:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):344:359 -> a
+    64:79:void computeDefaultInterfaceMethodMethods():328 -> a
+    64:79:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     80:80:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
-    80:80:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361 -> a
-    80:80:void computeDefaultInterfaceMethodMethods():329 -> a
-    80:80:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    81:82:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361:362 -> a
-    81:82:void computeDefaultInterfaceMethodMethods():329 -> a
-    81:82:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
+    80:80:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):360 -> a
+    80:80:void computeDefaultInterfaceMethodMethods():328 -> a
+    80:80:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    81:82:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):360:361 -> a
+    81:82:void computeDefaultInterfaceMethodMethods():328 -> a
+    81:82:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     83:84:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.toUnqualified():255:256 -> a
-    83:84:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):365 -> a
-    83:84:void computeDefaultInterfaceMethodMethods():329 -> a
-    83:84:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    85:85:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):365:365 -> a
-    85:85:void computeDefaultInterfaceMethodMethods():329 -> a
-    85:85:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    86:89:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:367 -> a
-    86:89:void computeDefaultInterfaceMethodMethods():329 -> a
-    86:89:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
+    83:84:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364 -> a
+    83:84:void computeDefaultInterfaceMethodMethods():328 -> a
+    83:84:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    85:85:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:364 -> a
+    85:85:void computeDefaultInterfaceMethodMethods():328 -> a
+    85:85:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    86:89:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):363:366 -> a
+    86:89:void computeDefaultInterfaceMethodMethods():328 -> a
+    86:89:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     90:90:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    90:90:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):368 -> a
-    90:90:void computeDefaultInterfaceMethodMethods():329 -> a
-    90:90:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    91:91:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):368:368 -> a
-    91:91:void computeDefaultInterfaceMethodMethods():329 -> a
-    91:91:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    92:92:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367:367 -> a
-    92:92:void computeDefaultInterfaceMethodMethods():329 -> a
-    92:92:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    93:135:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):122:164 -> a
-    136:138:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):112:114 -> a
-    139:162:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):170:193 -> a
-    163:178:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):190:205 -> a
-    179:186:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):204:211 -> a
+    90:90:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367 -> a
+    90:90:void computeDefaultInterfaceMethodMethods():328 -> a
+    90:90:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    91:91:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367:367 -> a
+    91:91:void computeDefaultInterfaceMethodMethods():328 -> a
+    91:91:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    92:92:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):366:366 -> a
+    92:92:void computeDefaultInterfaceMethodMethods():328 -> a
+    92:92:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    93:135:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121:163 -> a
+    136:138:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):111:113 -> a
+    139:162:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):169:192 -> a
+    163:178:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):189:204 -> a
+    179:186:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):203:210 -> a
     187:187:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    187:187:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):212 -> a
-    188:188:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):213:213 -> a
+    187:187:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):211 -> a
+    188:188:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):212:212 -> a
     189:189:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    189:189:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):213 -> a
-    190:190:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):213:213 -> a
-    191:204:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):208:221 -> a
-    205:226:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):220:241 -> a
-    227:227:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
-    227:227:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):242 -> a
-    228:231:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):243:246 -> a
-    232:232:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
-    232:232:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):247 -> a
-    233:233:void lambda$computeMapping$4(java.util.Deque,com.android.tools.r8.graph.DexType):242:242 -> a
-    234:243:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):253:262 -> a
-    244:244:void lambda$addNonPrivateInterfaceMappings$6(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):259:259 -> a
-    245:246:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):295:296 -> a
+    189:189:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):212 -> a
+    190:190:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):212:212 -> a
+    191:204:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):207:220 -> a
+    205:226:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):219:240 -> a
+    227:227:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
+    227:227:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):241 -> a
+    228:231:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):242:245 -> a
+    232:232:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
+    232:232:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):246 -> a
+    233:233:void lambda$computeMapping$4(java.util.Deque,com.android.tools.r8.graph.DexType):241:241 -> a
+    234:243:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):252:261 -> a
+    244:244:void lambda$addNonPrivateInterfaceMappings$6(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):258:258 -> a
+    245:246:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):294:295 -> a
     247:247:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    247:247:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):296 -> a
-    248:248:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):296:296 -> a
-    249:253:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):295:299 -> a
+    247:247:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):295 -> a
+    248:248:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):295:295 -> a
+    249:253:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):294:298 -> a
     254:254:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    254:254:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):299 -> a
-    255:256:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):299:300 -> a
-    257:260:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):305:308 -> a
+    254:254:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):298 -> a
+    255:256:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):298:299 -> a
+    257:260:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):304:307 -> a
     261:261:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    261:261:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):312 -> a
-    262:262:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):312:312 -> a
-    263:263:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311:311 -> a
-    264:268:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):310:314 -> a
-    1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):94:94 -> b
-    2:2:void lambda$computeMapping$3(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):186:186 -> b
-    3:3:void lambda$computeMapping$5(java.util.Deque,com.android.tools.r8.graph.DexType):247:247 -> b
+    261:261:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311 -> a
+    262:262:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311:311 -> a
+    263:263:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):310:310 -> a
+    264:268:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):309:313 -> a
+    1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):93:93 -> b
+    2:2:void lambda$computeMapping$3(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):185:185 -> b
+    3:3:void lambda$computeMapping$5(java.util.Deque,com.android.tools.r8.graph.DexType):246:246 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.K.m0:
     boolean $assertionsDisabled -> h
     java.util.Map mappings -> g
-    1:1:void <clinit>():373:373 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):378:379 -> <init>
-    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):388:389 -> a
+    1:1:void <clinit>():372:372 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):377:378 -> <init>
+    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):387:388 -> a
     3:3:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
-    3: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):389 -> a
-    4:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):389:390 -> a
-    6:6:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):420:420 -> a
-    1:8:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):398:405 -> b
+    3: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):388 -> a
+    4:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):388:389 -> a
+    6:6:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):419:419 -> a
+    1:8:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):397:404 -> b
     9:9:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> b
-    9:9:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):405 -> b
-    10:15:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):406:411 -> b
+    9:9:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):404 -> b
+    10:15:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):405:410 -> b
     16:16:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> b
-    16:16:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):411 -> b
-    17:21:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):411:415 -> b
+    16:16:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):410 -> b
+    17:21:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):410:414 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.K.n0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexItemFactory factory -> i
     java.util.Map mappedNames -> h
-    1:1:void <clinit>():424:424 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):432:435 -> <init>
+    1:1:void <clinit>():423:423 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):431:434 -> <init>
     boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass) -> a
-    1:13:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):443:455 -> 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):454:454 -> a
-    15:17:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):464:466 -> 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):464:464 -> a
-    19:25: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):482:488 -> a
-    26:30:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):538:542 -> a
-    26:30: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):489 -> a
-    31:32:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):493:494 -> a
-    33:33:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
-    33:33:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):494 -> a
-    34:35:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):494:495 -> a
-    36:36:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):500:500 -> a
-    37:37:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):505:505 -> a
-    38:43: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):509:514 -> a
-    44:44:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    44:44:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):514 -> a
-    45:58: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):514:527 -> a
-    59:59:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    59:59: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):527 -> a
-    60:60: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):527:527 -> 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):452:452 -> 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):471:471 -> 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):442:442 -> a
+    2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):450:450 -> a
+    3:7:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):460:464 -> a
+    8:14:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):504:510 -> a
+    8:14:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):465 -> a
+    15:15:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):507:507 -> a
+    15:15:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):465 -> a
+    16:17:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):469:470 -> a
+    18:18:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
+    18:18:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):470 -> a
+    19:20:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):470:471 -> a
+    21:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):476:476 -> a
+    22:22:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):481:481 -> a
+    23:24:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):486:487 -> a
+    25:25:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
+    25:25:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):487 -> a
+    26:28:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):487:489 -> a
+    29:29:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
+    29:29:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):489 -> a
+    30:31:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):490:491 -> a
+    32:32:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
+    32:32:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):491 -> a
+    33:33:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):491:491 -> 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):442:442 -> 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):450:450 -> b
 com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.K.q0:
     java.io.BufferedReader reader -> a
     boolean $assertionsDisabled -> f
@@ -54616,7 +54441,6 @@
     1:6:boolean skipLine():130:135 -> j
     1:2:void skipWhitespace():144:145 -> k
 com.android.tools.r8.naming.ProguardMapReader$ParseException -> com.android.tools.r8.K.p0:
-    com.android.tools.r8.naming.ProguardMapReader this$0 -> e
     int lineOffset -> b
     boolean eol -> c
     int lineNo -> a
@@ -54928,7 +54752,7 @@
     4:9:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
     10:10:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):190:190 -> a
     10:10:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     11:11:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):189 -> a
     11:11:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
     12:14:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):194:196 -> a
@@ -54942,7 +54766,7 @@
     43:43:void parsedIdentifier(java.lang.String):167:167 -> a
     1:1:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):172:172 -> b
     1:1:java.lang.Object parsedTypeName(java.lang.String):153 -> b
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     2:2:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):172 -> b
     2:2:java.lang.Object parsedTypeName(java.lang.String):153 -> b
     3:8:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):173:178 -> b
@@ -54960,7 +54784,7 @@
     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):57 -> a
     13:37:void publicizeType(com.android.tools.r8.graph.DexType):77:101 -> a
     38:44:void publicizeType(com.android.tools.r8.graph.DexType):99:105 -> a
-    45:45:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
+    45:45:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     45:45:void publicizeType(com.android.tools.r8.graph.DexType):105 -> a
     46:46:void lambda$publicizeType$0(com.android.tools.r8.graph.DexEncodedField):82:82 -> a
     47:91:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):109:153 -> a
@@ -55013,7 +54837,7 @@
     39:53:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):125:139 -> a
     54:54:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:169 -> a
     54:54:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     55:55:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169 -> a
     55:55:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
     56:59:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:172 -> a
@@ -56999,23 +56823,10 @@
     24:39:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):62:77 -> a
     24:39:void processClass(com.android.tools.r8.graph.DexType):41 -> a
     40:43:void processClass(com.android.tools.r8.graph.DexType):43:46 -> a
-    44:44:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
+    44:44:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     44:44:void processClass(com.android.tools.r8.graph.DexType):46 -> a
     45:45:void processClass(com.android.tools.r8.graph.DexType):47:47 -> a
-com.android.tools.r8.shaking.AnnotationFixer -> com.android.tools.r8.N.b:
-    com.android.tools.r8.graph.GraphLense lense -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.GraphLense):24:25 -> <init>
-    1:4:void run(java.lang.Iterable):29:32 -> a
-    5:7:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):37:39 -> a
-    8:8:com.android.tools.r8.graph.DexAnnotationSet lambda$processMethod$0(com.android.tools.r8.graph.DexAnnotationSet):40:40 -> a
-    9:9:void processField(com.android.tools.r8.graph.DexEncodedField):44:44 -> a
-    10:10:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):48:48 -> a
-    11:13:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):52:54 -> a
-    14:16:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexAnnotationElement):59:61 -> a
-    17:28:com.android.tools.r8.graph.DexValue rewriteValue(com.android.tools.r8.graph.DexValue):67:78 -> a
-com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.N.c:
+com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.N.b:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set classesToRetainInnerClassAttributeFor -> c
     com.android.tools.r8.shaking.ProguardKeepAttributes keep -> b
@@ -57047,83 +56858,83 @@
     30:30:boolean com.android.tools.r8.graph.DexAnnotation.isSynthesizedClassMapAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):399:399 -> a
     30:30:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):95 -> a
     31:31:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):99:99 -> a
-    32:46:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):118:132 -> a
-    47:52:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):122:127 -> a
-    53:54:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):110:111 -> a
-    53:54:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):134 -> a
-    55:55:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138:138 -> a
-    56:62:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):144:150 -> a
-    56:62:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    63:63:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    63:63:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150 -> a
-    63:63:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    64:67:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150:153 -> a
-    64:67:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
+    32:46:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):123:137 -> a
+    47:59:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):127:139 -> a
+    60:60:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143:143 -> a
+    61:67:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):144:150 -> a
+    61:67:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
     68:68:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    68:68:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153 -> a
-    68:68:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    69:72:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153:156 -> a
-    69:72:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
+    68:68:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150 -> a
+    68:68:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    69:72:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150:153 -> a
+    69:72:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
     73:73:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    73:73:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):156 -> a
-    73:73:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    74:82:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):156:164 -> a
-    74:82:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    83:83:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    83:83:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):164 -> a
-    83:83:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    84:84:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):164:164 -> a
-    84:84:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    85:87:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):239:241 -> a
-    88:88:void processField(com.android.tools.r8.graph.DexEncodedField):245:245 -> a
-    89:98:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):258:267 -> a
-    99:99:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):266:266 -> a
-    100:100:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):263:263 -> a
-    101:101:boolean lambda$rewriteAnnotationElement$1(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
-    102:103:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):308:309 -> a
-    104:106:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):287:289 -> a
-    104:106:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):310 -> a
-    107:113:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):310:316 -> a
-    114:115:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):293:294 -> a
-    114:115:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):317 -> a
-    116:117:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):351:352 -> a
-    118:127:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):320:329 -> a
-    128:139:boolean lambda$stripAttributes$2(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):331:342 -> a
-    140:141:void clearAnnotations(com.android.tools.r8.graph.AppView):357:358 -> a
-    142:142:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    142:142:void clearAnnotations(com.android.tools.r8.graph.AppView):359 -> a
-    143:144:void clearAnnotations(com.android.tools.r8.graph.AppView):359:360 -> a
-    145:145:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    145:145:void clearAnnotations(com.android.tools.r8.graph.AppView):362 -> a
-    146:147:void clearAnnotations(com.android.tools.r8.graph.AppView):362:363 -> a
-    1:2:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):110:111 -> b
-    1:2:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):47 -> b
-    1:2:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):250 -> b
-    3:3:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):47:47 -> b
-    3:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):250 -> b
-    4:4:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):46:46 -> b
-    4:4:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):250 -> b
-    5:5:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):254:254 -> b
-    6:18:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):181:193 -> b
-    19:20:boolean hasSignatureAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):159:160 -> b
-    19:20:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):193 -> b
-    21:48:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):194:221 -> b
-    49:53:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):147:151 -> b
-    49:53:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):222 -> b
-    54:54:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):223:223 -> b
-    55:55:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):183:183 -> b
-    56:60:void run():230:234 -> b
-    61:70:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):273:282 -> b
-com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.N.e:
+    73:73:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153 -> a
+    73:73:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    74:77:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153:156 -> a
+    74:77:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    78:78:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    78:78:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):156 -> a
+    78:78:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    79:87:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):156:164 -> a
+    79:87:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    88:88:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    88:88:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):164 -> a
+    88:88:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    89:89:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):164:164 -> a
+    89:89:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    90:92:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):244:246 -> a
+    93:93:void processField(com.android.tools.r8.graph.DexEncodedField):250:250 -> a
+    94:97:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):263:266 -> a
+    98:104:com.android.tools.r8.graph.DexEncodedAnnotation com.android.tools.r8.graph.DexEncodedAnnotation.rewrite(java.util.function.Function,java.util.function.Function):81:87 -> a
+    98:104:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):267 -> a
+    105:108:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):269:272 -> a
+    109:109:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):271:271 -> a
+    110:110:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):268:268 -> a
+    111:111:boolean lambda$rewriteAnnotationElement$1(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):286:286 -> a
+    112:113:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):312:313 -> a
+    114:116:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):291:293 -> a
+    114:116:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):314 -> a
+    117:123:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):314:320 -> a
+    124:125:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):297:298 -> a
+    124:125:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):321 -> a
+    126:127:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):355:356 -> a
+    128:137:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):324:333 -> a
+    138:149:boolean lambda$stripAttributes$2(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):335:346 -> a
+    150:151:void clearAnnotations(com.android.tools.r8.graph.AppView):361:362 -> a
+    152:152:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    152:152:void clearAnnotations(com.android.tools.r8.graph.AppView):363 -> a
+    153:154:void clearAnnotations(com.android.tools.r8.graph.AppView):363:364 -> a
+    155:155:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
+    155:155:void clearAnnotations(com.android.tools.r8.graph.AppView):366 -> a
+    156:157:void clearAnnotations(com.android.tools.r8.graph.AppView):366:367 -> a
+    1:7:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):110:116 -> b
+    8:20:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):186:198 -> b
+    21:22:boolean hasSignatureAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):164:165 -> b
+    21:22:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):198 -> b
+    23:50:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):199:226 -> b
+    51:55:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):152:156 -> b
+    51:55:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):227 -> b
+    56:56:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):228:228 -> b
+    57:57:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):188:188 -> b
+    58:62:void run():235:239 -> b
+    63:71:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):278:286 -> b
+    1:1:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):47:47 -> c
+    1:1:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):255 -> c
+    2:2:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):46:46 -> c
+    2:2:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):255 -> c
+    3:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):259:259 -> c
+    4:11:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.rewrite(java.util.function.Function):403:410 -> c
+    4:11:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):259 -> c
+com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.N.d:
     java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers -> y
-    java.util.Set instantiatedLambdas -> Z
-    boolean $assertionsDisabled -> a0
-    java.util.Set constClassReferences -> T
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> V
+    java.util.Set neverPropagateValue -> T
+    java.util.Set prunedTypes -> V
     java.util.SortedSet virtualMethodsTargetedByInvokeDirect -> v
-    java.util.Map switchMaps -> X
+    java.util.Map enumValueInfoMaps -> X
     java.util.SortedSet bootstrapMethods -> t
     java.util.Set pinnedItems -> H
+    boolean $assertionsDisabled -> Z
     java.util.Set callSites -> F
     java.util.Set instantiatedAnnotationTypes -> o
     java.util.Map noSideEffects -> J
@@ -57136,13 +56947,13 @@
     java.util.SortedMap virtualInvokes -> A
     java.util.SortedSet brokenSuperInvokes -> G
     java.util.Set neverInline -> N
-    java.util.Set prunedTypes -> W
+    java.util.Set instantiatedLambdas -> Y
     java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer -> z
     java.util.Set neverMerge -> S
-    java.util.Set neverPropagateValue -> U
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> U
     com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> x
-    java.util.Map enumValueInfoMaps -> Y
     java.util.IdentityHashMap indirectlyInstantiatedTypes -> r
+    java.util.Map switchMaps -> W
     java.util.SortedSet liveMethods -> w
     java.util.SortedSet methodsTargetedByInvokeDynamic -> u
     java.util.SortedSet targetedMethods -> s
@@ -57156,142 +56967,142 @@
     java.util.Set forceInline -> M
     java.util.Set liveTypes -> n
     1:1:void <clinit>():57:57 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):230:230 -> <init>
-    2:198:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):74:270 -> <init>
-    199:199:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):313:313 -> <init>
-    200:479:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):74:353 -> <init>
-    480:519:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):365:404 -> <init>
-    520:565:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):365:410 -> <init>
-    566:566:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):415:415 -> <init>
-    567:960:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):74:467 -> <init>
-    961:979:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):463:481 -> <init>
-    980:995:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):477:492 -> <init>
-    996:1003:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):488:495 -> <init>
-    1004:1004:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):502:502 -> <init>
-    1005:1474:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):74:543 -> <init>
-    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):567:599 -> a
-    34:39:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):622:627 -> a
-    40:42:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):639:641 -> a
-    43:43:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):639:639 -> a
-    44:55:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):660:671 -> a
-    56:66:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):710:720 -> a
-    67:72:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):771:776 -> a
-    73:82:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):782:791 -> a
-    83:83:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):787:787 -> a
-    84:85:boolean isPinned(com.android.tools.r8.graph.DexReference):813:814 -> a
-    84:85:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1055 -> a
-    86:86:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1055:1055 -> a
-    87:106:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):819:838 -> a
-    87:106:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1055 -> a
-    107:145:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1056:1094 -> a
-    146:147:boolean isPinned(com.android.tools.r8.graph.DexReference):813:814 -> a
-    148:149:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):858:859 -> a
-    150:151:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):864:865 -> a
-    152:167: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):884:899 -> a
-    168:168: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):897:897 -> a
-    169:169: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):895:895 -> a
-    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1127:1128 -> a
-    170:171: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):893 -> a
-    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):932:933 -> a
-    172:173: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):891 -> a
-    174:177:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):924:927 -> a
-    178:187:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1110:1119 -> a
-    188:209:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1136:1157 -> a
-    210:242:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1156:1188 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):227:227 -> <init>
+    2:194:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:266 -> <init>
+    195:195:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):308:308 -> <init>
+    196:469:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:347 -> <init>
+    470:509:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):359:398 -> <init>
+    510:554:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):359:403 -> <init>
+    555:555:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):408:408 -> <init>
+    556:942:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):74:460 -> <init>
+    943:961:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):456:474 -> <init>
+    962:977:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):470:485 -> <init>
+    978:984:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):481:487 -> <init>
+    985:985:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):494:494 -> <init>
+    986:1446:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):74:534 -> <init>
+    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):555:587 -> a
+    34:39:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):600:605 -> a
+    40:42:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:619 -> a
+    43:43:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:617 -> a
+    44:55:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):638:649 -> a
+    56:66:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):688:698 -> a
+    67:72:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):749:754 -> a
+    73:82:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):760:769 -> a
+    83:83:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):765:765 -> a
+    84:85:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
+    84:85:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033 -> a
+    86:86:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033:1033 -> a
+    87:106:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):797:816 -> a
+    87:106:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033 -> a
+    107:145:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1034:1072 -> a
+    146:147:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
+    148:149:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):836:837 -> a
+    150:151:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):842:843 -> a
+    152:167: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):862:877 -> a
+    168:168: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):875:875 -> a
+    169:169: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):873:873 -> a
+    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1105:1106 -> a
+    170:171: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):871 -> a
+    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):910:911 -> a
+    172:173: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):869 -> a
+    174:177:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):902:905 -> a
+    178:187:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1088:1097 -> a
+    188:209:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1114:1135 -> a
+    210:242:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1134:1166 -> a
     243:243:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    243:243:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1187 -> a
-    244:270:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1189:1215 -> a
-    271:273:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1226:1228 -> a
-    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):547:547 -> b
-    2:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):615:619 -> b
-    7:7:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):357:357 -> b
-    7:7:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):619 -> b
-    8:21:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):620:633 -> b
-    22:22:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):631:631 -> b
-    23:24:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):724:725 -> b
-    25:25:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):760:760 -> b
-    26:27:boolean isPinned(com.android.tools.r8.graph.DexReference):813:814 -> b
-    26:27:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):761 -> b
-    28:28:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):761:761 -> b
-    29:37:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):907:915 -> b
-    38:56:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):941:959 -> b
-    57:112:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):958:1013 -> b
-    113:119:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1009:1015 -> b
-    120:129:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1008:1017 -> b
-    130:130:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):995:995 -> b
-    131:138:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1022:1029 -> b
-    139:141:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1219:1221 -> b
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):650:651 -> c
-    3:14:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):729:740 -> c
-    1:2:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):754:755 -> d
+    243:243:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1165 -> a
+    244:270:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1167:1193 -> a
+    271:273:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1204:1206 -> a
+    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> b
+    2:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):593:597 -> b
+    7:7:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):351:351 -> b
+    7:7:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):597 -> b
+    8:21:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):598:611 -> b
+    22:22:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):609:609 -> b
+    23:24:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):702:703 -> b
+    25:25:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):738:738 -> b
+    26:27:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> b
+    26:27:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):739 -> b
+    28:28:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):739:739 -> b
+    29:37:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):885:893 -> b
+    38:56:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):919:937 -> b
+    57:112:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):936:991 -> b
+    113:119:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):987:993 -> b
+    120:129:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):986:995 -> b
+    130:130:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):973:973 -> b
+    131:138:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1000:1007 -> b
+    139:141:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1197:1199 -> b
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):628:629 -> c
+    3:14:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):707:718 -> c
+    1:2:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):732:733 -> d
     3:3:java.lang.String com.android.tools.r8.graph.DexEncodedField.toSourceString():89:89 -> d
-    3:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):755 -> d
-    4:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):755:756 -> d
-    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):765:766 -> e
-    1:1:boolean hasLiveness():802:802 -> g
-    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):796:797 -> h
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():808:808 -> m
-    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):645:646 -> p
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():656:656 -> q
-    2:3:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):704:705 -> q
-    4:9:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):677:682 -> q
-    4:9:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):706 -> q
-    10:10:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):706:706 -> q
-    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):686:700 -> r
-    16:17:java.util.Set getPrunedTypes():878:879 -> r
-    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):551:552 -> s
-    3:3:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):547:547 -> s
-    3:3:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):552 -> s
-    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):556:563 -> t
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):873:874 -> u
-com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo -> com.android.tools.r8.N.d:
+    3:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):733 -> d
+    4:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):733:734 -> d
+    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):743:744 -> e
+    1:1:boolean hasLiveness():780:780 -> g
+    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):774:775 -> h
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():786:786 -> m
+    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):623:624 -> q
+    3:3:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():634:634 -> q
+    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):682:683 -> r
+    3:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):655:660 -> r
+    3:8:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):684 -> r
+    9:9:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):684:684 -> r
+    10:11:java.util.Set getPrunedTypes():856:857 -> r
+    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):664:678 -> s
+    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):542:543 -> t
+    3:3:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> t
+    3:3:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):543 -> t
+    1:5:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):547:551 -> u
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):851:852 -> v
+com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo -> com.android.tools.r8.N.c:
     com.android.tools.r8.graph.DexType type -> a
     int ordinal -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):181:183 -> <init>
-com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.N.i:
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):179:181 -> <init>
+com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.N.h:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> q
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassInlineRule$Type):72:86 -> <init>
     1:5:java.lang.String typeString():99:103 -> u
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type getType():94:94 -> v
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Builder builder():90:90 -> w
-com.android.tools.r8.shaking.ClassInlineRule$1 -> com.android.tools.r8.N.f:
+com.android.tools.r8.shaking.ClassInlineRule$1 -> com.android.tools.r8.N.e:
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> a
     1:1:void <clinit>():99:99 -> <clinit>
-com.android.tools.r8.shaking.ClassInlineRule$Builder -> com.android.tools.r8.N.g:
+com.android.tools.r8.shaking.ClassInlineRule$Builder -> com.android.tools.r8.N.f:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.ClassInlineRule$1):17:17 -> <init>
     2:2:void <init>():20:20 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ClassInlineRule$Type -> com.android.tools.r8.N.h:
+com.android.tools.r8.shaking.ClassInlineRule$Type -> com.android.tools.r8.N.g:
     com.android.tools.r8.shaking.ClassInlineRule$Type NEVER -> a
     com.android.tools.r8.shaking.ClassInlineRule$Type[] $VALUES -> b
     1:1:void <clinit>():14:14 -> <clinit>
     2:2:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.ClassMergingRule -> com.android.tools.r8.N.m:
+com.android.tools.r8.shaking.ClassMergingRule -> com.android.tools.r8.N.l:
     com.android.tools.r8.shaking.ClassMergingRule$Type type -> q
     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.ClassMergingRule$Type,com.android.tools.r8.shaking.ClassMergingRule$1):11:11 -> <init>
     2:5: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.ClassMergingRule$Type):60:63 -> <init>
     1:5:java.lang.String typeString():76:80 -> u
     1:1:com.android.tools.r8.shaking.ClassMergingRule$Type getType():71:71 -> v
     1:1:com.android.tools.r8.shaking.ClassMergingRule$Builder builder():67:67 -> w
-com.android.tools.r8.shaking.ClassMergingRule$1 -> com.android.tools.r8.N.j:
+com.android.tools.r8.shaking.ClassMergingRule$1 -> com.android.tools.r8.N.i:
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassMergingRule$Type -> a
     1:1:void <clinit>():76:76 -> <clinit>
-com.android.tools.r8.shaking.ClassMergingRule$Builder -> com.android.tools.r8.N.k:
+com.android.tools.r8.shaking.ClassMergingRule$Builder -> com.android.tools.r8.N.j:
     com.android.tools.r8.shaking.ClassMergingRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.ClassMergingRule$1):17:17 -> <init>
     2:2:void <init>():20:20 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ClassMergingRule$Type -> com.android.tools.r8.N.l:
+com.android.tools.r8.shaking.ClassMergingRule$Type -> com.android.tools.r8.N.k:
     com.android.tools.r8.shaking.ClassMergingRule$Type NEVER -> a
     com.android.tools.r8.shaking.ClassMergingRule$Type[] $VALUES -> b
     1:1:void <clinit>():14:14 -> <clinit>
     2:2:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.ClassMergingRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.N.n:
+com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.N.m:
     java.util.Map target2sources -> b
     com.android.tools.r8.experimental.graphinfo.GraphConsumer subConsumer -> a
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):23:23 -> <init>
@@ -57300,21 +57111,21 @@
     1:6:void acceptEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo):29:34 -> acceptEdge
     1:1:java.util.Map lambda$acceptEdge$0(com.android.tools.r8.experimental.graphinfo.GraphNode):30:30 -> b
     1:1:java.util.Set lambda$acceptEdge$1(com.android.tools.r8.experimental.graphinfo.GraphNode):31:31 -> c
-com.android.tools.r8.shaking.ConstantArgumentRule -> com.android.tools.r8.N.q:
+com.android.tools.r8.shaking.ConstantArgumentRule -> com.android.tools.r8.N.p:
     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.ConstantArgumentRule$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>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ConstantArgumentRule$Builder builder():74:74 -> v
-com.android.tools.r8.shaking.ConstantArgumentRule$1 -> com.android.tools.r8.N.o:
-com.android.tools.r8.shaking.ConstantArgumentRule$Builder -> com.android.tools.r8.N.p:
+com.android.tools.r8.shaking.ConstantArgumentRule$1 -> com.android.tools.r8.N.n:
+com.android.tools.r8.shaking.ConstantArgumentRule$Builder -> com.android.tools.r8.N.o:
     1:1:void <init>(com.android.tools.r8.shaking.ConstantArgumentRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.DexStringCache -> com.android.tools.r8.N.r:
+com.android.tools.r8.shaking.DexStringCache -> com.android.tools.r8.N.q:
     java.util.concurrent.ConcurrentHashMap stringCache -> a
     1:2:void <init>():9:10 -> <init>
     1:1:java.lang.String lookupString(com.android.tools.r8.graph.DexString):13:13 -> a
-com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.N.s:
+com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.N.r:
     java.util.Set checkDiscarded -> a
     java.lang.Iterable classes -> b
     1:3:void <init>(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.lang.Iterable):20:22 -> <init>
@@ -57326,60 +57137,58 @@
     9:11:void lambda$run$0(java.util.List,com.android.tools.r8.graph.DexEncodedMethod):30 -> a
     12:14:void checkItem(com.android.tools.r8.graph.DexDefinition,java.util.List):37:39 -> a
     12:14:void lambda$run$1(java.util.List,com.android.tools.r8.graph.DexEncodedField):31 -> a
-com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.N.C:
-    java.util.Map deferredAnnotations -> R
-    java.util.Map scopedMethodsForLiveTypes -> T
+com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.N.A:
+    java.util.Map scopedMethodsForLiveTypes -> R
     java.util.Map staticInvokes -> m
     java.util.Set brokenSuperInvokes -> s
-    java.util.Map virtualTargetsMarkedAsReachable -> N
+    com.android.tools.r8.shaking.EnqueuerWorklist workList -> K
     com.android.tools.r8.graph.AppView appView -> e
-    java.util.Map unusedInterfaceTypes -> y
-    boolean $assertionsDisabled -> V
+    java.util.Map deferredAnnotations -> P
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveFields -> H
+    java.util.Set directAndIndirectlyInstantiatedTypes -> A
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedInterfaceTypes -> J
     java.util.Map superInvokeDependencies -> u
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedTypes -> A
-    java.util.Set instantiatedAppServices -> J
+    boolean $assertionsDisabled -> T
     java.util.Set analyses -> c
     com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> h
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason targetedMethods -> C
-    java.util.Set bootstrapMethods -> D
-    com.android.tools.r8.shaking.GraphReporter graphReporter -> U
+    java.util.Set methodsTargetedByInvokeDynamic -> D
     com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason liveTypes -> w
-    java.util.Set lambdaMethodsTargetedByInvokeDynamic -> F
+    java.util.Set virtualMethodsTargetedByInvokeDirect -> F
     java.util.Map virtualInvokes -> i
     java.util.Set instanceFieldsWrittenOutsideEnclosingInstanceInitializers -> o
-    java.util.Set pinnedItems -> P
     java.util.Map superInvokes -> k
     java.util.Set callSites -> q
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveAnnotations -> y
+    com.android.tools.r8.shaking.GraphReporter graphReporter -> S
+    java.util.Set pendingReflectiveUses -> L
+    java.util.Set reportedMissing -> N
+    java.util.Map activeIfRules -> Q
     java.util.Set liveNonProgramTypes -> x
-    java.util.Map activeIfRules -> S
     java.util.Map reachableVirtualMethods -> t
-    com.android.tools.r8.shaking.EnqueuerWorklist workList -> L
+    java.util.Map virtualTargetsMarkedAsReachable -> M
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveMethods -> G
     com.android.tools.r8.utils.InternalOptions options -> f
-    java.util.Set directAndIndirectlyInstantiatedTypes -> B
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveFields -> I
     java.util.Map reachableInstanceFields -> v
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedInterfaceTypes -> K
     com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> g
-    java.util.Set virtualMethodsTargetedByInvokeDirect -> G
     com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> n
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason targetedMethods -> B
+    java.util.Set instantiatedAppServices -> I
     com.android.tools.r8.shaking.Enqueuer$Mode mode -> b
-    com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet liveMethods -> H
-    java.util.Set methodsTargetedByInvokeDynamic -> E
-    java.util.Set reportedMissing -> O
+    java.util.Set bootstrapMethods -> C
+    java.util.Set lambdaMethodsTargetedByInvokeDynamic -> E
+    java.util.Set pinnedItems -> O
     java.util.Map interfaceInvokes -> j
     java.util.Set staticFieldsWrittenOutsideEnclosingStaticInitializer -> p
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> d
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveAnnotations -> z
-    java.util.Set constClassReferences -> Q
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedTypes -> z
     java.util.Map directInvokes -> l
     java.util.Set identifierNameStrings -> r
     boolean forceProguardCompatibility -> a
-    java.util.Set pendingReflectiveUses -> M
     1:1:void <clinit>():103:103 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):303:303 -> <init>
-    2:195:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):131:324 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):293:293 -> <init>
+    2:185:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):131:314 -> <init>
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> a
-    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1755 -> a
+    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1713 -> a
     boolean lambda$markVirtualMethodAsReachable$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void lambda$newSetWithoutReasonReporter$1(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
     2:2:com.android.tools.r8.shaking.GraphReporter access$100(com.android.tools.r8.shaking.Enqueuer):103:103 -> a
@@ -57389,558 +57198,544 @@
     6:6:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,java.util.function.Function):103:103 -> a
     7:7:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> a
     8:8:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):103:103 -> a
-    9:9:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):103:103 -> a
-    10:10:void access$4300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):103:103 -> a
-    11:11:void access$4400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):103:103 -> a
-    12:12:void access$4700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):103:103 -> a
-    13:13:boolean access$600(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
-    14:14:com.android.tools.r8.shaking.GraphReporter getGraphReporter():332:332 -> a
-    15:15:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):336:336 -> a
-    16:23:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):345:352 -> a
-    24:28:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):360:364 -> a
-    24:28:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):352 -> a
-    29:29:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):355:355 -> a
-    30:53:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):381:404 -> a
-    54:54:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):400:400 -> a
-    55:68:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):384:397 -> a
-    69:69:void enqueueRootItems(java.util.Map):413:413 -> a
-    70:72:void enqueueRootItem(java.util.Map$Entry):417:419 -> a
-    73:73:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):427:427 -> a
-    73:73:void enqueueRootItem(java.util.Map$Entry):419 -> a
-    74:81:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):432:439 -> a
-    82:82:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    82:82:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):440 -> a
-    83:87:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):441:445 -> a
-    88:93:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):442:447 -> a
-    94:94:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733:733 -> a
-    94:94:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):447 -> a
-    95:95:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isExternalizable(com.android.tools.r8.graph.DexType):600:600 -> a
-    95:95:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733 -> a
-    95:95:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):447 -> a
-    96:107:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):448:459 -> a
-    108:120:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):456:468 -> a
-    121:129:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):465:473 -> a
-    130:130:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):471:471 -> a
-    131:137:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):477:483 -> a
-    138:141:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):529:532 -> a
-    142:142:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):532:532 -> a
-    143:144:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):546:547 -> a
-    145:173:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):552:580 -> a
-    174:174:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1068:1068 -> a
-    175:183:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1640:1648 -> a
-    175:183:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1070 -> a
-    184:184:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1647:1647 -> a
-    184:184:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1070 -> a
-    185:185:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1644:1644 -> a
-    185:185:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1070 -> a
-    186:196:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1075:1085 -> a
-    186:196:com.android.tools.r8.graph.DexMethod access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    197:212:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1123:1138 -> a
-    213:213:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1135:1135 -> a
-    214:218:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1150:1154 -> a
-    219:219:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    219:219:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1155 -> a
-    220:220:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1158:1158 -> a
-    221:221:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
-    221:221:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1158 -> a
-    222:236:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1160:1174 -> a
-    237:240:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1232:1235 -> a
-    237:240:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1191 -> a
-    241:246:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):343:348 -> a
-    241:246:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1235 -> a
-    241:246:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1191 -> a
-    247:247:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1236:1236 -> a
-    247:247:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1191 -> a
-    248:256:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1195:1203 -> a
-    257:267:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):488:498 -> a
-    257:267:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1204 -> a
-    268:268:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    268:268:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):499 -> a
-    268:268:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1204 -> a
-    269:269:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):499:499 -> a
-    269:269:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1204 -> a
-    270:282:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1207:1219 -> a
-    283:283:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    283:283:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1220 -> a
-    284:284:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1220:1220 -> a
-    285:285:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):516:516 -> a
-    285:285:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1219 -> a
-    286:286:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):427:427 -> a
-    286:286:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):519 -> a
-    286:286:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1219 -> a
-    287:287:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1214:1214 -> a
-    288:291:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1224:1227 -> a
-    292:311:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1243:1262 -> a
-    312:312:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1249:1249 -> a
-    313:313:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1269:1269 -> a
-    314:314:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1273:1273 -> a
-    315:315:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1279:1279 -> a
-    315:315:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1274 -> a
-    316:316:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1279:1279 -> a
-    316:316:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2515 -> a
-    317:325:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1283:1291 -> a
-    326:326:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):24:24 -> a
-    326:326:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1295 -> a
-    327:330:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1296:1299 -> a
-    331:351:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1303:1323 -> a
-    331:351:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
-    352:353:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1330:1331 -> a
-    352:353:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1324 -> a
-    352:353:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
-    354:354:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1325:1325 -> a
-    354:354:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
-    355:355:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1337:1337 -> a
-    356:380:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1374:1398 -> a
-    381:381:void reportMissingField(com.android.tools.r8.graph.DexField):1416:1416 -> a
-    381:381:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
-    382:382:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    382:382:void reportMissingField(com.android.tools.r8.graph.DexField):1417 -> a
-    382:382:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
-    383:383:void reportMissingField(com.android.tools.r8.graph.DexField):1416:1416 -> a
-    383:383:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
-    384:384:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1457:1457 -> a
-    385:385:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexProgramClass.asProgramClass():0:0 -> a
-    385:385:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1457 -> a
-    386:387:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1605:1606 -> a
-    388:391:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1608:1611 -> a
-    392:423:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2448:2479 -> a
-    392:423:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1612 -> a
-    424:425:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1613:1614 -> a
-    426:426:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):48:48 -> a
-    426:426:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1617 -> a
-    427:427:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1614:1614 -> a
-    428:435:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1627:1634 -> a
-    436:436:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1698:1698 -> a
-    437:457:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1767:1787 -> a
-    437:457:void access$2900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    458:458:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
-    458:458:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1788 -> a
-    458:458:void access$2900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    459:460:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1789:1790 -> a
-    459:460:void access$2900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    461:461:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1828:1828 -> a
-    462:463:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1854:1855 -> a
-    464:464:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    464:464:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1856 -> a
-    465:480:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1859:1874 -> a
-    481:481:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1849:1849 -> a
-    481:481:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1876 -> a
-    482:487:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1877:1882 -> a
-    488:488:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1860:1860 -> a
-    489:489:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1881:1881 -> a
-    490:490:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889:1889 -> a
-    491:517:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1897:1923 -> a
-    491:517:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    518:518:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    518:518:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1924 -> a
-    518:518:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    519:556:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2016:2053 -> a
-    519:556:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1928 -> a
-    519:556:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    557:572:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2071:2086 -> a
-    557:572:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2052 -> a
-    557:572:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1928 -> a
-    557:572:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    573:576:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2072:2075 -> a
-    573:576:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2052 -> a
-    573:576:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1928 -> a
-    573:576:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    577:585:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2074:2082 -> a
-    577:585:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2052 -> a
-    577:585:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1928 -> a
-    577:585:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    586:595:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2054:2063 -> a
-    586:595:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1928 -> a
-    586:595:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    596:609:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1929:1942 -> a
-    596:609:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    610:610:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
-    610:610:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1943 -> a
-    610:610:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    611:618:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1944:1951 -> a
-    611:618:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    619:619:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1959:1959 -> a
-    620:620:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    620:620:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1055 -> a
-    620:620:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1959 -> a
-    621:633:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1959:1971 -> a
-    634:634:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1849:1849 -> a
-    634:634:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1979 -> a
-    635:658:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1983:2006 -> a
-    659:665:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2003:2009 -> a
-    666:669:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1986:1989 -> a
-    670:670:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1986:1986 -> a
-    671:682:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2119:2130 -> a
-    683:683:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
-    683:683:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2133 -> a
-    684:703:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2132:2151 -> a
-    704:704:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    704:704:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2151 -> a
-    705:710:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2154:2159 -> a
-    711:718:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2168:2175 -> a
-    719:726: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):2184:2191 -> a
-    727:729:boolean verifyKeptGraph():2196:2198 -> a
-    727:729: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):2191 -> a
-    730:730: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):2192:2192 -> a
-    731:746:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2205:2220 -> a
-    747:768:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2219:2240 -> a
-    769:774:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2277:2282 -> a
-    769:774:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2254 -> a
-    775:779:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2255:2259 -> a
-    780:783:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2258:2261 -> a
-    784:784:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2207:2207 -> a
-    785:785:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2212:2212 -> a
-    786:791:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2267:2272 -> a
-    792:818:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2288:2314 -> a
-    819:819:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):106:106 -> a
-    819:819:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2314 -> a
-    820:884:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2315:2379 -> a
-    885:894:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2378:2387 -> a
-    895:899:void unpinLambdaMethods():2393:2397 -> a
-    895:899:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2389 -> a
-    900:900:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2387:2387 -> a
-    901:901:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2311:2311 -> a
-    902:902:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2332:2332 -> a
-    903:903:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2337:2337 -> a
-    904:904:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
-    904:904:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2337 -> a
-    905:905:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2338:2338 -> a
-    906:906:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):516:516 -> a
-    906:906:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2339 -> a
-    907:907:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):427:427 -> a
-    907:907:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):519 -> a
-    907:907:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2339 -> a
-    908:908:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
-    908:908:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2338 -> a
-    909:933:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2402:2426 -> a
-    934:943:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2423:2432 -> a
-    944:948:void markFieldAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2438:2442 -> a
-    949:960:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2489:2500 -> a
-    961:961:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    961:961:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2500 -> a
-    962:966:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2502:2506 -> a
-    967:970:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2505:2508 -> a
-    971:986:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2507:2522 -> a
-    987:987:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2522:2522 -> a
-    988:990:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2542:2544 -> a
-    991:991:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    991:991:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2544 -> a
-    992:992:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2544:2544 -> a
-    993:1005:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2889:2901 -> a
+    9:9:void access$3300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):103:103 -> a
+    10:10:void access$4100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):103:103 -> a
+    11:11:void access$4400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):103:103 -> a
+    12:12:boolean access$600(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
+    13:13:com.android.tools.r8.shaking.GraphReporter getGraphReporter():322:322 -> a
+    14:14:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):326:326 -> a
+    15:22:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):335:342 -> a
+    23:27:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):350:354 -> a
+    23:27:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):342 -> a
+    28:28:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):345:345 -> a
+    29:52:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):371:394 -> a
+    53:53:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):390:390 -> a
+    54:67:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):374:387 -> a
+    68:68:void enqueueRootItems(java.util.Map):403:403 -> a
+    69:71:void enqueueRootItem(java.util.Map$Entry):407:409 -> a
+    72:72:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> a
+    72:72:void enqueueRootItem(java.util.Map$Entry):409 -> a
+    73:80:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):422:429 -> a
+    81:81:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    81:81:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):430 -> a
+    82:85:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):431:434 -> a
+    86:90:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):432:436 -> a
+    91:91:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733:733 -> a
+    91:91:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):436 -> a
+    92:92:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isExternalizable(com.android.tools.r8.graph.DexType):598:598 -> a
+    92:92:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733 -> a
+    92:92:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):436 -> a
+    93:108:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):437:452 -> a
+    109:109:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):450:450 -> a
+    110:116:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):456:462 -> a
+    117:120:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):508:511 -> a
+    121:121:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):511:511 -> a
+    122:123:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):525:526 -> a
+    124:152:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):531:559 -> a
+    153:153:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1038:1038 -> a
+    154:162:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1611:1619 -> a
+    154:162:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1040 -> a
+    163:163:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1618:1618 -> a
+    163:163:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1040 -> a
+    164:164:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1615:1615 -> a
+    164:164:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1040 -> a
+    165:175:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1045:1055 -> a
+    165:175:com.android.tools.r8.graph.DexMethod access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    176:191:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1093:1108 -> a
+    192:192:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1105:1105 -> a
+    193:197:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1120:1124 -> a
+    198:198:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    198:198:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1125 -> a
+    199:199:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1128:1128 -> a
+    200:200:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
+    200:200:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1128 -> a
+    201:201:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1130:1130 -> a
+    202:226:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1208:1232 -> a
+    202:226:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1131 -> a
+    227:232:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1134:1139 -> a
+    233:236:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1198:1201 -> a
+    233:236:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1157 -> a
+    237:242:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):341:346 -> a
+    237:242:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1201 -> a
+    237:242:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1157 -> a
+    243:243:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1202:1202 -> a
+    243:243:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1157 -> a
+    244:252:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1161:1169 -> a
+    253:263:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):467:477 -> a
+    253:263:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1170 -> a
+    264:264:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    264:264:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):478 -> a
+    264:264:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1170 -> a
+    265:265:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):478:478 -> a
+    265:265:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1170 -> a
+    266:278:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1173:1185 -> a
+    279:279:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    279:279:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1186 -> a
+    280:280:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1186:1186 -> a
+    281:281:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):495:495 -> a
+    281:281:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1185 -> a
+    282:282:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> a
+    282:282:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):498 -> a
+    282:282:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1185 -> a
+    283:283:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1180:1180 -> a
+    284:287:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1190:1193 -> a
+    288:288:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1238:1238 -> a
+    289:289:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1242:1242 -> a
+    290:290:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> a
+    290:290:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1243 -> a
+    291:291:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> a
+    291:291:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2480 -> a
+    292:300:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1252:1260 -> a
+    301:301:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):24:24 -> a
+    301:301:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1264 -> a
+    302:305:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1265:1268 -> a
+    306:326:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1272:1292 -> a
+    306:326:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
+    327:328:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1299:1300 -> a
+    327:328:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1293 -> a
+    327:328:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
+    329:329:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1294:1294 -> a
+    329:329:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
+    330:330:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1306:1306 -> a
+    331:355:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1343:1367 -> a
+    356:356:void reportMissingField(com.android.tools.r8.graph.DexField):1385:1385 -> a
+    356:356:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
+    357:357:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    357:357:void reportMissingField(com.android.tools.r8.graph.DexField):1386 -> a
+    357:357:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
+    358:358:void reportMissingField(com.android.tools.r8.graph.DexField):1385:1385 -> a
+    358:358:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
+    359:373:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1423:1437 -> a
+    374:374:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    374:374:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1437 -> a
+    375:375:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440:1440 -> a
+    376:403:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1484:1511 -> a
+    376:403:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    404:404:com.android.tools.r8.shaking.Enqueuer$Mode getMode():318:318 -> a
+    404:404:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1516 -> a
+    404:404:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    405:418:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1516:1529 -> a
+    405:418:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    419:440:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1549:1570 -> a
+    419:440:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1530 -> a
+    419:440:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    441:450:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1532:1541 -> a
+    441:450:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    451:455:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1631:1635 -> a
+    451:455:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1445 -> a
+    456:456:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
+    456:456:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1635 -> a
+    456:456:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1445 -> a
+    457:461:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1635:1639 -> a
+    457:461:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1445 -> a
+    462:462:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1447:1447 -> a
+    463:463:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1428:1428 -> a
+    464:464:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexProgramClass.asProgramClass():0:0 -> a
+    464:464:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1428 -> a
+    465:466:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1576:1577 -> a
+    467:470:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1579:1582 -> a
+    471:502:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2412:2443 -> a
+    471:502:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1583 -> a
+    503:504:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1584:1585 -> a
+    505:505:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):48:48 -> a
+    505:505:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1588 -> a
+    506:506:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1585:1585 -> a
+    507:514:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1598:1605 -> a
+    515:515:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1656:1656 -> a
+    516:536:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1725:1745 -> a
+    516:536:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    537:537:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
+    537:537:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1746 -> a
+    537:537:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    538:539:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1747:1748 -> a
+    538:539:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    540:540:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1786:1786 -> a
+    541:541:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1818:1818 -> a
+    542:542:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1839:1839 -> a
+    543:543:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847:1847 -> a
+    544:570:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855:1881 -> a
+    544:570:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    571:571:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    571:571:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1882 -> a
+    571:571:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    572:609:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1974:2011 -> a
+    572:609:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    572:609:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    610:625:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2029:2044 -> a
+    610:625:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010 -> a
+    610:625:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    610:625:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    626:629:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2030:2033 -> a
+    626:629:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010 -> a
+    626:629:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    626:629:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    630:638:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2032:2040 -> a
+    630:638:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010 -> a
+    630:638:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    630:638:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    639:648:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2012:2021 -> a
+    639:648:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    639:648:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    649:662:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1887:1900 -> a
+    649:662:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    663:663:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
+    663:663:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1901 -> a
+    663:663:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    664:671:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1902:1909 -> a
+    664:671:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    672:672:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917:1917 -> a
+    673:673:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    673:673:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
+    673:673:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917 -> a
+    674:686:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917:1929 -> a
+    687:687:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1807:1807 -> a
+    687:687:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1937 -> a
+    688:711:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1941:1964 -> a
+    712:718:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1961:1967 -> a
+    719:722:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1944:1947 -> a
+    723:723:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1944:1944 -> a
+    724:735:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2077:2088 -> a
+    736:736:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
+    736:736:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2091 -> a
+    737:756:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2090:2109 -> a
+    757:757:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    757:757:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2109 -> a
+    758:763:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2112:2117 -> a
+    764:771:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2126:2133 -> a
+    772:779: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):2142:2149 -> a
+    780:782:boolean verifyKeptGraph():2154:2156 -> a
+    780:782: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):2149 -> a
+    783:783: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):2150:2150 -> a
+    784:799:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2163:2178 -> a
+    800:821:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2177:2198 -> a
+    822:827:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2234:2239 -> a
+    822:827:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2212 -> a
+    828:832:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2213:2217 -> a
+    833:835:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2216:2218 -> a
+    836:836:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2165:2165 -> a
+    837:837:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2170:2170 -> a
+    838:843:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2224:2229 -> a
+    844:870:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2245:2271 -> a
+    871:871:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):106:106 -> a
+    871:871:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2271 -> a
+    872:936:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2272:2336 -> a
+    937:946:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2335:2344 -> a
+    947:951:void unpinLambdaMethods():2350:2354 -> a
+    947:951:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2346 -> a
+    952:952:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2344:2344 -> a
+    953:953:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2268:2268 -> a
+    954:954:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2289:2289 -> a
+    955:955:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2294:2294 -> a
+    956:956:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
+    956:956:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2294 -> a
+    957:957:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295:2295 -> a
+    958:958:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):495:495 -> a
+    958:958:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2296 -> a
+    959:959:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> a
+    959:959:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):498 -> a
+    959:959:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2296 -> a
+    960:960:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
+    960:960:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295 -> a
+    961:989:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2359:2387 -> a
+    990:999:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2384:2393 -> a
+    1000:1007:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2399:2406 -> a
+    1008:1019:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2453:2464 -> a
+    1020:1020:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1020:1020:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2464 -> a
+    1021:1025:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2466:2470 -> a
+    1026:1029:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2469:2472 -> a
+    1030:1047:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2471:2488 -> a
+    1048:1048:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2488:2488 -> a
+    1049:1051:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2502:2504 -> a
+    1052:1052:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    1052:1052:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2504 -> a
+    1053:1053:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2504:2504 -> a
+    1054:1066:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2848:2860 -> a
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> b
-    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1737 -> b
+    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1695 -> b
     2:2:java.util.Map access$1000(com.android.tools.r8.shaking.Enqueuer):103:103 -> b
-    3:3:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> b
-    4:4:void access$4500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> b
+    3:3:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> b
+    4:4:void access$4200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> b
     5:5:void access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> b
-    6:6:boolean isProgramClass(com.android.tools.r8.graph.DexType):341:341 -> b
+    6:6:boolean isProgramClass(com.android.tools.r8.graph.DexType):331:331 -> b
     6:6:boolean access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):103 -> b
-    7:8:java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers():369:370 -> b
-    9:9:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):538:538 -> b
-    10:25:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1104:1119 -> b
-    26:26:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1116:1116 -> b
-    27:29:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1142:1144 -> b
-    30:30:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1142:1142 -> b
-    31:31:void lambda$markTypeAsLive$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1215:1215 -> b
-    32:32:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$10(com.android.tools.r8.graph.DexType):1226:1226 -> b
-    33:33:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$11(com.android.tools.r8.graph.DexProgramClass):1261:1261 -> b
-    34:34:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1279:1279 -> b
-    34:34:void lambda$markMethodAsTargeted$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1431 -> b
-    35:63:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1341:1369 -> b
-    64:64:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1410:1410 -> b
-    65:65:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    65:65:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1411 -> b
-    66:80:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1452:1466 -> b
-    81:81:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    81:81:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1466 -> b
-    82:82:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1469:1469 -> b
-    83:110:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1513:1540 -> b
-    83:110:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1472 -> b
-    111:111:com.android.tools.r8.shaking.Enqueuer$Mode getMode():328:328 -> b
-    111:111:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1545 -> b
-    111:111:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1472 -> b
-    112:125:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1545:1558 -> b
-    112:125:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1472 -> b
-    126:147:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1578:1599 -> b
-    126:147:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1559 -> b
-    126:147:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1472 -> b
-    148:157:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1561:1570 -> b
-    148:157:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1472 -> b
-    158:162:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1660:1664 -> b
-    158:162:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1474 -> b
-    163:163:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> b
-    163:163:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1664 -> b
-    163:163:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1474 -> b
-    164:168:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1664:1668 -> b
-    164:168:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1474 -> b
-    169:169:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1476:1476 -> b
-    170:176:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1675:1681 -> b
-    177:177:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1699:1699 -> b
-    178:183:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1741:1746 -> b
-    184:184:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    184:184:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1746 -> b
-    185:192:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1748:1755 -> b
-    193:194:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1832:1833 -> b
-    195:195:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1862:1862 -> b
-    196:200:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2090:2094 -> b
-    196:200:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2102 -> b
-    201:201:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
-    201:201:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2094 -> b
-    201:201:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2102 -> b
-    202:202:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2094:2094 -> b
-    202:202:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2102 -> b
-    203:208:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2093:2098 -> b
-    203:208:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2102 -> b
-    209:215:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2102:2108 -> b
-    216:216:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2359:2359 -> b
-    217:219:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2568:2570 -> b
-    220:220:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> b
-    220:220:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2571 -> b
-    221:222:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2572:2573 -> b
-    223:229:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2579:2585 -> b
-    223:229:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    230:237:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2675:2682 -> b
-    230:237:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2586 -> b
-    230:237:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    238:246:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2681:2689 -> b
-    238:246:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2586 -> b
-    238:246:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    247:247:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
-    247:247:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2693 -> b
-    247:247:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2586 -> b
-    247:247:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    248:251:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2695:2698 -> b
-    248:251:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2586 -> b
-    248:251:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    252:252:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2589:2589 -> b
-    252:252:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    253:258:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2705:2710 -> b
-    253:258:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    253:258:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    259:259:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    259:259:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2710 -> b
-    259:259:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    259:259:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    260:274:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2711:2725 -> b
-    260:274:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    260:274:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    275:301:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2724:2750 -> b
-    275:301:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    275:301:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    302:302:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
-    302:302:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2752 -> b
-    302:302:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    302:302:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    303:347:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2754:2798 -> b
-    303:347:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    303:347:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    348:348:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    348:348:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2710 -> b
-    348:348:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    348:348:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    349:349:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2593:2593 -> b
-    349:349:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    350:355:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2845:2850 -> b
-    350:355:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2594 -> b
-    350:355:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    356:356:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2597:2597 -> b
-    356:356:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    357:384:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2808:2835 -> b
-    357:384:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2598 -> b
-    357:384:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    385:385:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2601:2601 -> b
-    385:385:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    386:391:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2856:2861 -> b
-    386:391:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2602 -> b
-    386:391:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    392:392:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    392:392:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2861 -> b
-    392:392:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2602 -> b
-    392:392:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    393:405:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2862:2874 -> b
-    393:405:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2602 -> b
-    393:405:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    406:422:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2867:2883 -> b
-    406:422:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2602 -> b
-    406:422:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    423:423:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    423:423:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2861 -> b
-    423:423:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2602 -> b
-    423:423:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    424:438:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2605:2619 -> b
-    424:438:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    439:439:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
-    439:439:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2620 -> b
-    439:439:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    440:468:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2621:2649 -> b
-    440:468:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    469:469:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):538:538 -> b
-    469:469:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2649 -> b
-    469:469:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    470:470:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2650:2650 -> b
-    470:470:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    471:471:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):542:542 -> b
-    471:471:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2650 -> b
-    471:471:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    472:487:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2653:2668 -> b
-    472:487:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    488:489:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2665:2666 -> b
-    488:489:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    490:490:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> b
-    490:490:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2571 -> b
+    7:8:java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers():359:360 -> b
+    9:11:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):485:487 -> b
+    12:12:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):517:517 -> b
+    13:28:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1074:1089 -> b
+    29:29:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1086:1086 -> b
+    30:32:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1112:1114 -> b
+    33:33:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1112:1112 -> b
+    34:34:void lambda$markTypeAsLive$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1181:1181 -> b
+    35:35:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$10(com.android.tools.r8.graph.DexType):1192:1192 -> b
+    36:36:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> b
+    36:36:void lambda$markMethodAsTargeted$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1402 -> b
+    37:65:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1310:1338 -> b
+    66:66:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1379:1379 -> b
+    67:67:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    67:67:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1380 -> b
+    68:74:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1646:1652 -> b
+    75:75:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1657:1657 -> b
+    76:77:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1790:1791 -> b
+    78:79:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1812:1813 -> b
+    80:80:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    80:80:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1814 -> b
+    81:96:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1817:1832 -> b
+    97:97:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1807:1807 -> b
+    97:97:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1834 -> b
+    98:103:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1835:1840 -> b
+    104:104:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1820:1820 -> b
+    105:105:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1928:1928 -> b
+    106:110:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2048:2052 -> b
+    106:110:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    111:111:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
+    111:111:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2052 -> b
+    111:111:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    112:112:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2052:2052 -> b
+    112:112:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    113:118:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2051:2056 -> b
+    113:118:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    119:125:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060:2066 -> b
+    126:126:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2316:2316 -> b
+    127:129:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2528:2530 -> b
+    130:130:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> b
+    130:130:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2531 -> b
+    131:132:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2532:2533 -> b
+    133:139:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2539:2545 -> b
+    133:139:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    140:147:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2634:2641 -> b
+    140:147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    140:147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    148:156:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2640:2648 -> b
+    148:156:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    148:156:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    157:157:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
+    157:157:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2652 -> b
+    157:157:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    157:157:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    158:161:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2654:2657 -> b
+    158:161:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    158:161:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    162:162:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2549:2549 -> b
+    162:162:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    163:168:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2664:2669 -> b
+    163:168:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    163:168:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    169:169:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    169:169:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2669 -> b
+    169:169:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    169:169:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    170:184:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2670:2684 -> b
+    170:184:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    170:184:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    185:211:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2683:2709 -> b
+    185:211:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    185:211:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    212:212:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
+    212:212:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2711 -> b
+    212:212:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    212:212:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    213:257:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2713:2757 -> b
+    213:257:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    213:257:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    258:258:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    258:258:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2669 -> b
+    258:258:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    258:258:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    259:259:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2553:2553 -> b
+    259:259:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    260:265:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2804:2809 -> b
+    260:265:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2554 -> b
+    260:265:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    266:266:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2557:2557 -> b
+    266:266:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    267:294:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2767:2794 -> b
+    267:294:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2558 -> b
+    267:294:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    295:295:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2561:2561 -> b
+    295:295:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    296:301:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2815:2820 -> b
+    296:301:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    296:301:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    302:302:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    302:302:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2820 -> b
+    302:302:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    302:302:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    303:315:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2821:2833 -> b
+    303:315:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    303:315:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    316:332:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2826:2842 -> b
+    316:332:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    316:332:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    333:333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    333:333:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2820 -> b
+    333:333:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    333:333:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    334:348:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2565:2579 -> b
+    334:348:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    349:349:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
+    349:349:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2580 -> b
+    349:349:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    350:378:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581:2609 -> b
+    350:378:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    379:379:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):517:517 -> b
+    379:379:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2609 -> b
+    379:379:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    380:380:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2610:2610 -> b
+    380:380:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    381:381:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):521:521 -> b
+    381:381:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2610 -> b
+    381:381:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    382:396:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2613:2627 -> b
+    382:396:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    397:397:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2625:2625 -> b
+    397:397:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    398:398:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2624:2624 -> b
+    398:398:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    399:399:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> b
+    399:399:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2531 -> b
     1:1:java.util.Map access$1200(com.android.tools.r8.shaking.Enqueuer):103:103 -> c
-    2:2:void access$4600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> c
-    3:3:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():409:409 -> c
-    4:6:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):506:508 -> c
-    7:7:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):542:542 -> c
-    8:8:java.util.Set lambda$handleAnnotation$12(com.android.tools.r8.graph.DexType):1291:1291 -> c
-    9:15:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1704:1710 -> c
-    16:17:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1330:1331 -> c
-    16:17:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1715 -> c
-    18:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1720:1721 -> c
-    20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1722 -> c
-    21:21:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1725:1725 -> c
-    22:22:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]) -> c
-    22:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1726 -> c
-    23:30:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1730:1737 -> c
-    31:31:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1706:1706 -> c
-    32:36:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1837:1841 -> c
-    37:37:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
-    37:37:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1842 -> c
-    38:39:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1844:1845 -> c
-    40:40:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
-    40:40:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1842 -> c
-    41:41:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1970:1970 -> c
-    42:42:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2155:2155 -> c
-    43:43:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2534:2534 -> c
-    44:49:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2550:2555 -> c
-    44:49:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
-    50:50:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
-    50:50:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2556 -> c
-    50:50:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
-    51:53:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2557:2559 -> c
-    51:53:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
-    54:54:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2557:2557 -> c
-    54:54:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
-    55:55:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2550:2550 -> c
-    55:55:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    2:2:void access$4300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> c
+    3:3:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():399:399 -> c
+    4:4:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):521:521 -> c
+    5:5:java.util.Set lambda$handleAnnotation$11(com.android.tools.r8.graph.DexType):1260:1260 -> c
+    6:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markMethodAsTargeted$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1398:1398 -> c
+    7:19:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1451:1463 -> c
+    20:20:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1664:1664 -> c
+    21:26:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1699:1704 -> c
+    27:27:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    27:27:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1704 -> c
+    28:35:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1706:1713 -> c
+    36:44:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1755:1763 -> c
+    45:46:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1063:1064 -> c
+    45:46:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1763 -> c
+    47:47:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1764:1764 -> c
+    48:48:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1069:1069 -> c
+    48:48:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1764 -> c
+    49:51:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1765:1767 -> c
+    52:52:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    52:52:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1766 -> c
+    53:57:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1795:1799 -> c
+    58:58:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    58:58:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1800 -> c
+    59:60:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1802:1803 -> c
+    61:61:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    61:61:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1800 -> c
+    62:62:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2113:2113 -> c
+    63:68:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2510:2515 -> c
+    63:68:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    69:69:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    69:69:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2516 -> c
+    69:69:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    70:72:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517:2519 -> c
+    70:72:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    73:73:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517:2517 -> c
+    73:73:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    74:74:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2510:2510 -> c
+    74:74:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
     1:1:java.util.Map access$1400(com.android.tools.r8.shaking.Enqueuer):103:103 -> d
-    2:3:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():375:376 -> d
-    4:4:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexType):1118:1118 -> d
-    5:17:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1480:1492 -> d
-    18:19:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1698:1699 -> d
-    20:20:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1708:1708 -> d
-    21:29:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1797:1805 -> d
-    30:31:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1093:1094 -> d
-    30:31:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1805 -> d
-    32:32:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1806:1806 -> d
-    33:33:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1099:1099 -> d
-    33:33:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1806 -> d
-    34:36:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1807:1809 -> d
-    37:37:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    37:37:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1808 -> d
-    38:42:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2532:2536 -> d
-    43:43:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$38(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2538:2538 -> d
+    2:3:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():365:366 -> d
+    4:4:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexType):1088:1088 -> d
+    5:6:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1656:1657 -> d
+    7:13:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1662:1668 -> d
+    14:15:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1299:1300 -> d
+    14:15:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1673 -> d
+    16:17:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1678:1679 -> d
+    18:18:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    18:18:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1680 -> d
+    19:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1683:1683 -> d
+    20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1684 -> d
+    21:28:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1688:1695 -> d
+    29:29:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1666:1666 -> d
+    30:31:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1718:1719 -> d
+    32:32:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    32:32:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1719 -> d
+    33:33:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1721:1721 -> d
+    34:38:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2492:2496 -> d
+    39:39:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2494:2494 -> d
     1:1:com.android.tools.r8.graph.AppInfoWithSubtyping access$1600(com.android.tools.r8.shaking.Enqueuer):103:103 -> e
-    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$5(com.android.tools.r8.graph.DexType):1137:1137 -> e
-    3:11:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):1685:1693 -> e
-    12:13:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1760:1761 -> e
-    14:14:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> e
-    14:14:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1761 -> e
-    15:15:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1763:1763 -> e
-    16:18:void markReferencedTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2526:2528 -> e
-    19:19:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markReferencedTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2527:2527 -> e
+    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$5(com.android.tools.r8.graph.DexType):1107:1107 -> e
+    3:16:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1392:1405 -> e
+    17:17:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> e
+    17:17:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1405 -> e
+    18:21:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1407:1410 -> e
+    22:22:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524:2524 -> e
+    22:22:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    23:28:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:187 -> e
+    23:28:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524 -> e
+    23:28:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    29:29:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524:2524 -> e
+    29:29:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    30:30:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:182 -> e
+    30:30:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524 -> e
+    30:30:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    31:31:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2498:2498 -> e
     1:1:java.util.Set access$1900(com.android.tools.r8.shaking.Enqueuer):103:103 -> f
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):531:531 -> f
-    3:3:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$6(com.android.tools.r8.graph.DexType):1144:1144 -> f
-    4:15:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1423:1434 -> f
-    16:16:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> f
-    16:16:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1434 -> f
-    17:20:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1436:1439 -> f
-    21:21:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2564:2564 -> f
-    21:21:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440 -> f
-    22:27:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:187 -> f
-    22:27:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2564 -> f
-    22:27:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440 -> f
-    28:28:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2564:2564 -> f
-    28:28:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440 -> f
-    29:29:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:182 -> f
-    29:29:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2564 -> f
-    29:29:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440 -> f
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):510:510 -> f
+    3:3:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$6(com.android.tools.r8.graph.DexType):1114:1114 -> f
+    4:8:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1773:1777 -> f
+    9:9:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1775:1775 -> f
+    10:10:boolean com.android.tools.r8.shaking.KeepReason.isDueToKeepRule():0:0 -> f
+    10:10:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1776 -> f
+    11:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1778:1779 -> f
+    13:13:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> f
+    13:13:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1780 -> f
     1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.Enqueuer):103:103 -> g
-    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$7(com.android.tools.r8.graph.DexType):1167:1167 -> g
-    3:7:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1815:1819 -> g
-    8:8:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1817:1817 -> g
-    9:9:boolean com.android.tools.r8.shaking.KeepReason.isDueToKeepRule():0:0 -> g
-    9:9:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1818 -> g
-    10:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1820:1821 -> g
-    12:12:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> g
-    12:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1822 -> g
+    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$7(com.android.tools.r8.graph.DexType):1137:1137 -> g
     1:1:java.util.Set access$2500(com.android.tools.r8.shaking.Enqueuer):103:103 -> h
-    2:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1404:1405 -> h
+    2:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1373:1374 -> h
     4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> h
-    4:4:void reportMissingClass(com.android.tools.r8.graph.DexType):1405 -> h
-    1:1:java.util.Set access$2600(com.android.tools.r8.shaking.Enqueuer):103:103 -> i
-    1:1:java.util.Set access$2800(com.android.tools.r8.shaking.Enqueuer):103:103 -> j
+    4:4:void reportMissingClass(com.android.tools.r8.graph.DexType):1374 -> h
+    1:1:java.util.Set access$2700(com.android.tools.r8.shaking.Enqueuer):103:103 -> i
+    1:1:com.android.tools.r8.utils.InternalOptions access$2900(com.android.tools.r8.shaking.Enqueuer):103:103 -> j
     1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer):103:103 -> k
-    1:1:com.android.tools.r8.utils.InternalOptions access$3000(com.android.tools.r8.shaking.Enqueuer):103:103 -> l
+    1:1:java.util.Set access$3000(com.android.tools.r8.shaking.Enqueuer):103:103 -> l
     1:1:java.util.Set access$3100(com.android.tools.r8.shaking.Enqueuer):103:103 -> m
     1:1:java.util.Set access$3200(com.android.tools.r8.shaking.Enqueuer):103:103 -> n
-    1:1:java.util.Set access$3300(com.android.tools.r8.shaking.Enqueuer):103:103 -> o
-    1:1:boolean access$3500(com.android.tools.r8.shaking.Enqueuer):103:103 -> p
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$3700(com.android.tools.r8.shaking.Enqueuer):103:103 -> q
-    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer):103:103 -> r
-    1:1:java.util.Map access$500(com.android.tools.r8.shaking.Enqueuer):103:103 -> s
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$700(com.android.tools.r8.shaking.Enqueuer):103:103 -> t
-    1:1:java.util.Map access$800(com.android.tools.r8.shaking.Enqueuer):103:103 -> u
-com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.N.t:
+    1:1:boolean access$3400(com.android.tools.r8.shaking.Enqueuer):103:103 -> o
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$3600(com.android.tools.r8.shaking.Enqueuer):103:103 -> p
+    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer):103:103 -> q
+    1:1:java.util.Map access$500(com.android.tools.r8.shaking.Enqueuer):103:103 -> r
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$700(com.android.tools.r8.shaking.Enqueuer):103:103 -> s
+    1:1:java.util.Map access$800(com.android.tools.r8.shaking.Enqueuer):103:103 -> t
+com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.N.s:
     int[] $SwitchMap$com$android$tools$r8$graph$DexMethodHandle$MethodHandleType -> a
-    1:1:void <clinit>():1002:1002 -> <clinit>
-com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.N.u:
+    1:1:void <clinit>():972:972 -> <clinit>
+com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.N.t:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.shaking.Enqueuer this$0 -> d
     com.android.tools.r8.graph.DexItem annotationHolder -> a
     com.android.tools.r8.shaking.KeepReason reason -> c
-    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):3067:3067 -> <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):3074:3077 -> <init>
+    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):3001:3001 -> <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):3008:3011 -> <init>
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    1:15:boolean addField(com.android.tools.r8.graph.DexField):3087:3101 -> b
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> b
-    16:16:boolean addField(com.android.tools.r8.graph.DexField):3101 -> b
-    17:29:boolean addField(com.android.tools.r8.graph.DexField):3101:3113 -> b
-    30:39:boolean addMethod(com.android.tools.r8.graph.DexMethod):3121:3130 -> b
-    40:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):3129:3136 -> b
-    48:49:boolean addType(com.android.tools.r8.graph.DexType):3166:3167 -> b
-com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.N.v:
-    com.android.tools.r8.shaking.Enqueuer this$0 -> c
-    java.util.Set items -> a
-    java.util.function.BiConsumer register -> b
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):2930:2930 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):2926:2931 -> <init>
-    1:1:java.util.Set access$4100(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):2924:2924 -> a
-    2:4:boolean add(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2935:2937 -> a
-    5:5:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):2941:2941 -> a
-    6:6:java.util.Set getItems():2945:2945 -> a
-com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.N.w:
+    1:15:boolean addField(com.android.tools.r8.graph.DexField):3021:3035 -> b
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    16:16:boolean addField(com.android.tools.r8.graph.DexField):3035 -> b
+    17:29:boolean addField(com.android.tools.r8.graph.DexField):3035:3047 -> b
+    30:39:boolean addMethod(com.android.tools.r8.graph.DexMethod):3055:3064 -> b
+    40:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):3063:3070 -> b
+    48:49:boolean addType(com.android.tools.r8.graph.DexType):3100:3101 -> b
+com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.N.u:
     com.android.tools.r8.graph.DexClass holder -> a
     com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget UNRESOLVED -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> b
     boolean $assertionsDisabled -> d
-    1:3:void <clinit>():2973:2975 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):2984:2987 -> <init>
-    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2981:2981 -> a
-    1:1:boolean isUnresolved():2991 -> a
-    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2981:2981 -> b
-    1:2:boolean equals(java.lang.Object):3003:3004 -> equals
-    1:1:int hashCode():2997:2997 -> hashCode
+    1:3:void <clinit>():2907:2909 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):2918:2921 -> <init>
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2915:2915 -> a
+    1:1:boolean isUnresolved():2925 -> a
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2915:2915 -> b
+    1:2:boolean equals(java.lang.Object):2937:2938 -> equals
+    1:1:int hashCode():2931:2931 -> hashCode
     2:2:int com.android.tools.r8.graph.KeyedDexItem.hashCode():20:20 -> hashCode
-    2:2:int hashCode():2997 -> hashCode
-com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.N.x:
+    2:2:int hashCode():2931 -> hashCode
+com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.N.v:
     com.android.tools.r8.shaking.Enqueuer$Mode WHY_ARE_YOU_KEEPING -> d
     com.android.tools.r8.shaking.Enqueuer$Mode MAIN_DEX_TRACING -> c
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_TREE_SHAKING -> b
@@ -57952,195 +57747,193 @@
     2:2:boolean isInitialOrFinalTreeShaking():120 -> a
     1:1:boolean isInitialTreeShaking():112:112 -> b
     1:1:boolean isTracingMainDex():124:124 -> c
-com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.N.y:
+com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.N.w:
     java.util.Map methods -> a
-    1:4:void <init>():3008:3011 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3008:3008 -> <init>
-    1:1:java.util.Set getMethods():3014:3014 -> a
-    2:2:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):3018:3018 -> a
-    2:2:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3022 -> a
-    3:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3024:3029 -> a
-    9:9:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):3018:3018 -> a
-com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.N.z:
+    1:4:void <init>():2942:2945 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2942:2942 -> <init>
+    1:1:java.util.Set getMethods():2948:2948 -> a
+    2:2:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2952:2952 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2956 -> a
+    3:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2958:2963 -> a
+    9:9:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2952:2952 -> a
+com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.N.x:
     java.util.Set items -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(java.util.function.BiConsumer):2955:2955 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):2951:2956 -> <init>
-    1:1:java.util.Set access$3900(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2949:2949 -> a
-    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2960:2961 -> a
-    4:4:boolean contains(java.lang.Object):2965:2965 -> a
-    5:5:java.util.Set getItems():2969:2969 -> a
-com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.N.A:
+    1:1:void <init>(java.util.function.BiConsumer):2889:2889 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):2885:2890 -> <init>
+    1:1:java.util.Set access$3800(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2883:2883 -> a
+    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2894:2895 -> a
+    4:4:boolean contains(java.lang.Object):2899:2899 -> a
+    5:5:java.util.Set getItems():2903:2903 -> a
+com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.N.y:
     java.util.Set items -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():2906:2906 -> <clinit>
-    1:3:void <init>():2906:2908 -> <init>
-    4:4:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2906:2906 -> <init>
-    1:1:java.util.Set access$4000(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):2906:2906 -> a
-    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2911:2912 -> a
-    4:4:boolean contains(java.lang.Object):2916:2916 -> a
-    5:5:java.util.Set getItems():2920:2920 -> a
-com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.N.B:
+    1:1:void <clinit>():2865:2865 -> <clinit>
+    1:3:void <init>():2865:2867 -> <init>
+    4:4:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2865:2865 -> <init>
+    1:1:java.util.Set access$3900(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):2865:2865 -> a
+    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2870:2871 -> a
+    4:4:boolean contains(java.lang.Object):2875:2875 -> a
+    5:5:java.util.Set getItems():2879:2879 -> a
+com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.N.z:
     com.android.tools.r8.shaking.Enqueuer this$0 -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexProgramClass currentHolder -> c
     com.android.tools.r8.graph.DexEncodedMethod currentMethod -> d
-    1:1:void <clinit>():583:583 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):583:583 -> <init>
-    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):588:592 -> <init>
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):596:596 -> a
-    2:2:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):626:626 -> a
-    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):630:633 -> a
+    1:1:void <clinit>():562:562 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):562:562 -> <init>
+    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):567:571 -> <init>
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> a
+    2:2:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):605:605 -> a
+    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):609:612 -> 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:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):634 -> a
-    8:8:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):636:636 -> a
-    9:27:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):754:772 -> a
+    7:7:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):613 -> a
+    8:8:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):615:615 -> a
+    9:27:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):733:751 -> a
     28:28:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    28:28:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):773 -> a
-    29:31:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):778:780 -> a
-    32:32:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):596:596 -> a
-    32:32:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):780 -> a
-    33:39:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):780:786 -> a
-    40:40:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):785:785 -> a
-    41:46:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):797:802 -> a
-    47:47:java.lang.Boolean lambda$registerStaticFieldRead$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):836:836 -> a
-    48:48:boolean registerCheckCast(com.android.tools.r8.graph.DexType):922:922 -> a
-    49:49:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):933:933 -> a
+    28:28:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):752 -> a
+    29:31:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):757:759 -> a
+    32:32:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> a
+    32:32:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):759 -> a
+    33:39:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):759:765 -> a
+    40:40:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):764:764 -> a
+    41:46:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):776:781 -> a
+    47:47:java.lang.Boolean lambda$registerStaticFieldRead$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):815:815 -> a
+    48:48:boolean registerCheckCast(com.android.tools.r8.graph.DexType):892:892 -> a
+    49:49:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):903:903 -> a
     50:50:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    50:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):940 -> a
-    51:55:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):940:944 -> a
+    50:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):910 -> a
+    51:55:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):910:914 -> a
     56:56:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
-    56:56:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):944 -> a
-    57:60:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):945:948 -> a
-    61:125:void registerCallSite(com.android.tools.r8.graph.DexCallSite):956:1020 -> a
-    126:136:void registerCallSite(com.android.tools.r8.graph.DexCallSite):1007:1017 -> a
-    137:137:void registerCallSite(com.android.tools.r8.graph.DexCallSite):1016:1016 -> a
-    138:138:void registerCallSite(com.android.tools.r8.graph.DexCallSite):1010:1010 -> a
-    139:179:void registerCallSite(com.android.tools.r8.graph.DexCallSite):1004:1044 -> a
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):677:677 -> b
-    2:5:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):681:684 -> b
+    56:56:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):914 -> a
+    57:60:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):915:918 -> a
+    61:125:void registerCallSite(com.android.tools.r8.graph.DexCallSite):926:990 -> a
+    126:136:void registerCallSite(com.android.tools.r8.graph.DexCallSite):977:987 -> a
+    137:137:void registerCallSite(com.android.tools.r8.graph.DexCallSite):986:986 -> a
+    138:138:void registerCallSite(com.android.tools.r8.graph.DexCallSite):980:980 -> a
+    139:179:void registerCallSite(com.android.tools.r8.graph.DexCallSite):974:1014 -> a
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):656:656 -> b
+    2:5:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):660:663 -> b
     6:6:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    6:6:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):685 -> b
-    7:7:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):687:687 -> b
-    8:26:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):708:726 -> b
+    6:6:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):664 -> b
+    7:7:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):666:666 -> b
+    8:26:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):687:705 -> b
     27:27:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    27:27:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):727 -> b
-    28:39:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):731:742 -> b
-    40:40:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):596:596 -> b
-    40:40:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):742 -> b
-    41:47:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):742:748 -> b
-    48:48:java.lang.Boolean lambda$registerStaticFieldWrite$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):881:881 -> b
-    49:56:boolean registerConstClass(com.android.tools.r8.graph.DexType):910:917 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):642:642 -> c
-    2:24:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):646:668 -> c
+    27:27:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):706 -> b
+    28:39:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):710:721 -> b
+    40:40:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> b
+    40:40:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):721 -> b
+    41:47:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):721:727 -> b
+    48:48:java.lang.Boolean lambda$registerStaticFieldWrite$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):860:860 -> b
+    49:49:boolean registerConstClass(com.android.tools.r8.graph.DexType):887:887 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):621:621 -> c
+    2:24:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):625:647 -> c
     25:25:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    25:25:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):669 -> c
-    26:26:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):671:671 -> c
-    27:27:boolean registerNewInstance(com.android.tools.r8.graph.DexType):792:792 -> c
+    25:25:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):648 -> c
+    26:26:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):650:650 -> c
+    27:27:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771:771 -> c
     28:28:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod) -> c
-    28:28:boolean registerNewInstance(com.android.tools.r8.graph.DexType):792 -> c
-    29:29:boolean registerNewInstance(com.android.tools.r8.graph.DexType):792:792 -> c
-    30:48:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):810:828 -> c
+    28:28:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771 -> c
+    29:29:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771:771 -> c
+    30:48:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):789:807 -> c
     49:49:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    49:49:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):828 -> c
-    50:56:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):831:837 -> c
-    57:72:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):834:849 -> c
-    1:8:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):605:612 -> d
-    9:19:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):607:617 -> d
+    49:49:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):807 -> c
+    50:56:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):810:816 -> c
+    57:72:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):813:828 -> c
+    1:8:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):584:591 -> d
+    9:19:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):586:596 -> d
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    20:20:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):618 -> d
-    21:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):620:620 -> d
-    22:27:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):695:700 -> d
+    20:20:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):597 -> d
+    21:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):599:599 -> d
+    22:27:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):674:679 -> d
     28:28:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    28:28:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):700 -> d
-    29:29:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):702:702 -> d
-    30:48:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):855:873 -> d
+    28:28:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):679 -> d
+    29:29:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):681:681 -> d
+    30:48:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):834:852 -> d
     49:49:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    49:49:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):873 -> d
-    50:56:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):876:882 -> d
-    57:80:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):879:902 -> d
-    81:81:boolean registerTypeReference(com.android.tools.r8.graph.DexType):927:927 -> d
-    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):601:601 -> e
-    2:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1050:1059 -> e
-    12:12:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1058:1058 -> e
-com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.N.D:
+    49:49:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):852 -> d
+    50:56:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):855:861 -> d
+    57:80:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):858:881 -> d
+    81:81:boolean registerTypeReference(com.android.tools.r8.graph.DexType):897:897 -> d
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):580:580 -> e
+    2:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1020:1029 -> e
+    12:12:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1028:1028 -> e
+com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.N.B:
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap com.android.tools.r8.shaking.EnqueuerUtils.toImmutableSortedMap(java.util.Map,java.util.Comparator):15:17 -> a
     4:4:com.android.tools.r8.shaking.Enqueuer createForInitialTreeShaking(com.android.tools.r8.graph.AppView):16:16 -> a
     5:5:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):21:21 -> a
     1:1:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView):25:25 -> b
     2:2:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):30:30 -> b
     1:1:com.android.tools.r8.shaking.Enqueuer createForWhyAreYouKeeping(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):35:35 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.N.O:
+com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.N.M:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Queue queue -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):169:169 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):167:170 -> <init>
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):174:174 -> a
-    2:2:boolean isEmpty():178:178 -> a
-    3:3:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):186:186 -> a
-    4:4:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):198:198 -> a
-    5:6:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):203:204 -> a
-    7:8:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):211:212 -> a
-    9:10:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):229:230 -> a
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action poll():182:182 -> b
-    2:2:void enqueueMarkReachableInterfaceAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):194:194 -> b
-    3:4:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):223:224 -> b
-    1:1:void enqueueMarkReachableVirtualAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):190:190 -> c
-    2:3:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):217:218 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist$Action -> com.android.tools.r8.N.E:
-    1:1:void <init>():18:18 -> <init>
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):162:162 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):160:163 -> <init>
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):167:167 -> a
+    2:2:boolean isEmpty():171:171 -> a
+    3:3:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):179:179 -> a
+    4:4:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):191:191 -> a
+    5:6:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):196:197 -> a
+    7:8:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):204:205 -> a
+    9:10:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):215:216 -> a
+    11:12:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):220:221 -> a
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action poll():175:175 -> b
+    2:2:void enqueueMarkReachableInterfaceAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):187:187 -> b
+    3:4:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):210:211 -> b
+    1:1:void enqueueMarkReachableVirtualAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):183:183 -> c
+com.android.tools.r8.shaking.EnqueuerWorklist$Action -> com.android.tools.r8.N.C:
+    1:1:void <init>():17:17 -> <init>
     void run(com.android.tools.r8.shaking.Enqueuer) -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.N.F:
-    com.android.tools.r8.graph.DexEncodedField target -> b
-    com.android.tools.r8.graph.DexProgramClass holder -> a
-    com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness witness -> c
-    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):154:157 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):162:162 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.N.G:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.N.D:
+    com.android.tools.r8.graph.DexEncodedField target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):148:150 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):155:155 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.N.E:
     com.android.tools.r8.graph.DexProgramClass target -> a
     com.android.tools.r8.shaking.KeepReason reason -> c
     com.android.tools.r8.graph.DexEncodedMethod context -> b
-    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:106 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):111:111 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.N.H:
-    com.android.tools.r8.graph.DexProgramClass holder -> a
-    com.android.tools.r8.shaking.KeepReason reason -> c
-    com.android.tools.r8.graph.DexEncodedMethod target -> b
-    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):136:139 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):144:144 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.N.I:
+    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):102:105 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):110:110 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.N.F:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.shaking.KeepReason reason -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):119:121 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):126:126 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.N.J:
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):133:135 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):140:140 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.N.G:
+    com.android.tools.r8.graph.DexEncodedMethod target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):118:120 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):125:125 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.N.H:
     com.android.tools.r8.shaking.KeepReason reason -> b
     com.android.tools.r8.graph.DexMethod target -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):26:28 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):33:33 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction -> com.android.tools.r8.N.K:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):25:27 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):32:32 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction -> com.android.tools.r8.N.I:
     com.android.tools.r8.graph.DexEncodedField target -> a
     com.android.tools.r8.shaking.KeepReason reason -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):86:88 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):93:93 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableInterfaceAction -> com.android.tools.r8.N.L:
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):85:87 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):92:92 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableInterfaceAction -> com.android.tools.r8.N.J:
     com.android.tools.r8.shaking.KeepReason reason -> b
     com.android.tools.r8.graph.DexMethod target -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):56:58 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):63:63 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.N.M:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):55:57 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):62:62 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.N.K:
     com.android.tools.r8.graph.DexEncodedMethod context -> b
     com.android.tools.r8.graph.DexMethod target -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):71:73 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):78:78 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableVirtualAction -> com.android.tools.r8.N.N:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):70:72 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):77:77 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableVirtualAction -> com.android.tools.r8.N.L:
     com.android.tools.r8.shaking.KeepReason reason -> b
     com.android.tools.r8.graph.DexMethod target -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):41:43 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):48:48 -> a
-com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.N.P:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):40:42 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):47:47 -> a
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.N.N:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -58159,7 +57952,7 @@
     1:1:boolean isUnfiltered():123:123 -> toString
     1:1:java.lang.String toString():128 -> toString
     2:16:java.lang.String toString():129:143 -> toString
-com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.N.S:
+com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.N.P:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map annotationNodes -> d
     boolean $assertionsDisabled -> j
@@ -58187,85 +57980,84 @@
     52:57: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):149:154 -> a
     52:57:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):162 -> a
     58:58:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):165:165 -> a
-    59:64:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):203:208 -> a
-    65:70:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):213:218 -> a
-    71:76:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):222:227 -> a
-    77:80:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):232:235 -> a
-    81:86:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):233:238 -> a
-    87:94:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):243:250 -> a
-    95:101:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):265:271 -> a
-    102:102:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):269:269 -> a
-    103:105: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):276:278 -> a
-    106:110:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):306:310 -> a
-    111:111:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):372:372 -> a
-    111:111:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):310 -> a
-    112:113:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):310:311 -> a
-    114:117:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):323:326 -> a
-    118:121:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):330:333 -> a
-    122:125:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):337:340 -> a
-    126:127:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):367:368 -> a
-    126:127:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):340 -> a
-    128:130:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):343:345 -> a
-    131:134:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):349:352 -> a
-    135:135:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):356:356 -> a
-    136:136:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):372:372 -> a
-    136:136:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):357 -> a
-    137:137:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):359:359 -> a
-    138:138:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):389:389 -> a
-    138:138:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):360 -> a
-    139:141:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):361:363 -> a
-    142:151:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):376:385 -> a
-    152:152:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):393:393 -> a
-    153:153:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):397:397 -> a
-    154:158:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):400:404 -> a
-    159:159:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):409:409 -> a
-    160:160:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):420:420 -> a
-    161:163:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):423:425 -> a
-    164:164:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    164:164:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):426 -> a
-    165:168:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):426:429 -> a
-    169:169:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    169:169:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):431 -> a
-    170:175:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):431:436 -> a
-    176:176:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    176:176:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):436 -> a
-    177:177:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):436:436 -> a
-    178:178:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):430:430 -> a
-    179:179:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):441:441 -> a
-    180:182:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):444:446 -> a
-    183:183:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    183:183:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):448 -> a
-    184:185:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):448:449 -> a
-    186:186:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    186:186:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):450 -> a
-    187:187:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):450:450 -> a
-    188:188:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):447:447 -> a
-    189:209:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):463:483 -> a
-    210:210: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):468:468 -> a
-    211:215:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):476:480 -> a
+    59:64:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):203:208 -> a
+    65:70:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):212:217 -> a
+    71:74:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):222:225 -> a
+    75:80:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):223:228 -> a
+    81:88:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):233:240 -> a
+    89:95:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):244:250 -> a
+    96:96:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):249:249 -> a
+    97:103:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):255:261 -> a
+    104:104:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):259:259 -> a
+    105:107: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):266:268 -> a
+    108:112:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):296:300 -> a
+    113:113:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):362:362 -> a
+    113:113:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):300 -> a
+    114:115:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):300:301 -> a
+    116:119:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):313:316 -> a
+    120:123:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):320:323 -> a
+    124:127:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):327:330 -> a
+    128:129:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):357:358 -> a
+    128:129:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):330 -> a
+    130:132:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):333:335 -> a
+    133:136:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):339:342 -> a
+    137:137:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):346:346 -> a
+    138:138:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):362:362 -> a
+    138:138:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):347 -> a
+    139:139:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):349:349 -> a
+    140:140:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):379:379 -> a
+    140:140:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):350 -> a
+    141:143:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):351:353 -> a
+    144:153:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):366:375 -> a
+    154:154:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):383:383 -> a
+    155:155:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):387:387 -> a
+    156:160:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):390:394 -> a
+    161:161:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):399:399 -> a
+    162:162:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):410:410 -> a
+    163:165:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):413:415 -> a
+    166:166:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    166:166:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):416 -> a
+    167:170:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):416:419 -> a
+    171:171:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    171:171:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):421 -> a
+    172:177:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):421:426 -> a
+    178:178:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    178:178:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):426 -> a
+    179:179:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):426:426 -> a
+    180:180:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):420:420 -> a
+    181:181:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):431:431 -> a
+    182:184:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):434:436 -> a
+    185:185:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    185:185:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):438 -> a
+    186:187:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):438:439 -> a
+    188:188:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    188:188:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):440 -> a
+    189:189:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):440:440 -> a
+    190:190:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):437:437 -> a
+    191:211:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):453:473 -> a
+    212:212: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):458:458 -> a
+    213:217:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):466:470 -> a
     1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):192:195 -> b
     5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):193:198 -> b
-    11:17:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):254:260 -> b
-    18:18:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):259:259 -> b
-    19:23:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):315:319 -> b
-    24:24:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$0(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):393:393 -> b
-    25:27:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):412:414 -> b
-    28:28:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
-    28:28:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):415 -> b
-    29:29:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):415:415 -> b
+    11:15:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):305:309 -> b
+    16:16:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$0(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):383:383 -> b
+    17:19:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):402:404 -> b
+    20:20:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
+    20:20:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):405 -> b
+    21:21:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):405:405 -> b
     1:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):170:171 -> c
     3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
     3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171 -> c
     4:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171:175 -> c
     9:14:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):173:178 -> c
-com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.N.Q:
+com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.N.O:
     com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness INSTANCE -> a
-    1:1:void <clinit>():288:288 -> <clinit>
-    1:1:void <init>():290:290 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():296:296 -> a
-    2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):301:301 -> a
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():286:286 -> c
-com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.N.T:
+    1:1:void <clinit>():278:278 -> <clinit>
+    1:1:void <init>():280:280 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():286:286 -> a
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):291:291 -> a
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():276:276 -> c
+com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.N.Q:
     1:1:void <init>():11:11 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
     2:22:boolean doEquivalent(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardIfRule):15:35 -> a
@@ -58273,7 +58065,7 @@
     23:23:int doHash(java.lang.Object):11:11 -> a
     24:41:int doHash(com.android.tools.r8.shaking.ProguardIfRule):43:60 -> a
     24:41:int doHash(java.lang.Object):11 -> a
-com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.N.U:
+com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.N.S:
     java.util.Set liveTypes -> g
     com.android.tools.r8.shaking.RootSetBuilder rootSetBuilder -> i
     com.android.tools.r8.graph.AppView appView -> a
@@ -58322,7 +58114,7 @@
     203:204:boolean lambda$evaluateIfRuleMembersAndMaterialize$4(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):280:281 -> a
     205:230:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):294:319 -> a
     1:5:void registerClassCapture(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):179:183 -> b
-com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.N.Y:
+com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.N.W:
     com.android.tools.r8.origin.Origin checkDiscardOrigin -> r
     com.android.tools.r8.shaking.InlineRule$Type type -> q
     boolean $assertionsDisabled -> s
@@ -58364,14 +58156,14 @@
     24:24:com.android.tools.r8.shaking.ProguardCheckDiscardRule asProguardCheckDiscardRule():95:95 -> v
     1:1:com.android.tools.r8.shaking.InlineRule$Type getType():78:78 -> w
     1:1:com.android.tools.r8.shaking.InlineRule$Builder builder():74:74 -> x
-com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.N.V:
+com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.N.T:
     1:1:void <init>(com.android.tools.r8.origin.Origin):13:13 -> <init>
-com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.N.W:
+com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.N.U:
     com.android.tools.r8.shaking.InlineRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.InlineRule$1):24:24 -> <init>
     2:2:void <init>():27:27 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.N.X:
+com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.N.V:
     com.android.tools.r8.shaking.InlineRule$Type[] $VALUES -> d
     com.android.tools.r8.shaking.InlineRule$Type NEVER -> c
     com.android.tools.r8.shaking.InlineRule$Type FORCE -> b
@@ -58380,7 +58172,7 @@
     2:2:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
     1:1:com.android.tools.r8.shaking.InlineRule$Type[] values():20:20 -> a
-com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.N.n0:
+com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.N.l0:
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind() -> a
     com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter) -> a
@@ -58391,8 +58183,8 @@
     1:1:com.android.tools.r8.shaking.KeepReason invokedFromLambdaCreatedIn(com.android.tools.r8.graph.DexEncodedMethod):44:44 -> b
     1:1:com.android.tools.r8.shaking.KeepReason invokedViaSuperFrom(com.android.tools.r8.graph.DexEncodedMethod):32:32 -> c
     1:1:com.android.tools.r8.shaking.KeepReason reflectiveUseIn(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> d
-com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.N.Z:
-com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.N.a0:
+com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.N.X:
+com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.N.Y:
     com.android.tools.r8.graph.DexDefinition holder -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():261:261 -> <clinit>
@@ -58400,66 +58192,66 @@
     2:3:void <init>(com.android.tools.r8.graph.DexDefinition):265:266 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():271:271 -> a
     2:8:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):276:282 -> a
-com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.N.b0:
+com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.N.Z:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):79:79 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):83:84 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):95:95 -> a
-com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> com.android.tools.r8.N.c0:
+com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> com.android.tools.r8.N.a0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):99:99 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):102:102 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):99:99 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():107:107 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.N.d0:
+com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.N.b0:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():150:150 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):150:150 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):153:154 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():159:159 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.N.e0:
+com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.N.c0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):168:168 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):171:171 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():176:176 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.N.f0:
+com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.N.d0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):116:116 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):119:119 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():124:124 -> a
-com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> com.android.tools.r8.N.g0:
+com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> com.android.tools.r8.N.e0:
     com.android.tools.r8.graph.DexType implementer -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):221:221 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):226:227 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():233:233 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):238:238 -> a
-com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.N.h0:
+com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.N.f0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):309:309 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):312:312 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():317:317 -> a
-com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.N.i0:
+com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.N.g0:
     com.android.tools.r8.graph.DexType type -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):202:202 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):206:207 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():212:212 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):217:217 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.N.j0:
+com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.N.h0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):185:185 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):188:188 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():193:193 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.N.k0:
+com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.N.i0:
     com.android.tools.r8.graph.DexItem holder -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason$1):242:242 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexItem):246:247 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():252:252 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):257:257 -> a
-com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.N.l0:
+com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.N.j0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):287:287 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):290:290 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():300:300 -> a
     boolean isDueToReflectiveUse() -> b
-com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.N.m0:
+com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.N.k0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):136:136 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():141:141 -> a
-com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.N.o0:
+com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.N.m0:
     java.util.List pruned -> c
     java.util.Set emulatedInterfaces -> a
     java.util.Set backports -> b
@@ -58471,7 +58263,7 @@
     9:21:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):48 -> a
     22:22:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):51:51 -> a
     23:31:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):49:57 -> a
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.N.q0:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.N.o0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap escapeDebuggingCounters -> c
     java.util.Set nonEscapingClassesWithLibraryMethodOverrides -> b
@@ -58504,7 +58296,7 @@
     6:10:void logResults():159:163 -> b
     11:18:void logResults():160:167 -> b
     19:25:void logResults():164:170 -> b
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.N.p0:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.N.n0:
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():184:184 -> <init>
@@ -58512,7 +58304,7 @@
     2:2: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):196:196 -> a
     3:14:boolean isTrivialInitializerInvocation(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:220 -> a
     3:14: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 -> a
-com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.N.t0:
+com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.N.r0:
     java.util.Set classes -> c
     boolean $assertionsDisabled -> e
     java.util.Set roots -> a
@@ -58536,8 +58328,8 @@
     1:1:java.util.Set getDependencies():87:87 -> b
     1:1:java.util.Set getRoots():83:83 -> c
     1:2:boolean isEmpty():78:79 -> d
-com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.N.r0:
-com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.N.s0:
+com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.N.p0:
+com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.N.q0:
     java.util.Set dependencies -> c
     java.util.Set roots -> b
     com.android.tools.r8.graph.AppInfo appInfo -> a
@@ -58557,7 +58349,7 @@
     4:5:com.android.tools.r8.shaking.MainDexClasses$Builder addRoot(com.android.tools.r8.graph.DexType):32:33 -> b
     1:1:boolean contains(com.android.tools.r8.graph.DexType):50:50 -> c
     1:2:boolean isProgramClass(com.android.tools.r8.graph.DexType):58:59 -> d
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.N.y0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.N.w0:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector codeDirectReferenceCollector -> b
     java.util.function.Consumer consumer -> d
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
@@ -58580,8 +58372,8 @@
     20:20:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):81:81 -> a
     21:25:void lambda$hasReferencesOutsideFromCode$2(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox,com.android.tools.r8.graph.DexType):71:75 -> a
     26:29:void traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):89:92 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.N.u0:
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.N.v0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.N.s0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.N.t0:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):172:172 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):172:172 -> <init>
@@ -58593,11 +58385,11 @@
     1:2:boolean addField(com.android.tools.r8.graph.DexField):182:183 -> b
     3:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):189:190 -> b
     5:5:boolean addType(com.android.tools.r8.graph.DexType):210:210 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox -> com.android.tools.r8.N.w0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox -> com.android.tools.r8.N.u0:
     boolean value -> a
     1:2:void <init>():59:60 -> <init>
     3:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):59:59 -> <init>
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.N.x0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.N.v0:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> c
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):96:96 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory):98:99 -> <init>
@@ -58614,7 +58406,7 @@
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):104:104 -> e
     2:3:boolean registerFieldAccess(com.android.tools.r8.graph.DexField):154:155 -> e
     1:2:boolean registerInvoke(com.android.tools.r8.graph.DexMethod):128:129 -> f
-com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.N.z0:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.N.x0:
     java.util.Map annotationTypeContainEnum -> c
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> b
     boolean $assertionsDisabled -> f
@@ -58664,29 +58456,29 @@
     14:14:void traceRuntimeAnnotationsWithEnumForMainDex():78:78 -> c
     15:37:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):359:381 -> c
     15:37:void traceRuntimeAnnotationsWithEnumForMainDex():78 -> c
-com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.N.D0:
+com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.N.B0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.shaking.MemberValuePropagationRule$1):11:11 -> <init>
     2:5:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type):61:64 -> <init>
     1:5:java.lang.String typeString():77:81 -> u
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type getType():72:72 -> v
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder builder():68:68 -> w
-com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> com.android.tools.r8.N.A0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> com.android.tools.r8.N.y0:
     int[] $SwitchMap$com$android$tools$r8$shaking$MemberValuePropagationRule$Type -> a
     1:1:void <clinit>():77:77 -> <clinit>
-com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.N.B0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.N.z0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.MemberValuePropagationRule$1):17:17 -> <init>
     2:2:void <init>():21:21 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> com.android.tools.r8.N.C0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> com.android.tools.r8.N.A0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] $VALUES -> b
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type NEVER -> a
     1:1:void <clinit>():14:14 -> <clinit>
     2:2:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.N.E0:
+com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.N.C0:
     java.util.List NAMES -> c
     int PPP_MASK -> b
     int flags -> a
@@ -58737,51 +58529,51 @@
     1:1:void setSynthetic():182:182 -> x
     1:1:void setTransient():150:150 -> y
     1:1:void setVolatile():142:142 -> z
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.N.H0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.N.F0:
     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.ProguardAssumeMayHaveSideEffectsRule$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>
     boolean applyToNonProgramClasses() -> p
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder builder():75:75 -> v
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.N.F0:
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.N.G0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.N.D0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.N.E0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.N.K0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.N.I0:
     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.ProguardAssumeNoSideEffectRule$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):46:46 -> <init>
     boolean applyToNonProgramClasses() -> p
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder builder():55:55 -> v
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.N.I0:
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.N.J0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.N.G0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.N.H0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:1:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule build():26:26 -> c
-com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.N.N0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.N.L0:
     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.ProguardAssumeValuesRule$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):46:46 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder builder():55:55 -> v
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> com.android.tools.r8.N.L0:
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.N.M0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> com.android.tools.r8.N.J0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.N.K0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.N.Q0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.N.O0:
     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.ProguardCheckDiscardRule$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):46:46 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder builder():52:52 -> v
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.N.O0:
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.N.P0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.N.M0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.N.N0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule build():26:26 -> c
-com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.N.T0:
+com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.N.R0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> a
     1:2:void <clinit>():12:13 -> <clinit>
@@ -58792,15 +58584,15 @@
     4:5:void filterOutMatches(java.util.Set):59:60 -> a
     6:10:void lambda$filterOutMatches$0(java.util.Set,com.android.tools.r8.shaking.ProguardTypeMatcher):61:65 -> a
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder builder():18:18 -> b
-com.android.tools.r8.shaking.ProguardClassFilter$1 -> com.android.tools.r8.N.R0:
-com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.N.S0:
+com.android.tools.r8.shaking.ProguardClassFilter$1 -> com.android.tools.r8.N.P0:
+com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.N.Q0:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassFilter$1):21:21 -> <init>
     2:2:void <init>():24:24 -> <init>
     3:3:void <init>():22:22 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder addPattern(com.android.tools.r8.shaking.ProguardClassNameList):28:28 -> a
     2:2:com.android.tools.r8.shaking.ProguardClassFilter build():33:33 -> a
-com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.N.Z0:
+com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.N.X0:
     1:1:void <init>():21:21 -> <init>
     java.util.List asSpecificDexTypes() -> a
     void forEachTypeMatcher(java.util.function.Consumer) -> a
@@ -58811,15 +58603,15 @@
     2:2:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardClassNameList):91:91 -> a
     java.lang.Iterable getWildcards() -> b
     1:3:java.lang.String toString():71:73 -> toString
-com.android.tools.r8.shaking.ProguardClassNameList$1 -> com.android.tools.r8.N.U0:
-com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.N.V0:
+com.android.tools.r8.shaking.ProguardClassNameList$1 -> com.android.tools.r8.N.S0:
+com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.N.T0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassNameList$1):37:37 -> <init>
     2:2:void <init>():44:44 -> <init>
     3:3:void <init>():42:42 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder addClassName(boolean,com.android.tools.r8.shaking.ProguardTypeMatcher):48:48 -> a
     2:9:com.android.tools.r8.shaking.ProguardClassNameList build():53:60 -> a
-com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.N.W0:
+com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.N.U0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap classNames -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardClassNameList$1):279:279 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):283:284 -> <init>
@@ -58836,7 +58628,7 @@
     1:3:java.lang.Iterable getWildcards():342:344 -> b
     1:5:boolean equals(java.lang.Object):312:316 -> equals
     1:1:int hashCode():321:321 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.N.X0:
+com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.N.V0:
     com.android.tools.r8.com.google.common.collect.ImmutableList classNames -> a
     1:1:void <init>(java.util.Collection,com.android.tools.r8.shaking.ProguardClassNameList$1):201:201 -> <init>
     2:3:void <init>(java.util.Collection):205:206 -> <init>
@@ -58853,7 +58645,7 @@
     2:4:java.lang.Iterable getWildcards():259:261 -> b
     1:5:boolean equals(java.lang.Object):231:235 -> equals
     1:1:int hashCode():240:240 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.N.Y0:
+com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.N.W0:
     com.android.tools.r8.shaking.ProguardTypeMatcher className -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardClassNameList$1):139:139 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher):143:144 -> <init>
@@ -58866,7 +58658,7 @@
     1:1:java.lang.Iterable getWildcards():187:187 -> b
     1:5:boolean equals(java.lang.Object):162:166 -> equals
     1:1:int hashCode():171:171 -> hashCode
-com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.N.b1:
+com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.N.Z0:
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceClassName -> k
     boolean $assertionsDisabled -> n
     com.android.tools.r8.shaking.ProguardClassType classType -> h
@@ -58904,7 +58696,7 @@
     1:1:java.lang.String getSource():228:228 -> n
     1:1:boolean hasInheritanceClassName():244:244 -> o
     1:1:java.lang.String toString():374:374 -> toString
-com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.N.a1:
+com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.N.Y0:
     com.android.tools.r8.shaking.ProguardClassType classType -> i
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceAnnotation -> k
     boolean inheritanceIsExtends -> m
@@ -58925,7 +58717,7 @@
     1:7:com.android.tools.r8.position.Position getPosition():70:76 -> a
     8:8:com.android.tools.r8.position.Position getPosition():74:74 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.N.h1:
+com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.N.f1:
     com.android.tools.r8.shaking.ProguardClassType ANNOTATION_INTERFACE -> a
     com.android.tools.r8.shaking.ProguardClassType CLASS -> b
     com.android.tools.r8.shaking.ProguardClassType UNSPECIFIED -> e
@@ -58938,22 +58730,22 @@
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.shaking.ProguardClassType$1):9:9 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
     1:9:java.lang.String toString():43:51 -> toString
-com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.N.c1:
+com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.N.a1:
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):13:13 -> a
-com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.N.d1:
+com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.N.b1:
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.N.e1:
+com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.N.c1:
     1:1:void <init>(java.lang.String,int):22:22 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):25:25 -> a
-com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.N.f1:
+com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.N.d1:
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):31:31 -> a
-com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.N.g1:
+com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.N.e1:
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.N.j1:
+com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.N.h1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.lang.String packagePrefix -> f
     boolean optimizing -> i
@@ -59034,8 +58826,8 @@
     1:1:boolean hasApplyMappingFile():543:543 -> x
     1:1:boolean hasDontUseMixedCaseClassnames():659:659 -> y
     1:1:boolean isAccessModificationAllowed():531:531 -> z
-com.android.tools.r8.shaking.ProguardConfiguration$1 -> com.android.tools.r8.N.i1:
-com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.N.j1$a:
+com.android.tools.r8.shaking.ProguardConfiguration$1 -> com.android.tools.r8.N.g1:
+com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.N.h1$a:
     java.lang.String packagePrefix -> f
     java.nio.file.Path classObfuscationDictionary -> D
     boolean overloadAggressively -> N
@@ -59159,7 +58951,7 @@
     1:10:void synthesizeKeepRulesForRecompilation():296:305 -> n
     11:11:void synthesizeKeepRulesForRecompilation():302:302 -> n
     12:12:void synthesizeKeepRulesForRecompilation():301:301 -> n
-com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.N.o1:
+com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.N.m1:
     com.android.tools.r8.shaking.ProguardConfiguration$Builder configurationBuilder -> a
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.utils.Reporter reporter -> c
@@ -59204,24 +58996,24 @@
     1:1:java.util.List access$700():46:46 -> i
     1:1:java.util.List access$800():46:46 -> j
     1:1:java.util.List access$900():46:46 -> k
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.N.k1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.N.i1:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
     1:3:void <init>(java.lang.String,java.util.List):2024:2026 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2030:2030 -> a
     2:3:boolean hasBackreference():2038:2039 -> a
     1:15:boolean hasUnusualCharacters():2043:2057 -> b
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.N.l1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.N.j1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards patternWithWildcards -> a
     boolean negated -> b
     1:3:void <init>(java.lang.String,java.util.List,boolean):2068:2070 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.N.m1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.N.k1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType CLASS_NAME -> b
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType PACKAGE_NAME -> a
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType ANY -> c
     1:3:void <clinit>():191:193 -> <clinit>
     1:1:void <init>(java.lang.String,int):190:190 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.N.n1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.N.l1:
     java.util.function.Predicate PACKAGE_NAME_PREDICATE -> j
     java.nio.file.Path baseDirectory -> g
     boolean $assertionsDisabled -> l
@@ -59552,7 +59344,7 @@
     477:477:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
     477:477:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
     477:477:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
-    478:478:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    478:478:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     478:478:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1209 -> a
     478:478:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
     478:478:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
@@ -60237,7 +60029,7 @@
     1:6:void skipWhitespace():1432:1437 -> x
     7:14:void skipComment():1443:1450 -> x
     7:14:void skipWhitespace():1439 -> x
-com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.N.p1:
+com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.N.n1:
     boolean used -> o
     boolean $assertionsDisabled -> p
     1:1:void <clinit>():21:21 -> <clinit>
@@ -60259,9 +60051,9 @@
     1:1:void markAsUsed():49:49 -> s
     java.lang.String modifierString() -> t
     java.lang.String typeString() -> u
-com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.N.q1:
+com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.N.o1:
     java.nio.file.Path getBaseDirectory() -> a
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.N.r1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.N.p1:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> b
     1:3:void <init>(byte[],com.android.tools.r8.origin.Origin):18:20 -> <init>
@@ -60269,14 +60061,14 @@
     1:1:java.lang.String get():29:29 -> get
     1:1:java.lang.String getName():40:40 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.N.s1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.N.q1:
     java.nio.file.Path path -> a
     1:2:void <init>(java.nio.file.Path):18:19 -> <init>
     1:5:java.nio.file.Path getBaseDirectory():29:33 -> a
     1:1:java.lang.String get():24:24 -> get
     1:1:java.lang.String getName():40:40 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.N.t1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.N.r1:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
@@ -60284,7 +60076,7 @@
     1:1:java.nio.file.Path getBaseDirectory():47:47 -> a
     1:1:java.lang.String get():42:42 -> get
     1:1:com.android.tools.r8.origin.Origin getOrigin():57:57 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.N.x1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.N.v1:
     com.android.tools.r8.origin.Origin synthesizedRecompilationOrigin -> a
     1:12:void <clinit>():19:30 -> <clinit>
     1:14:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):90:103 -> a
@@ -60293,7 +60085,7 @@
     16:16:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):104:104 -> a
     17:17:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:130 -> a
     17:17:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):105 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     18:18:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108 -> a
     19:19:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.create(com.android.tools.r8.graph.DexType):101:101 -> a
     19:19:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108 -> a
@@ -60310,7 +60102,7 @@
     36:36:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):109 -> a
     37:37:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):120:120 -> a
     38:50:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):129:141 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     51:51:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):141 -> a
     52:78:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):141:167 -> a
     79:82:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):178:181 -> a
@@ -60324,25 +60116,25 @@
     92:92:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):188 -> a
     93:93:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):189:189 -> a
     94:94:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):180:180 -> a
-com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.N.u1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.N.s1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):22:22 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.N.v1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.N.t1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):30:30 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.N.w1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.N.u1:
     com.android.tools.r8.utils.AndroidApiLevel val$apiLevel -> e
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.AndroidApiLevel):91:91 -> <init>
     1:1:java.lang.String part():94:94 -> part
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.N.A1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.N.y1:
     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.ProguardIdentifierNameStringRule$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):45:45 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder builder():51:51 -> v
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> com.android.tools.r8.N.y1:
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.N.z1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> com.android.tools.r8.N.w1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.N.x1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):12:12 -> <init>
     2:2:void <init>():15:15 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.N.D1:
+com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.N.B1:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> t
     java.util.Set preconditions -> s
     com.android.tools.r8.origin.Origin neverInlineOrigin -> u
@@ -60366,16 +60158,16 @@
     java.lang.String typeString() -> u
     1:1:java.util.Set getPreconditions():30:30 -> x
     1:1:com.android.tools.r8.shaking.ProguardIfRule$Builder builder():97:97 -> y
-com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.N.B1:
+com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.N.z1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):19:19 -> <init>
-com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.N.C1:
+com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.N.A1:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> q
     boolean $assertionsDisabled -> r
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>():38:38 -> <init>
     2:2:void <init>():35:35 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.N.E1:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.N.C1:
     boolean runtimeInvisibleAnnotations -> m
     boolean runtimeVisibleParameterAnnotations -> n
     boolean runtimeInvisibleParameterAnnotations -> o
@@ -60408,7 +60200,7 @@
     1:5:boolean equals(java.lang.Object):176:180 -> equals
     1:16:int hashCode():200:215 -> hashCode
     1:1:java.lang.String toString():298:298 -> toString
-com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.N.H1:
+com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.N.F1:
     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.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):50:50 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardKeepRule$Builder builder():59:59 -> a
     1:1:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):116 -> a
@@ -60443,13 +60235,13 @@
     44:51:void appendNonEmpty(java.lang.StringBuilder,java.lang.String,java.lang.Object,java.lang.String):102:109 -> a
     1:5:boolean equals(java.lang.Object):91:95 -> equals
     1:1:com.android.tools.r8.shaking.ProguardKeepRule$Builder builder():59:59 -> x
-com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.N.F1:
+com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.N.D1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):118:118 -> <init>
-com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.N.G1:
+com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.N.E1:
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:3:com.android.tools.r8.shaking.ProguardKeepRule build():28:30 -> c
-com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.N.J1:
+com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.N.H1:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers modifiers -> r
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> q
     1:5: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.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):58:62 -> <init>
@@ -60459,13 +60251,13 @@
     1:1:java.lang.String typeString():116:116 -> u
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers getModifiers():70:70 -> v
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleType getType():66:66 -> w
-com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.N.I1:
+com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.N.G1:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder modifiersBuilder -> p
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> o
     1:1:void <init>():21:21 -> <init>
     2:2:void <init>():18:18 -> <init>
     1:2:com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder setType(com.android.tools.r8.shaking.ProguardKeepRuleType):25:26 -> a
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.N.M1:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.N.K1:
     boolean allowsShrinking -> a
     boolean allowsOptimization -> b
     boolean allowsObfuscation -> c
@@ -60477,8 +60269,8 @@
     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
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> com.android.tools.r8.N.K1:
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.N.L1:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> com.android.tools.r8.N.I1:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.N.J1:
     boolean allowsShrinking -> a
     boolean allowsOptimization -> b
     boolean allowsObfuscation -> c
@@ -60491,7 +60283,7 @@
     1:1:void setAllowsOptimization(boolean):21:21 -> b
     1:1:void setAllowsShrinking(boolean):17:17 -> c
     1:1:void setIncludeDescriptorClasses(boolean):30:30 -> d
-com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.N.N1:
+com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.N.L1:
     com.android.tools.r8.shaking.ProguardKeepRuleType[] $VALUES -> e
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASS_MEMBERS -> b
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASSES_WITH_MEMBERS -> c
@@ -60502,7 +60294,7 @@
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleType[] values():8:8 -> a
     1:11:java.lang.String toString():16:26 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.N.Q1:
+com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.N.O1:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
     com.android.tools.r8.shaking.ProguardTypeMatcher type -> e
@@ -60619,10 +60411,10 @@
     52:52:java.lang.String toString():390 -> toString
     53:53:java.lang.String toString():390:390 -> toString
     54:88:java.lang.String toString():369:403 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.N.O1:
+com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.N.M1:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardMemberType -> a
     1:1:void <clinit>():174:174 -> <clinit>
-com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.N.P1:
+com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.N.N1:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
@@ -60648,7 +60440,7 @@
     1:1:com.android.tools.r8.shaking.ProguardAccessFlags getNegatedAccessFlags():51:51 -> c
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getTypeMatcher():64:64 -> d
     1:1:boolean isValid():87:87 -> e
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.N.S1:
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.N.Q1:
     com.android.tools.r8.utils.LongInterval longInterval -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type type -> a
@@ -60668,14 +60460,14 @@
     1:1:boolean isSingleValue():78:78 -> g
     1:1:boolean isValueRange():56:56 -> h
     1:17:java.lang.String toString():111:127 -> toString
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type -> com.android.tools.r8.N.R1:
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type -> com.android.tools.r8.N.P1:
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type BOOLEAN -> a
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type FIELD -> c
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type VALUE_RANGE -> b
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type NULL -> d
     1:4:void <clinit>():12:15 -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
-com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.N.T1:
+com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.N.R1:
     com.android.tools.r8.shaking.ProguardMemberType METHOD -> h
     com.android.tools.r8.shaking.ProguardMemberType CONSTRUCTOR -> g
     com.android.tools.r8.shaking.ProguardMemberType INIT -> f
@@ -60689,7 +60481,7 @@
     9:9:void <clinit>():6:6 -> <clinit>
     1:1:void <init>(java.lang.String,int):6:6 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardMemberType[] values():6:6 -> a
-com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.N.Y1:
+com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.N.W1:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.shaking.ProguardNameMatcher MATCH_ALL_NAMES -> a
     1:3:void <clinit>():14:16 -> <clinit>
@@ -60706,8 +60498,8 @@
     1:43:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):39:81 -> b
     44:66:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):56:78 -> b
     67:111:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):43:87 -> b
-com.android.tools.r8.shaking.ProguardNameMatcher$1 -> com.android.tools.r8.N.U1:
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.N.V1:
+com.android.tools.r8.shaking.ProguardNameMatcher$1 -> com.android.tools.r8.N.S1:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.N.T1:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> c
     1:1:void <init>():108:108 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardWildcard):111:112 -> <init>
@@ -60715,7 +60507,7 @@
     2:2:java.lang.Iterable getWildcards():123:123 -> a
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames materialize():128:128 -> b
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher materialize():104 -> b
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.N.W1:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.N.U1:
     java.util.List wildcards -> d
     java.lang.String pattern -> c
     1:3:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):142:144 -> <init>
@@ -60726,14 +60518,14 @@
     1:1:boolean equals(java.lang.Object):180:180 -> equals
     1:1:int hashCode():185:185 -> hashCode
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.N.X1:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.N.V1:
     java.lang.String name -> c
     1:2:void <init>(java.lang.String):193:194 -> <init>
     1:1:boolean matches(java.lang.String):199:199 -> a
     1:1:boolean equals(java.lang.Object):209:209 -> equals
     1:1:int hashCode():214:214 -> hashCode
     1:1:java.lang.String toString():204:204 -> toString
-com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.N.Z1:
+com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.N.X1:
     java.lang.String pattern -> a
     1:2:void <init>(java.lang.String):12:13 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexType):17:17 -> a
@@ -60745,7 +60537,7 @@
     57:86:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):44:73 -> a
     1:5:boolean equals(java.lang.Object):85:89 -> equals
     1:1:int hashCode():94:94 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.N.c2:
+com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.N.a2:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap packageNames -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardPackageNameList$1):12:12 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):39:40 -> <init>
@@ -60753,15 +60545,15 @@
     2:5:boolean matches(com.android.tools.r8.graph.DexType):60:63 -> a
     1:15:boolean equals(java.lang.Object):74:88 -> equals
     1:6:int hashCode():98:103 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList$1 -> com.android.tools.r8.N.a2:
-com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.N.b2:
+com.android.tools.r8.shaking.ProguardPackageNameList$1 -> com.android.tools.r8.N.Y1:
+com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.N.Z1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPackageNameList$1):18:18 -> <init>
     2:2:void <init>():24:24 -> <init>
     3:3:void <init>():21:21 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardPackageNameList$Builder addPackageName(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):28:28 -> a
     2:2:com.android.tools.r8.shaking.ProguardPackageNameList build():33:33 -> a
-com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.N.f2:
+com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.N.d2:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> b
     boolean $assertionsDisabled -> c
@@ -60771,8 +60563,8 @@
     1:1:boolean isEnabled():55:55 -> a
     2:4:boolean matches(java.lang.String):59:61 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder builder():14:14 -> b
-com.android.tools.r8.shaking.ProguardPathFilter$1 -> com.android.tools.r8.N.d2:
-com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.N.e2:
+com.android.tools.r8.shaking.ProguardPathFilter$1 -> com.android.tools.r8.N.b2:
+com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.N.c2:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> b
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathFilter$1):17:17 -> <init>
@@ -60782,13 +60574,13 @@
     2:2:com.android.tools.r8.shaking.ProguardPathFilter build():40:40 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder disable():30:30 -> b
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder enable():35:35 -> c
-com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.N.l2:
+com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.N.j2:
     1:1:void <init>():10:10 -> <init>
     boolean matches(java.lang.String) -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList emptyList():17:17 -> b
-com.android.tools.r8.shaking.ProguardPathList$1 -> com.android.tools.r8.N.g2:
-com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.N.h2:
+com.android.tools.r8.shaking.ProguardPathList$1 -> com.android.tools.r8.N.e2:
+com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.N.f2:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):22:22 -> <init>
     2:2:void <init>():26:26 -> <init>
@@ -60797,11 +60589,11 @@
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String):30 -> a
     2:2:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String,boolean):34:34 -> a
     3:7:com.android.tools.r8.shaking.ProguardPathList build():39:43 -> a
-com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.N.i2:
+com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.N.g2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):122:122 -> <init>
     2:2:void <init>():124:124 -> <init>
     boolean matches(java.lang.String) -> a
-com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.N.j2:
+com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.N.h2:
     boolean negated -> a
     java.lang.String pattern -> b
     1:3:void <init>(boolean,java.lang.String):52:54 -> <init>
@@ -60813,12 +60605,12 @@
     34:34:boolean containsSeparatorsStartingAt(java.lang.String,int):98:98 -> a
     34:34:boolean matchImpl(java.lang.String,int,java.lang.String,int):70 -> a
     35:56:boolean matchImpl(java.lang.String,int,java.lang.String,int):73:94 -> a
-com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.N.k2:
+com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.N.i2:
     java.util.List matchers -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardPathList$1):103:103 -> <init>
     2:3:void <init>(java.util.List):106:107 -> <init>
     1:4:boolean matches(java.lang.String):112:115 -> a
-com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.N.m2:
+com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.N.k2:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.lang.String message -> a
@@ -60828,7 +60620,7 @@
     1:1:java.lang.String getMessage():48:48 -> getMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():33:33 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
-com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.N.v2:
+com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.N.t2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher$1):23:23 -> <init>
     2:2:void <init>():31:31 -> <init>
     com.android.tools.r8.graph.DexType getSpecificType() -> a
@@ -60842,19 +60634,19 @@
     27:27:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):86:86 -> a
     28:28:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):84:84 -> a
     29:29:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):82:82 -> a
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     30:30:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):93 -> a
     31:34:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):93:96 -> a
     1:1:java.lang.Iterable getWildcards():55:55 -> b
     boolean hasSpecificType() -> c
     boolean isTripleDotPattern() -> d
-com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> com.android.tools.r8.N.n2:
-com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.N.o2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> com.android.tools.r8.N.l2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.N.m2:
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType CLASS -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType TYPE -> b
     1:2:void <clinit>():35:36 -> <clinit>
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.N.p2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.N.n2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ALL_TYPES -> b
     1:1:void <clinit>():128:128 -> <clinit>
@@ -60869,7 +60661,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$000():126:126 -> e
     1:1:boolean equals(java.lang.Object):163:163 -> equals
     1:1:int hashCode():168:168 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.N.q2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.N.o2:
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ANY_ARG_SEQUENCE -> a
     1:1:void <clinit>():174:174 -> <clinit>
     1:1:void <init>():172:172 -> <init>
@@ -60878,7 +60670,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$100():172:172 -> e
     1:1:boolean equals(java.lang.Object):193:193 -> equals
     1:1:int hashCode():198:198 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.N.r2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.N.p2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_BASIC_TYPES -> b
     1:1:void <clinit>():259:259 -> <clinit>
@@ -60893,7 +60685,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$400():257:257 -> e
     1:1:boolean equals(java.lang.Object):297:297 -> equals
     1:1:int hashCode():302:302 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.N.s2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.N.q2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> b
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_CLASS_TYPES -> c
     boolean $assertionsDisabled -> e
@@ -60916,7 +60708,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$300():202:202 -> f
     1:1:int hashCode():253:253 -> hashCode
     1:1:java.lang.String toString():243:243 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.N.t2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.N.r2:
     com.android.tools.r8.graph.DexType type -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardTypeMatcher$1):306:306 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):310:311 -> <init>
@@ -60926,7 +60718,7 @@
     1:2:boolean equals(java.lang.Object):326:327 -> equals
     1:1:int hashCode():334:334 -> hashCode
     1:1:java.lang.String toString():321:321 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.N.u2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.N.s2:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType kind -> c
@@ -60940,7 +60732,7 @@
     22:68:java.lang.String removeMaterializedBackReferencesFromPattern(java.lang.String,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):413:459 -> a
     22:68:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):394 -> a
     69:70:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):395:396 -> a
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     71:71:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):397 -> a
     72:82:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):398:408 -> a
     83:174:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):470:561 -> a
@@ -60955,17 +60747,17 @@
     1:3:boolean equals(java.lang.Object):589:591 -> equals
     1:1:int hashCode():598:598 -> hashCode
     1:1:java.lang.String toString():584:584 -> toString
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.N.y2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.N.w2:
     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.ProguardWhyAreYouKeepingRule$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):46:46 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder builder():52:52 -> v
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> com.android.tools.r8.N.w2:
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.N.x2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> com.android.tools.r8.N.u2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.N.v2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.N.B2:
+com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.N.z2:
     1:1:void <init>():8:8 -> <init>
     com.android.tools.r8.shaking.ProguardWildcard$BackReference asBackReference() -> a
     void setCaptured(java.lang.String) -> a
@@ -60974,7 +60766,7 @@
     boolean isBackReference() -> d
     boolean isPattern() -> e
     com.android.tools.r8.shaking.ProguardWildcard materialize() -> f
-com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.N.z2:
+com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.N.x2:
     int referenceIndex -> b
     com.android.tools.r8.shaking.ProguardWildcard$Pattern reference -> a
     1:2:void <init>(int):85:86 -> <init>
@@ -60989,7 +60781,7 @@
     6:6:com.android.tools.r8.shaking.ProguardWildcard materialize():80 -> f
     1:1:java.lang.String getCaptured():105:105 -> g
     1:1:java.lang.String toString():130:130 -> toString
-com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.N.A2:
+com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.N.y2:
     java.lang.String pattern -> a
     java.lang.String captured -> b
     1:1:void <init>(java.lang.String):35:35 -> <init>
@@ -61004,7 +60796,7 @@
     7:7:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():60 -> f
     1:1:java.lang.String getCaptured():51:51 -> g
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.N.E2:
+com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.N.C2:
     java.util.Set identifierNameStrings -> w
     java.util.Map dependentKeepClassCompatRule -> s
     com.android.tools.r8.graph.AppView appView -> a
@@ -61094,33 +60886,33 @@
     221:221:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):795 -> a
     222:222:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):797:797 -> a
     223:242:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):801:820 -> a
-    243:263: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):844:864 -> a
-    264:264:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
-    264:264: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):864 -> a
-    265:274: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):870:879 -> a
-    275:296: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):876:897 -> a
-    297:297:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    297:297: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):897 -> a
-    298:322: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):897:921 -> a
-    323:333:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):824:834 -> a
-    323:333: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):922 -> a
-    334:364: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):923:953 -> a
-    365:365: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):947:947 -> a
-    366:384: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):944:962 -> a
-    385:399: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):959:973 -> a
-    400:413: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):971:984 -> a
-    414:458: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):982:1026 -> a
-    459:460:java.lang.Iterable com.android.tools.r8.shaking.AppInfoWithLiveness.getPinnedItems():846:847 -> a
-    459:460:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):517 -> a
-    461:472:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):517:528 -> a
-    473:473:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    473:473:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):530 -> a
-    474:474:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):530:530 -> a
-    475:500:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):525:550 -> a
-    501:501:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    501:501:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):550 -> a
-    502:502:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):550:550 -> a
-    503:518:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):549:564 -> a
+    243:244:java.lang.Iterable com.android.tools.r8.shaking.AppInfoWithLiveness.getPinnedItems():824:825 -> a
+    243:244:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):517 -> a
+    245:256:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):517:528 -> a
+    257:257:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    257:257:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):530 -> a
+    258:258:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):530:530 -> a
+    259:284:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):525:550 -> a
+    285:285:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    285:285:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):550 -> a
+    286:286:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):550:550 -> a
+    287:302:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):549:564 -> a
+    303:323: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):844:864 -> a
+    324:324:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    324:324: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):864 -> a
+    325:334: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):870:879 -> a
+    335:356: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):876:897 -> a
+    357:357:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    357:357: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):897 -> a
+    358:382: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):897:921 -> a
+    383:393:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):824:834 -> a
+    383:393: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):922 -> a
+    394:424: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):923:953 -> a
+    425:425: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):947:947 -> a
+    426:444: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):944:962 -> a
+    445:459: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):959:973 -> a
+    460:473: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):971:984 -> a
+    474:518: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):982:1026 -> a
     519:519:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexType):897:897 -> a
     520:520:java.util.Map lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):905:905 -> a
     1:1:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):160:160 -> b
@@ -61164,7 +60956,7 @@
     com.android.tools.r8.graph.DexReference lambda$addItemToSets$19(com.android.tools.r8.graph.DexReference) -> e
     1:1:java.util.Map lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):816:816 -> f
     1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):817:817 -> g
-com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.N.C2:
+com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.N.A2:
     int[] $SwitchMap$com$android$tools$r8$shaking$InlineRule$Type -> b
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassMergingRule$Type -> d
@@ -61175,7 +60967,7 @@
     3:3:void <clinit>():964:964 -> <clinit>
     4:4:void <clinit>():942:942 -> <clinit>
     5:5:void <clinit>():139:139 -> <clinit>
-com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.N.D2:
+com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.N.B2:
     java.util.Map noShrinking -> c
     java.util.Set noOptimization -> d
     java.util.Set noObfuscation -> e
@@ -61185,7 +60977,7 @@
     java.util.Map dependentKeepClassCompatRule -> g
     1:1:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.shaking.RootSetBuilder$1):1410:1410 -> <init>
     2:9:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map):1426:1433 -> <init>
-com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.N.E2$a:
+com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.N.C2$a:
     java.util.Map assumedValues -> q
     java.util.Map dependentNoShrinking -> r
     java.util.Map dependentKeepClassCompatRule -> s
@@ -61272,7 +61064,7 @@
     2:6:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1279:1283 -> c
     7:7:java.util.Set lambda$verifyKeptItemsAreKept$6(com.android.tools.r8.graph.DexType):1323:1323 -> c
     1:21:java.lang.String toString():1385:1405 -> toString
-com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.N.G2:
+com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.N.E2:
     java.util.Map items -> b
     com.android.tools.r8.com.google.common.base.Equivalence METHOD_EQUIVALENCE -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet parent -> a
@@ -61290,13 +61082,13 @@
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet newNestedScope():36:36 -> b
     2:11:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):58:67 -> b
     12:19:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):64:71 -> b
-com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult -> com.android.tools.r8.N.F2:
+com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult -> com.android.tools.r8.N.D2:
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult ADDED_NOT_EXISTING -> b
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult ADDED_MORE_VISIBLE -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult NOT_ADDED -> a
     1:3:void <clinit>():17:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.N.K2:
+com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.N.I2:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
     com.android.tools.r8.com.google.common.base.Equivalence fieldEquivalence -> c
@@ -61307,72 +61099,74 @@
     com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> b
     java.util.Map representatives -> e
     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:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):210:210 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):200:219 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Equivalence access$000(com.android.tools.r8.shaking.StaticClassMerger):59:59 -> a
-    2:13:com.android.tools.r8.graph.GraphLense run():229:240 -> a
-    14:14:com.android.tools.r8.graph.GraphLense run():236:236 -> a
-    15:27:com.android.tools.r8.graph.GraphLense buildGraphLense():246:258 -> a
-    15:27:com.android.tools.r8.graph.GraphLense run():242 -> a
-    28:37:com.android.tools.r8.graph.GraphLense buildGraphLense():247:256 -> a
-    28:37:com.android.tools.r8.graph.GraphLense run():242 -> a
-    38:38:boolean isValidRepresentative(com.android.tools.r8.graph.DexProgramClass):324:324 -> a
-    39:46:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):328:335 -> a
-    47:48:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key com.android.tools.r8.shaking.StaticClassMerger$MergeGroup.key(java.lang.String):126:127 -> a
-    47:48:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):335 -> a
-    49:83:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):339:373 -> a
-    49:83:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):331 -> a
-    84:84:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key com.android.tools.r8.shaking.StaticClassMerger$MergeGroup.key(java.lang.String):126:126 -> a
-    84:84:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):335 -> a
-    85:93:com.android.tools.r8.shaking.StaticClassMerger$Representative getOrCreateRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.graph.DexProgramClass):379:387 -> a
-    94:101:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):391:398 -> a
-    102:113:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):394:405 -> a
-    114:122:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):400:408 -> a
-    123:123:boolean lambda$mayMergeAcrossPackageBoundaries$2(com.android.tools.r8.graph.DexEncodedMethod):431:431 -> a
-    124:124:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedField):435:435 -> a
-    125:130:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):459:464 -> a
-    131:147:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):460:476 -> a
-    148:151:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):475:478 -> a
-    152:155:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):477:480 -> a
-    156:162:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):479:485 -> a
-    163:163:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeMethods$5(com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexEncodedMethod):496:496 -> a
-    164:164:boolean lambda$mergeMethods$6(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):500:500 -> a
-    165:183:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):521:539 -> a
-    184:190:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):579:585 -> a
-    184:190:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):541 -> a
-    191:191:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    191:191:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):585 -> a
-    191:191:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):541 -> a
-    192:198:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):585:591 -> a
-    192:198:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):541 -> a
-    199:208:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):542:551 -> a
-    209:209:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeFields$7(com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexEncodedField):533:533 -> a
-    210:210:boolean lambda$mergeFields$8(java.util.Set,com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexField):537:537 -> a
+    2:13:com.android.tools.r8.graph.GraphLense run():223:234 -> a
+    14:14:com.android.tools.r8.graph.GraphLense run():230:230 -> a
+    15:27:com.android.tools.r8.graph.GraphLense buildGraphLense():240:252 -> a
+    15:27:com.android.tools.r8.graph.GraphLense run():236 -> a
+    28:37:com.android.tools.r8.graph.GraphLense buildGraphLense():241:250 -> a
+    28:37:com.android.tools.r8.graph.GraphLense run():236 -> a
+    38:38:boolean isValidRepresentative(com.android.tools.r8.graph.DexProgramClass):318:318 -> a
+    39:43:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):322:326 -> a
+    44:73:boolean mergeGlobally(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):332:361 -> a
+    44:73:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):327 -> a
+    74:81:boolean mergeInsidePackage(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):368:375 -> a
+    74:81:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):328 -> a
+    82:113:boolean mergeInsidePackage(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):372:403 -> a
+    82:113:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):328 -> a
+    114:122:com.android.tools.r8.shaking.StaticClassMerger$Representative getOrCreateRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.graph.DexProgramClass):409:417 -> a
+    123:130:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):421:428 -> a
+    131:142:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):424:435 -> a
+    143:151:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):430:438 -> a
+    152:157:void clearRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):442:447 -> a
+    158:162:void clearRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):446:450 -> a
+    163:163:boolean lambda$mayMergeAcrossPackageBoundaries$2(com.android.tools.r8.graph.DexEncodedMethod):461:461 -> a
+    164:164:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedField):465:465 -> a
+    165:170:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):489:494 -> a
+    171:187:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):490:506 -> a
+    188:191:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505:508 -> a
+    192:195:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):507:510 -> a
+    196:202:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):509:515 -> a
+    203:203:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeMethods$5(com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexEncodedMethod):526:526 -> a
+    204:204:boolean lambda$mergeMethods$6(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):530:530 -> a
+    205:223:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):551:569 -> a
+    224:230:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):609:615 -> a
+    224:230:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):571 -> a
+    231:231:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    231:231:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):615 -> a
+    231:231:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):571 -> a
+    232:238:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):615:621 -> a
+    232:238:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):571 -> a
+    239:248:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):572:581 -> a
+    249:249:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeFields$7(com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexEncodedField):563:563 -> a
+    250:250:boolean lambda$mergeFields$8(java.util.Set,com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexField):567:567 -> a
     1:1:com.android.tools.r8.com.google.common.base.Equivalence access$100(com.android.tools.r8.shaking.StaticClassMerger):59:59 -> b
-    2:2:boolean lambda$satisfiesMergeCriteria$0(com.android.tools.r8.graph.DexEncodedField):278:278 -> b
-    3:23:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):426:446 -> b
+    2:2:boolean lambda$satisfiesMergeCriteria$0(com.android.tools.r8.graph.DexEncodedField):272:272 -> b
+    3:23:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):456:476 -> b
     24:24:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> b
-    24:24:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):447 -> b
-    25:28:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):447:450 -> b
-    29:29:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedMethod):443:443 -> b
-    30:40:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):493:503 -> b
-    41:48:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):559:566 -> b
-    41:48:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):505 -> b
+    24:24:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):477 -> b
+    25:28:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):477:480 -> b
+    29:29:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedMethod):473:473 -> b
+    30:40:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):523:533 -> b
+    41:48:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):589:596 -> b
+    41:48:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):535 -> b
     49:49:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> b
-    49:49:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):566 -> b
-    49:49:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):505 -> b
-    50:56:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):566:572 -> b
-    50:56:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):505 -> b
-    57:63:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):506:512 -> b
-    1:28:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):262:289 -> c
+    49:49:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):596 -> b
+    49:49:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):535 -> b
+    50:56:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):596:602 -> b
+    50:56:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):535 -> b
+    57:63:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):536:542 -> b
+    1:28:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):256:283 -> c
     29:29:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
-    29:29:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):291 -> c
-    30:41:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):291:302 -> c
+    29:29:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):285 -> c
+    30:41:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):285:296 -> c
     42:42:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> c
-    42:42:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):302 -> c
-    43:53:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):309:319 -> c
-    54:59:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):294:299 -> c
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.N.I2:
+    42:42:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):296 -> c
+    43:53:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):303:313 -> c
+    54:59:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):288:293 -> c
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.N.G2:
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup DONT_MERGE -> d
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key mainDexDependenciesGlobalKey -> f
@@ -61388,107 +61182,107 @@
     1:9:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():113:121 -> a
     10:10:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():119:119 -> a
     11:11:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():117:117 -> a
+    12:13:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key key(java.lang.String):126:127 -> a
     1:9:java.lang.String toString():132:140 -> toString
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key -> com.android.tools.r8.N.H2:
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key -> com.android.tools.r8.N.F2:
     java.lang.String packageOrGlobal -> b
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup mergeGroup -> a
     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 -> a
-    2:2:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup():83:83 -> a
+    1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup():83:83 -> a
     1:1:java.lang.String getPackageOrGlobal():87:87 -> b
     1:1:boolean isGlobal():91:91 -> c
     1:5:boolean equals(java.lang.Object):104:108 -> equals
     1:1:int hashCode():96:96 -> hashCode
-com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.N.J2:
+com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.N.H2:
+    com.android.tools.r8.shaking.StaticClassMerger this$0 -> d
     com.android.tools.r8.graph.DexProgramClass clazz -> a
-    com.android.tools.r8.shaking.StaticClassMerger this$0 -> e
-    boolean $assertionsDisabled -> f
     com.android.tools.r8.com.google.common.collect.HashMultiset methodBuckets -> c
     com.android.tools.r8.com.google.common.collect.HashMultiset fieldBuckets -> b
-    boolean hasSynchronizedMethods -> d
-    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:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):160:160 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):157:162 -> <init>
     1:1:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    1:1:void include(com.android.tools.r8.graph.DexProgramClass):169 -> a
-    2:4:void include(com.android.tools.r8.graph.DexProgramClass):169:171 -> a
+    1:1:void include(com.android.tools.r8.graph.DexProgramClass):167 -> a
+    2:4:void include(com.android.tools.r8.graph.DexProgramClass):167:169 -> a
     5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    5:5:void include(com.android.tools.r8.graph.DexProgramClass):174 -> a
-    6:12:void include(com.android.tools.r8.graph.DexProgramClass):174:180 -> a
-    13:13:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    13:13:void include(com.android.tools.r8.graph.DexProgramClass):169 -> a
-    14:14:boolean access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):151:151 -> a
-    15:19:boolean isFull():189:193 -> a
-    1:1:com.android.tools.r8.graph.DexProgramClass access$300(com.android.tools.r8.shaking.StaticClassMerger$Representative):151:151 -> b
-com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.N.L2:
+    5:5:void include(com.android.tools.r8.graph.DexProgramClass):171 -> a
+    6:8:void include(com.android.tools.r8.graph.DexProgramClass):171:173 -> a
+    9:9:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
+    9:9:void include(com.android.tools.r8.graph.DexProgramClass):167 -> a
+    10:10:com.android.tools.r8.graph.DexProgramClass access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):151:151 -> a
+    11:15:boolean isFull():183:187 -> a
+com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.N.J2:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set prunedTypes -> d
     java.util.Set methodsToKeepForConfigurationDebugging -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.shaking.UsagePrinter usagePrinter -> c
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):41:41 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):38:51 -> <init>
-    1:1:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):49:49 -> a
-    2:3:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66:67 -> a
-    4:27:java.util.List getNewProgramClasses(java.util.List):71:94 -> a
-    4:27:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):67 -> a
-    28:47:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):113:132 -> a
-    28:47:java.util.List getNewProgramClasses(java.util.List):97 -> a
-    28:47:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):67 -> a
-    48:55:java.util.List getNewProgramClasses(java.util.List):98:105 -> a
-    48:55:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):67 -> a
-    56:56:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):67:67 -> a
-    57:76:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):150:169 -> a
-    77:84:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):175:182 -> a
-    77:84:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):170 -> a
-    85:101:void claimNestOwnership(com.android.tools.r8.graph.DexClass):203:219 -> a
-    85:101:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):183 -> a
-    85:101:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):170 -> a
-    102:102:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):171:171 -> a
-    103:103:boolean isTypeLive(com.android.tools.r8.graph.DexType):189:189 -> a
-    104:104:boolean isTypeLive(com.android.tools.r8.graph.DexType):189:189 -> a
-    104:104:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):137 -> a
-    105:111:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):138:144 -> a
-    112:113:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):195:196 -> a
-    114:115:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):198:199 -> a
-    116:119:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):225:228 -> a
-    120:124:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):232:236 -> a
-    125:125:boolean isTypeLive(com.android.tools.r8.graph.DexType):189:189 -> a
-    125:125:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):237 -> a
-    126:127:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):242:243 -> a
-    128:142:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):251:265 -> a
-    143:143:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
-    143:143:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):265 -> a
-    144:151:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):265:272 -> a
-    152:157:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):269:274 -> a
-    158:158:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
-    158:158:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):274 -> a
-    159:181:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):274:296 -> a
-    182:182:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    182:182:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> a
-    182:182:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):296 -> a
-    183:184:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> a
-    183:184:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):296 -> a
-    185:196:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):295:306 -> a
-    197:197:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):254:254 -> a
-    198:227:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):310:339 -> a
-    228:228:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):312:312 -> a
-    229:229:java.util.Collection getMethodsToKeepForConfigurationDebugging():347:347 -> a
-    1:1:java.util.Collection getRemovedClasses():343:343 -> b
-    1:6:com.android.tools.r8.graph.DexApplication run():55:60 -> c
-com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.N.O2:
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):40:40 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):37:50 -> <init>
+    1:1:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):48:48 -> a
+    2:3:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):65:66 -> a
+    4:27:java.util.List getNewProgramClasses(java.util.List):70:93 -> a
+    4:27:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66 -> a
+    28:35:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):112:119 -> a
+    28:35:java.util.List getNewProgramClasses(java.util.List):96 -> a
+    28:35:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66 -> a
+    36:36:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    36:36:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):119 -> a
+    36:36:java.util.List getNewProgramClasses(java.util.List):96 -> a
+    36:36:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66 -> a
+    37:49:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):124:136 -> a
+    37:49:java.util.List getNewProgramClasses(java.util.List):96 -> a
+    37:49:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66 -> a
+    50:57:java.util.List getNewProgramClasses(java.util.List):97:104 -> a
+    50:57:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66 -> a
+    58:58:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66:66 -> a
+    59:78:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):140:159 -> a
+    79:86:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):165:172 -> a
+    79:86:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):160 -> a
+    87:103:void claimNestOwnership(com.android.tools.r8.graph.DexClass):193:209 -> a
+    87:103:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):173 -> a
+    87:103:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):160 -> a
+    104:104:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):161:161 -> a
+    105:105:boolean isTypeLive(com.android.tools.r8.graph.DexType):179:179 -> a
+    106:107:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):185:186 -> a
+    108:109:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):188:189 -> a
+    110:113:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):215:218 -> a
+    114:118:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):222:226 -> a
+    119:119:boolean isTypeLive(com.android.tools.r8.graph.DexType):179:179 -> a
+    119:119:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):227 -> a
+    120:121:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):232:233 -> a
+    122:136:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):241:255 -> a
+    137:137:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
+    137:137:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255 -> a
+    138:145:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255:262 -> a
+    146:151:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):259:264 -> a
+    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
+    152:152:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264 -> a
+    153:175:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264:286 -> a
+    176:176:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    176:176:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> a
+    176:176:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> a
+    177:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> a
+    177:178:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> a
+    179:190:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):285:296 -> a
+    191:191:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):244:244 -> a
+    192:221:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):300:329 -> a
+    222:222:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):302:302 -> a
+    223:223:java.util.Collection getMethodsToKeepForConfigurationDebugging():337:337 -> a
+    1:1:java.util.Collection getRemovedClasses():333:333 -> b
+    1:6:com.android.tools.r8.graph.DexApplication run():54:59 -> c
+com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.N.M2:
     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>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.UnusedArgumentRule$Builder builder():74:74 -> v
-com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.N.M2:
-com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.N.N2:
+com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.N.K2:
+com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.N.L2:
     1:1:void <init>(com.android.tools.r8.shaking.UnusedArgumentRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.UsagePrinter -> com.android.tools.r8.N.Q2:
+com.android.tools.r8.shaking.UsagePrinter -> com.android.tools.r8.N.O2:
     com.android.tools.r8.graph.DexProgramClass enclosingClazz -> b
     java.util.function.Consumer consumer -> a
     boolean $assertionsDisabled -> e
@@ -61569,14 +61363,14 @@
     10:10:void append(java.lang.String):26:26 -> b
     10:10:void printClazzPrefixIfNecessary():51 -> b
     11:11:void printClazzPrefixIfNecessary():52:52 -> b
-com.android.tools.r8.shaking.UsagePrinter$NoOpUsagePrinter -> com.android.tools.r8.N.P2:
+com.android.tools.r8.shaking.UsagePrinter$NoOpUsagePrinter -> com.android.tools.r8.N.N2:
     1:1:void <init>():96:96 -> <init>
     void printUnusedClass(com.android.tools.r8.graph.DexProgramClass) -> a
     void printUnusedField(com.android.tools.r8.graph.DexEncodedField) -> a
     void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void visited() -> a
     void visiting(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.N.b3:
+com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.N.Z2:
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> b
     boolean $assertionsDisabled -> p
     com.android.tools.r8.graph.AppView appView -> c
@@ -61593,160 +61387,148 @@
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder renamedMembersLense -> m
     java.util.List synthesizedBridges -> n
     java.util.Set pinnedTypes -> l
-    1:1:void <clinit>():89:89 -> <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):258:258 -> <init>
-    2:41:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):231:270 -> <init>
-    1:1:java.util.Set access$100(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> a
-    2:2:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses getMergedClasses():274:274 -> a
-    3:5:void initializeMergeCandidates(java.lang.Iterable):278:280 -> a
-    6:23:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):333:350 -> a
-    24:25:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):357:358 -> a
-    26:27:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):813:814 -> a
-    26:27:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):358 -> a
-    28:34:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):364:370 -> a
-    35:43:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):379:387 -> a
-    44:44:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    44:44:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387 -> a
-    45:45:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    45:45:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387 -> a
-    46:46:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    46:46:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387 -> a
-    47:49:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387:389 -> a
-    50:70:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387:407 -> a
-    71:72:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):813:814 -> a
-    71:72:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):408 -> a
-    73:78:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):409:414 -> a
-    79:79:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isSerializable(com.android.tools.r8.graph.DexType):604:604 -> a
-    79:79:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):414 -> a
-    80:92:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):414:426 -> a
-    93:109:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1679:1695 -> a
-    93:109:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):427 -> a
-    110:118:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1694:1702 -> a
-    110:118:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):427 -> a
-    119:138:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):430:449 -> a
-    139:140:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):439:440 -> a
-    141:157:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):460:476 -> a
-    158:158:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
-    158:158:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):476 -> a
-    159:160:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):483:484 -> a
-    161:161:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLockCandidate(com.android.tools.r8.graph.DexType):611:611 -> a
-    161:161:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):484 -> a
-    162:164:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):484:486 -> a
-    165:165:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLockCandidate(com.android.tools.r8.graph.DexType):611:611 -> a
-    165:165:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):486 -> a
-    166:173:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):487:494 -> a
-    174:190:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):525:541 -> a
-    174:190:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    191:191:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    191:191:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):544 -> a
-    191:191:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    192:193:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):544:545 -> a
-    192:193:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    194:194:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    194:194:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):549 -> a
-    194:194:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    195:204:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):549:558 -> a
-    195:204:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    205:205:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    205:205:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):559 -> a
-    205:205:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    206:209:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):559:562 -> a
-    206:209:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    210:211:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):502:503 -> a
-    212:257:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):753:798 -> a
-    212:257:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):507 -> a
-    258:259:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):508:509 -> a
-    260:277:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):887:904 -> a
-    260:277:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):515 -> a
-    278:279:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):516:517 -> a
-    280:281:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):496:497 -> a
-    282:283:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):478:479 -> a
-    284:284:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):475:475 -> a
-    285:315:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):690:720 -> a
-    316:316:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    316:316:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):721 -> a
-    317:342:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):721:746 -> a
-    343:343:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    343:343:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):721 -> a
-    344:347:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1461:1464 -> a
-    344:347:void access$1200(com.android.tools.r8.graph.DexEncodedMethod):89 -> a
-    1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> b
-    2:9:void initializePinnedTypes(java.lang.Iterable):290:297 -> b
+    1:1:void <clinit>():88:88 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):249:249 -> <init>
+    2:41:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):222:261 -> <init>
+    1:1:java.util.Set access$100(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> a
+    2:2:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses getMergedClasses():265:265 -> a
+    3:5:void initializeMergeCandidates(java.lang.Iterable):269:271 -> a
+    6:23:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):324:341 -> a
+    24:25:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):348:349 -> a
+    26:27:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
+    26:27:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):349 -> a
+    28:34:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):355:361 -> a
+    35:58:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):370:393 -> a
+    59:60:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
+    59:60:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):394 -> a
+    61:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):395:400 -> a
+    67:67:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isSerializable(com.android.tools.r8.graph.DexType):602:602 -> a
+    67:67:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):400 -> a
+    68:68:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):400:400 -> a
+    69:69:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
+    69:69:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):409 -> a
+    70:71:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):409:410 -> a
+    72:72:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    72:72:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):414 -> a
+    73:77:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):414:418 -> a
+    78:87:boolean disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1655:1664 -> a
+    78:87:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):418 -> a
+    88:106:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):420:438 -> a
+    107:108:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):428:429 -> a
+    109:125:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):449:465 -> a
+    126:126:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    126:126:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):465 -> a
+    127:127:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):472:472 -> a
+    128:144:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):503:519 -> a
+    128:144:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    145:145:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
+    145:145:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):522 -> a
+    145:145:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    146:147:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):522:523 -> a
+    146:147:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    148:148:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    148:148:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):527 -> a
+    148:148:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    149:158:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):527:536 -> a
+    149:158:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    159:159:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    159:159:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):537 -> a
+    159:159:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    160:163:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):537:540 -> a
+    160:163:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    164:165:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):480:481 -> a
+    166:211:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):731:776 -> a
+    166:211:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):485 -> a
+    212:213:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):486:487 -> a
+    214:231:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):865:882 -> a
+    214:231:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):493 -> a
+    232:233:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):494:495 -> a
+    234:235:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):474:475 -> a
+    236:237:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):467:468 -> a
+    238:238:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):464:464 -> a
+    239:269:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):668:698 -> a
+    270:270:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    270:270:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):699 -> a
+    271:296:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):699:724 -> a
+    297:297:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    297:297:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):699 -> a
+    298:301:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1439:1442 -> a
+    298:301:void access$1200(com.android.tools.r8.graph.DexEncodedMethod):88 -> a
+    1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> b
+    2:9:void initializePinnedTypes(java.lang.Iterable):281:288 -> b
     10:10:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> b
-    10:10:void initializePinnedTypes(java.lang.Iterable):298 -> b
-    11:13:void initializePinnedTypes(java.lang.Iterable):298:300 -> b
+    10:10:void initializePinnedTypes(java.lang.Iterable):289 -> b
+    11:13:void initializePinnedTypes(java.lang.Iterable):289:291 -> b
     14:14:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> b
-    14:14:void initializePinnedTypes(java.lang.Iterable):298 -> b
-    15:24:void initializePinnedTypes(java.lang.Iterable):319:328 -> b
-    25:40:com.android.tools.r8.graph.GraphLense run():669:684 -> b
-    41:46:com.android.tools.r8.graph.GraphLense run():680:685 -> b
-    47:109:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):810:872 -> b
+    14:14:void initializePinnedTypes(java.lang.Iterable):289 -> b
+    15:24:void initializePinnedTypes(java.lang.Iterable):310:319 -> b
+    25:40:com.android.tools.r8.graph.GraphLense run():647:662 -> b
+    41:46:com.android.tools.r8.graph.GraphLense run():658:663 -> b
+    47:109:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):788:850 -> b
     110:110:java.lang.String com.android.tools.r8.graph.DexProgramClass.toSourceString():214:214 -> b
-    110:110:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):874 -> b
-    111:111:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):874:874 -> b
+    110:110:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):852 -> b
+    111:111:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):852:852 -> b
     112:112:java.lang.String com.android.tools.r8.graph.DexProgramClass.toSourceString():214:214 -> b
-    112:112:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):875 -> b
-    113:113:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):875:875 -> b
-    114:121:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):871:878 -> b
+    112:112:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):853 -> b
+    113:113:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):853:853 -> b
+    114:121:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):849:856 -> b
     122:122:java.lang.String com.android.tools.r8.graph.DexProgramClass.toSourceString():214:214 -> b
-    122:122:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):880 -> b
-    123:123:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):880:880 -> b
+    122:122:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):858 -> b
+    123:123:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):858:858 -> b
     124:124:java.lang.String com.android.tools.r8.graph.DexProgramClass.toSourceString():214:214 -> b
-    124:124:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):881 -> b
-    125:125:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):881:881 -> b
-    126:126:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):877:877 -> b
-    127:127:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):862:862 -> b
-    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1100(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> c
-    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1300(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> d
-    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> e
-    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> f
-    1:1:com.android.tools.r8.graph.DexApplication access$1600(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> g
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1700(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> h
-    1:1:java.util.List access$1800(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> i
-    1:4:java.util.Collection getInvokes():571:574 -> j
-    1:4:java.util.Collection access$1900(com.android.tools.r8.shaking.VerticalClassMerger):89 -> j
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> k
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> l
-    1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> m
-com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.N.R2:
+    124:124:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):859 -> b
+    125:125:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):859:859 -> b
+    126:126:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):855:855 -> b
+    127:127:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):840:840 -> b
+    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1100(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> c
+    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1300(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> d
+    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> e
+    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> f
+    1:1:com.android.tools.r8.graph.DexApplication access$1600(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> g
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1700(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> h
+    1:1:java.util.List access$1800(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> i
+    1:4:java.util.Collection getInvokes():549:552 -> j
+    1:4:java.util.Collection access$1900(com.android.tools.r8.shaking.VerticalClassMerger):88 -> j
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> k
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> l
+    1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> m
+com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.N.P2:
     int[] $SwitchMap$com$android$tools$r8$shaking$VerticalClassMerger$Rename -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$Invoke$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$VerticalClassMerger$AbortReason -> a
-    1:1:void <clinit>():1984:1984 -> <clinit>
-    2:2:void <clinit>():1401:1401 -> <clinit>
-    3:3:void <clinit>():155:155 -> <clinit>
-com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.N.S2:
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NO_SIDE_EFFECTS -> h
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NATIVE_METHOD -> g
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason MERGE_ACROSS_NESTS -> f
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason MAIN_DEX_ROOT_OUTSIDE_REFERENCE -> e
+    1:1:void <clinit>():1950:1950 -> <clinit>
+    2:2:void <clinit>():1379:1379 -> <clinit>
+    3:3:void <clinit>():152:152 -> <clinit>
+com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.N.Q2:
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason PINNED_SOURCE -> h
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NO_SIDE_EFFECTS -> g
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NATIVE_METHOD -> f
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason MERGE_ACROSS_NESTS -> e
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason ILLEGAL_ACCESS -> d
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason CONFLICT -> c
+    boolean $assertionsDisabled -> r
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason ALWAYS_INLINE -> b
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason ALREADY_MERGED -> a
-    boolean $assertionsDisabled -> t
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNHANDLED_INVOKE_SUPER -> p
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNHANDLED_INVOKE_DIRECT -> o
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason STATIC_INITIALIZERS -> n
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] $VALUES -> s
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason SOURCE_AND_TARGET_LOCK_CANDIDATES -> m
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason SERVICE_LOADER -> l
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason RESOLUTION_FOR_METHODS_MAY_CHANGE -> k
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason RESOLUTION_FOR_FIELDS_MAY_CHANGE -> j
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason PINNED_SOURCE -> i
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNSUPPORTED_ATTRIBUTES -> r
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNSAFE_INLINING -> q
-    1:19:void <clinit>():129:147 -> <clinit>
-    20:20:void <clinit>():129:129 -> <clinit>
-    1:1:void <init>(java.lang.String,int):129:129 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():129:129 -> a
-    2:2:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):150:150 -> a
-    3:61:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):155:213 -> a
-    3:61:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):150 -> a
-    62:62:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):150:150 -> a
-    63:63:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):211:211 -> a
-    63:63:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):150 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.N.T2:
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNSUPPORTED_ATTRIBUTES -> p
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNSAFE_INLINING -> o
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNHANDLED_INVOKE_SUPER -> n
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNHANDLED_INVOKE_DIRECT -> m
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason STATIC_INITIALIZERS -> l
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason SERVICE_LOADER -> k
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason RESOLUTION_FOR_METHODS_MAY_CHANGE -> j
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason RESOLUTION_FOR_FIELDS_MAY_CHANGE -> i
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] $VALUES -> q
+    1:17:void <clinit>():128:144 -> <clinit>
+    18:18:void <clinit>():128:128 -> <clinit>
+    1:1:void <init>(java.lang.String,int):128:128 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():128:128 -> a
+    2:2:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):147:147 -> a
+    3:55:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):152:204 -> a
+    3:55:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):147 -> a
+    56:56:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):147:147 -> a
+    57:57:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):202:202 -> a
+    57:57:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):147 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.N.R2:
     com.android.tools.r8.graph.DexClass source -> a
     com.android.tools.r8.graph.DexClass target -> b
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder deferredRenamings -> c
@@ -61754,153 +61536,126 @@
     boolean abortMerge -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> f
-    1:1:void <clinit>():915:915 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):915:915 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):927:927 -> <init>
-    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):921:929 -> <init>
-    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):944:947 -> a
-    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1021:1023 -> a
-    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1022:1022 -> a
-    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1084:1084 -> a
-    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1128:1128 -> a
-    11:22:boolean restoreDebuggingState(java.util.stream.Stream):1134:1145 -> a
+    1:1:void <clinit>():893:893 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):893:893 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):905:905 -> <init>
+    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):899:907 -> <init>
+    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):922:925 -> a
+    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):999:1001 -> a
+    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1000:1000 -> a
+    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1062:1062 -> a
+    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1106:1106 -> a
+    11:22:boolean restoreDebuggingState(java.util.stream.Stream):1112:1123 -> a
     23:23:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    23:23:boolean restoreDebuggingState(java.util.stream.Stream):1145 -> a
-    24:24:boolean restoreDebuggingState(java.util.stream.Stream):1145:1145 -> a
+    23:23:boolean restoreDebuggingState(java.util.stream.Stream):1123 -> a
+    24:24:boolean restoreDebuggingState(java.util.stream.Stream):1123:1123 -> a
     25:25:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    25:25:boolean restoreDebuggingState(java.util.stream.Stream):1145 -> a
-    26:27:boolean restoreDebuggingState(java.util.stream.Stream):1145:1146 -> a
-    28:28:boolean restoreDebuggingState(java.util.stream.Stream):1145:1145 -> a
+    25:25:boolean restoreDebuggingState(java.util.stream.Stream):1123 -> a
+    26:27:boolean restoreDebuggingState(java.util.stream.Stream):1123:1124 -> a
+    28:28:boolean restoreDebuggingState(java.util.stream.Stream):1123:1123 -> a
     29:29:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    29:29:boolean restoreDebuggingState(java.util.stream.Stream):1145 -> a
-    30:31:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1136:1137 -> a
-    32:32:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1151:1151 -> a
-    33:36:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1331:1334 -> a
-    37:42:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1432:1437 -> a
-    37:42:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1335 -> a
-    43:43:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    43:43:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1440 -> a
-    43:43:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1335 -> a
-    44:51:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1440:1447 -> a
-    44:51:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1335 -> a
-    52:53:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1336:1337 -> a
-    54:54:void com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):312:312 -> a
-    54:54:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1337 -> a
-    55:60:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1338:1343 -> a
-    61:65:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1352:1356 -> a
-    66:66:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1386:1386 -> a
-    67:95: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):1396:1424 -> a
-    96:97: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):1403:1404 -> a
-    98:98:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    98:98: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):1412 -> a
-    99:114: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):1412:1427 -> a
-    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1141:1142 -> b
-    3:3:java.util.List getSynthesizedBridges():1155:1155 -> b
-    1:2:boolean merge():936:937 -> c
+    29:29:boolean restoreDebuggingState(java.util.stream.Stream):1123 -> a
+    30:30:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    30:30:boolean restoreDebuggingState(java.util.stream.Stream):1123 -> a
+    31:32:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1114:1115 -> a
+    33:33:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1129:1129 -> a
+    34:34:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287:1287 -> a
+    35:35:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
+    35:35:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> a
+    35:35:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287 -> a
+    36:36:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287:1287 -> a
+    37:40:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1309:1312 -> a
+    41:46:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1410:1415 -> a
+    41:46:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1313 -> a
+    47:47:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    47:47:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1418 -> a
+    47:47:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1313 -> a
+    48:55:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1418:1425 -> a
+    48:55:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1313 -> a
+    56:57:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1314:1315 -> a
+    58:58:void com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):312:312 -> a
+    58:58:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1315 -> a
+    59:64:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1316:1321 -> a
+    65:69:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1330:1334 -> a
+    70:70:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1364:1364 -> a
+    71:99: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):1374:1402 -> a
+    100:101: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):1381:1382 -> a
+    102:102:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    102:102: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):1390 -> a
+    103:118: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):1390:1405 -> a
+    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1119:1120 -> b
+    3:3:java.util.List getSynthesizedBridges():1133:1133 -> b
+    1:2:boolean merge():914:915 -> c
     3:3:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
-    3:3:boolean merge():937 -> c
-    4:4:boolean merge():937:937 -> c
-    5:6:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1314:1315 -> c
-    5:6:boolean merge():937 -> c
-    7:19:boolean merge():939:951 -> c
-    20:34:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1361:1375 -> c
-    20:34:boolean merge():954 -> c
+    3:3:boolean merge():915 -> c
+    4:4:boolean merge():915:915 -> c
+    5:6:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1292:1293 -> c
+    5:6:boolean merge():915 -> c
+    7:19:boolean merge():917:929 -> c
+    20:34:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1339:1353 -> c
+    20:34:boolean merge():932 -> c
     35:35:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    35:35:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1375 -> c
-    35:35:boolean merge():954 -> c
-    36:40:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1376:1380 -> c
-    36:40:boolean merge():954 -> c
-    41:41:boolean merge():955:955 -> c
-    42:42:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> c
-    42:42:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> c
-    42:42:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309 -> c
-    42:42:boolean merge():952 -> c
-    43:43:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309:1309 -> c
-    43:43:boolean merge():952 -> c
-    44:44:boolean merge():961:961 -> c
-    45:49:boolean merge():958:962 -> c
-    50:50:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> c
-    50:50:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> c
-    50:50:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309 -> c
-    50:50:boolean merge():962 -> c
-    51:51:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309:1309 -> c
-    51:51:boolean merge():962 -> c
-    52:52:boolean merge():963:963 -> c
-    53:53:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    53:53:boolean merge():963 -> c
-    54:57:boolean merge():964:967 -> c
-    58:58:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1235:1235 -> c
-    58:58:boolean merge():967 -> c
-    59:59:boolean merge():972:972 -> c
-    60:80:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1280:1300 -> c
-    60:80:boolean merge():973 -> c
-    81:81:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1295:1295 -> c
-    81:81:boolean merge():973 -> c
-    82:84:boolean merge():975:977 -> c
-    85:85:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    85:85:boolean merge():977 -> c
-    86:89:boolean merge():981:984 -> c
-    90:106:boolean merge():983:999 -> c
-    107:107:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> c
-    107:107:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> c
-    107:107:boolean merge():999 -> c
-    108:109:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> c
-    108:109:boolean merge():999 -> c
-    110:110:boolean merge():1001:1001 -> c
-    111:111:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    111:111:boolean merge():1001 -> c
-    112:113:boolean merge():1002:1003 -> c
-    114:114:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> c
-    114:114:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> c
-    114:114:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309 -> c
-    114:114:boolean merge():1003 -> c
-    115:115:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309:1309 -> c
-    115:115:boolean merge():1003 -> c
-    116:134:boolean merge():1009:1027 -> c
-    135:135:boolean merge():1018:1018 -> c
-    136:140:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1451:1455 -> c
-    136:140:boolean merge():1028 -> c
-    141:151:boolean merge():1031:1041 -> c
-    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> c
-    152:152:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> c
-    152:152:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309 -> c
-    152:152:boolean merge():1041 -> c
-    153:153:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309:1309 -> c
-    153:153:boolean merge():1041 -> c
-    154:154:boolean merge():1045:1045 -> c
-    155:209:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1159:1213 -> c
-    155:209:boolean merge():1045 -> c
-    210:210:boolean merge():1046:1046 -> c
-    211:211:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1235:1235 -> c
-    211:211:boolean merge():1046 -> c
-    212:245:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1240:1273 -> c
-    212:245:boolean merge():1054 -> c
-    246:247:boolean merge():1055:1056 -> c
-    248:248:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> c
-    248:248:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> c
-    248:248:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309 -> c
-    248:248:boolean merge():1056 -> c
-    249:249:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309:1309 -> c
-    249:249:boolean merge():1056 -> c
-    250:250:boolean merge():1059:1059 -> c
-    251:251:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    251:251:boolean merge():1059 -> c
-    252:257:boolean merge():1060:1065 -> c
-    258:265:boolean merge():1064:1071 -> c
-    266:266:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> c
-    266:266:boolean merge():1071 -> c
-    267:285:boolean merge():1071:1089 -> c
-    286:295:boolean merge():1087:1096 -> c
-    296:303:boolean merge():1094:1101 -> c
-    304:306:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1320:1322 -> c
-    304:306:boolean merge():1101 -> c
-    307:332:boolean merge():1104:1129 -> c
-    333:333:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> c
-    333:333:boolean merge():1071 -> c
-    334:334:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
-    334:334:boolean merge():937 -> c
-    335:335:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1146:1146 -> c
-com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.N.U2:
+    35:35:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1353 -> c
+    35:35:boolean merge():932 -> c
+    36:40:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1354:1358 -> c
+    36:40:boolean merge():932 -> c
+    41:41:boolean merge():933:933 -> c
+    42:51:boolean merge():930:939 -> c
+    52:57:boolean merge():936:941 -> c
+    58:58:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
+    58:58:boolean merge():941 -> c
+    59:62:boolean merge():942:945 -> c
+    63:63:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1213:1213 -> c
+    63:63:boolean merge():945 -> c
+    64:64:boolean merge():950:950 -> c
+    65:85:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1258:1278 -> c
+    65:85:boolean merge():951 -> c
+    86:86:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1273:1273 -> c
+    86:86:boolean merge():951 -> c
+    87:89:boolean merge():953:955 -> c
+    90:90:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
+    90:90:boolean merge():955 -> c
+    91:94:boolean merge():959:962 -> c
+    95:111:boolean merge():961:977 -> c
+    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
+    112:112:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> c
+    112:112:boolean merge():977 -> c
+    113:114:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> c
+    113:114:boolean merge():977 -> c
+    115:115:boolean merge():979:979 -> c
+    116:116:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
+    116:116:boolean merge():979 -> c
+    117:142:boolean merge():980:1005 -> c
+    143:143:boolean merge():996:996 -> c
+    144:148:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1429:1433 -> c
+    144:148:boolean merge():1006 -> c
+    149:163:boolean merge():1009:1023 -> c
+    164:218:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1137:1191 -> c
+    164:218:boolean merge():1023 -> c
+    219:219:boolean merge():1024:1024 -> c
+    220:220:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1213:1213 -> c
+    220:220:boolean merge():1024 -> c
+    221:254:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1218:1251 -> c
+    221:254:boolean merge():1032 -> c
+    255:259:boolean merge():1033:1037 -> c
+    260:260:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
+    260:260:boolean merge():1037 -> c
+    261:266:boolean merge():1038:1043 -> c
+    267:274:boolean merge():1042:1049 -> c
+    275:275:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> c
+    275:275:boolean merge():1049 -> c
+    276:294:boolean merge():1049:1067 -> c
+    295:304:boolean merge():1065:1074 -> c
+    305:312:boolean merge():1072:1079 -> c
+    313:315:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1298:1300 -> c
+    313:315:boolean merge():1079 -> c
+    316:341:boolean merge():1082:1107 -> c
+    342:342:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> c
+    342:342:boolean merge():1049 -> c
+    343:343:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
+    343:343:boolean merge():915 -> c
+    344:344:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1124:1124 -> c
+com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.N.S2:
     java.util.Map seenPositions -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap sourceProtoCache -> c
     java.util.Collection invokes -> f
@@ -61909,157 +61664,157 @@
     boolean $assertionsDisabled -> h
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> g
     com.android.tools.r8.graph.DexType target -> e
-    1:1:void <clinit>():1568:1568 -> <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):1568:1568 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1579:1579 -> <init>
-    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1573:1585 -> <init>
-    1:22:boolean mayCollide():1589:1610 -> a
-    23:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1622:1623 -> a
-    25:56:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1642:1673 -> a
-    1:18:void fillSeenPositions():1615:1632 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.N.V2:
+    1:1:void <clinit>():1544:1544 -> <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):1544:1544 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1555:1555 -> <init>
+    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1549:1561 -> <init>
+    1:22:boolean mayCollide():1565:1586 -> a
+    23:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1598:1599 -> a
+    25:56:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1618:1649 -> a
+    1:18:void fillSeenPositions():1591:1608 -> b
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.N.T2:
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexMethod context -> d
     com.android.tools.r8.graph.DexClass source -> f
     boolean foundIllegalAccess -> c
-    1:1:void <clinit>():1787:1787 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1796:1796 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1789:1798 -> <init>
-    1:1:boolean foundIllegalAccess():1802:1802 -> a
-    2:2:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1806:1806 -> a
-    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1869:1872 -> a
-    7:7:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1906:1906 -> a
-    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1885:1888 -> b
-    5:5:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1901:1901 -> b
-    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1877:1880 -> c
-    5:5:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1911:1911 -> c
-    6:6:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1916:1916 -> c
-    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1893:1896 -> d
-    5:5:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1921:1921 -> d
-    6:6:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1926:1926 -> d
-    1:10:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1810:1819 -> e
-    11:17:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1846:1852 -> e
-    18:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1861:1864 -> e
-    1:12:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1827:1838 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.N.W2:
+    1:1:void <clinit>():1753:1753 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1762:1762 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1755:1764 -> <init>
+    1:1:boolean foundIllegalAccess():1768:1768 -> a
+    2:2:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1772:1772 -> a
+    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1835:1838 -> a
+    7:7:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1872:1872 -> a
+    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1851:1854 -> b
+    5:5:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1867:1867 -> b
+    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1843:1846 -> c
+    5:5:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1877:1877 -> c
+    6:6:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1882:1882 -> c
+    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1859:1862 -> d
+    5:5:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1887:1887 -> d
+    6:6:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1892:1892 -> d
+    1:10:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1776:1785 -> e
+    11:17:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1812:1818 -> e
+    18:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1827:1830 -> e
+    1:12:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1793:1804 -> f
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.N.U2:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set mergeeCandidates -> c
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap cache -> a
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):585:585 -> <init>
-    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):580:587 -> <init>
-    1:6:java.util.Collection get():592:597 -> a
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):563:563 -> <init>
+    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):558:565 -> <init>
+    1:6:java.util.Collection get():570:575 -> a
     7:7:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    7:7:java.util.Collection get():598 -> a
-    8:23:java.util.Collection get():598:613 -> a
+    7:7:java.util.Collection get():576 -> a
+    8:23:java.util.Collection get():576:591 -> a
     24:24:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    24:24:java.util.Collection get():598 -> a
-    25:32:java.util.Collection get():619:626 -> a
-    33:33:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):610:610 -> a
-    34:48:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):634:648 -> a
-    49:56:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):654:661 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.N.X2:
+    24:24:java.util.Collection get():576 -> a
+    25:32:java.util.Collection get():597:604 -> a
+    33:33:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):588:588 -> a
+    34:48:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):612:626 -> a
+    49:56:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):632:639 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.N.V2:
     com.android.tools.r8.shaking.VerticalClassMerger$Rename[] $VALUES -> d
     com.android.tools.r8.shaking.VerticalClassMerger$Rename IF_NEEDED -> b
     com.android.tools.r8.shaking.VerticalClassMerger$Rename ALWAYS -> a
     com.android.tools.r8.shaking.VerticalClassMerger$Rename NEVER -> c
-    1:3:void <clinit>():218:220 -> <clinit>
-    4:4:void <clinit>():217:217 -> <clinit>
-    1:1:void <init>(java.lang.String,int):217:217 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():217:217 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.N.Y2:
+    1:3:void <clinit>():209:211 -> <clinit>
+    4:4:void <clinit>():208:208 -> <clinit>
+    1:1:void <init>(java.lang.String,int):208:208 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():208:208 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.N.W2:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
     com.android.tools.r8.graph.DexType target -> c
     com.android.tools.r8.graph.DexType source -> b
-    1:1:void <clinit>():1705:1705 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1710:1712 -> <init>
+    1:1:void <clinit>():1671:1671 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1676:1678 -> <init>
     boolean isContextFreeForMethods() -> a
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1717:1717 -> a
-    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1722:1722 -> a
-    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1727:1727 -> a
-    4:21: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):1749:1766 -> a
-    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1732:1732 -> b
-    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1737:1737 -> b
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1742:1742 -> b
-    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1776:1776 -> c
-    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1771:1771 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.N.Z2:
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1683:1683 -> a
+    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1688:1688 -> a
+    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1693:1693 -> a
+    4:21:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1715:1732 -> a
+    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1698:1698 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1703:1703 -> b
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1708:1708 -> b
+    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1742:1742 -> c
+    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1737:1737 -> f
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.N.X2:
     com.android.tools.r8.ir.code.Invoke$Type type -> f
     com.android.tools.r8.graph.DexMethod invocationTarget -> e
     boolean isInterface -> g
     com.android.tools.r8.graph.DexMethod originalMethod -> d
     com.android.tools.r8.graph.DexMethod method -> c
-    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):1943:1948 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1930:1930 -> a
-    2:3:void updateMethodSignatures(java.util.function.Function):1963:1964 -> a
-    4:14:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1984:1994 -> a
-    15:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1986:1986 -> a
-    1:1:java.util.function.Consumer getRegistryCallback():1983:1983 -> p
-    1:10:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1969:1978 -> q
-com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.N.a3:
+    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):1909:1914 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1896:1896 -> a
+    2:3:void updateMethodSignatures(java.util.function.Function):1929:1930 -> a
+    4:14:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1950:1960 -> a
+    15:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1952:1952 -> a
+    1:1:java.util.function.Consumer getRegistryCallback():1949:1949 -> p
+    1:10:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1935:1944 -> q
+com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.N.Y2:
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder lensBuilder -> a
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> c
-    1:5:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1467:1471 -> <init>
-    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1470:1472 -> <init>
-    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1467:1467 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1467:1467 -> a
-    2:12:com.android.tools.r8.graph.GraphLense fixupTypeReferences():1476:1486 -> a
-    13:15:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1494:1496 -> a
-    16:17:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1527:1528 -> a
-    16:17:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1497 -> a
-    18:21:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1532:1535 -> a
-    18:21:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528 -> a
-    18:21:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1497 -> a
-    22:24:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1560:1562 -> a
-    22:24:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1535 -> a
-    22:24:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528 -> a
-    22:24:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1497 -> a
-    25:26:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1536:1537 -> a
-    25:26:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528 -> a
-    25:26:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1497 -> a
-    27:27:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528:1528 -> a
-    27:27:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1497 -> a
-    28:28:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1527:1527 -> a
-    28:28:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1497 -> a
-    29:30:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1499:1500 -> a
-    31:31:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> a
-    31:31:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1500 -> a
-    32:34:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1500:1502 -> a
-    35:42:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1511:1518 -> a
-    43:43:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):299:299 -> a
-    43:43:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1518 -> a
-    44:44:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1519:1519 -> a
-    45:45:void com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):312:312 -> a
-    45:45:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1519 -> a
-    46:46:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1521:1521 -> a
-    47:48:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1527:1528 -> a
-    49:52:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1532:1535 -> a
-    49:52:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528 -> a
-    53:55:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1560:1562 -> a
-    53:55:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1535 -> a
-    53:55:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528 -> a
-    56:57:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1536:1537 -> a
-    56:57:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528 -> a
-    58:58:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528:1528 -> a
-    59:59:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1527:1527 -> a
-    60:70:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1543:1553 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses -> com.android.tools.r8.N.b3$a:
+    1:5:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1445:1449 -> <init>
+    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1448:1450 -> <init>
+    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1445:1445 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1445:1445 -> a
+    2:11:com.android.tools.r8.graph.GraphLense fixupTypeReferences():1454:1463 -> a
+    12:14:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1470:1472 -> a
+    15:16:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1503:1504 -> a
+    15:16:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1473 -> a
+    17:20:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1508:1511 -> a
+    17:20:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504 -> a
+    17:20:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1473 -> a
+    21:23:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1536:1538 -> a
+    21:23:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1511 -> a
+    21:23:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504 -> a
+    21:23:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1473 -> a
+    24:25:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1512:1513 -> a
+    24:25:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504 -> a
+    24:25:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1473 -> a
+    26:26:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504:1504 -> a
+    26:26:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1473 -> a
+    27:27:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1503:1503 -> a
+    27:27:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1473 -> a
+    28:29:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1475:1476 -> a
+    30:30:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> a
+    30:30:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1476 -> a
+    31:33:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1476:1478 -> a
+    34:41:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1487:1494 -> a
+    42:42:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):299:299 -> a
+    42:42:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1494 -> a
+    43:43:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1495:1495 -> a
+    44:44:void com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):312:312 -> a
+    44:44:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1495 -> a
+    45:45:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1497:1497 -> a
+    46:47:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1503:1504 -> a
+    48:51:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1508:1511 -> a
+    48:51:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504 -> a
+    52:54:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1536:1538 -> a
+    52:54:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1511 -> a
+    52:54:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504 -> a
+    55:56:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1512:1513 -> a
+    55:56:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504 -> a
+    57:57:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504:1504 -> a
+    58:58:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1503:1503 -> a
+    59:69:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1519:1529 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses -> com.android.tools.r8.N.Z2$a:
     java.util.Map mergedClasses -> a
     java.util.Map sources -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():91:91 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.shaking.VerticalClassMerger$1):91:91 -> <init>
-    2:8:void <init>(java.util.Map):96:102 -> <init>
-    1:1:void lambda$new$1(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):100:100 -> a
-    2:2:java.util.List getSourcesFor(com.android.tools.r8.graph.DexType):106:106 -> a
-    3:6:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):119:122 -> a
-    1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):110:111 -> b
-    1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):115:115 -> c
-    1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):100:100 -> d
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.N.e3:
+    1:1:void <clinit>():90:90 -> <clinit>
+    1:1:void <init>(java.util.Map,com.android.tools.r8.shaking.VerticalClassMerger$1):90:90 -> <init>
+    2:8:void <init>(java.util.Map):95:101 -> <init>
+    1:1:void lambda$new$1(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):99:99 -> a
+    2:2:java.util.List getSourcesFor(com.android.tools.r8.graph.DexType):105:105 -> a
+    3:6:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):118:121 -> a
+    1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):109:110 -> b
+    1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):114:114 -> c
+    1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):99:99 -> d
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.N.c3:
     boolean $assertionsDisabled -> o
     java.util.Map originalMethodSignaturesForBridges -> n
     java.util.Map contextualVirtualToDirectMethodMaps -> l
@@ -62077,8 +61832,8 @@
     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):121:121 -> b
     1:7:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):147:153 -> c
     1:12:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):126:137 -> e
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense$1 -> com.android.tools.r8.N.c3:
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder -> com.android.tools.r8.N.d3:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense$1 -> com.android.tools.r8.N.a3:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder -> com.android.tools.r8.N.b3:
     java.util.Map methodMap -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.com.google.common.collect.BiMap fieldMap -> b
@@ -62121,7 +61876,7 @@
     104:117:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder):336:349 -> a
     1:1:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):308:308 -> b
     2:2:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):321:321 -> b
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.N.h3:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.N.f3:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -62151,7 +61906,7 @@
     32:36:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230 -> b
     37:43:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230:236 -> b
     44:44:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):235:235 -> b
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.N.f3:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.N.d3:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -62161,19 +61916,19 @@
     1:2:void indent():268:269 -> b
     3:5:void addReason(java.lang.String):274:276 -> b
     1:3:void startItem(java.lang.String):262:264 -> c
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.N.g3:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.N.e3:
     com.android.tools.r8.experimental.graphinfo.GraphNode node -> a
     com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath path -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():46:46 -> <clinit>
     1:4:void <init>(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath):50:53 -> <init>
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.N.k3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.N.i3:
     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.WhyAreYouNotInliningRule$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>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder builder():74:74 -> v
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.N.i3:
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.N.j3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.N.g3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.N.h3:
     1:1:void <init>(com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
@@ -62353,7 +62108,7 @@
     1:1:com.android.tools.r8.utils.Reporter getReporter():424:424 -> c
     2:2:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):654:654 -> c
     3:11:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):724:732 -> c
-    12:13:boolean com.android.tools.r8.utils.FileUtils.isAarFile(java.nio.file.Path):71:72 -> c
+    12:13:boolean com.android.tools.r8.utils.FileUtils.isAarFile(java.nio.file.Path):66:67 -> c
     12:13:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):733 -> c
     14:14:com.android.tools.r8.utils.AarArchiveResourceProvider com.android.tools.r8.utils.AarArchiveResourceProvider.fromArchive(java.nio.file.Path):38:38 -> c
     14:14:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):734 -> c
@@ -62436,35 +62191,35 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():35:35 -> <clinit>
     1:5:void <init>(com.android.tools.r8.shaking.FilteredClassPath,boolean):46:50 -> <init>
-    1:16:java.util.List readArchive():54:69 -> a
-    17:28:java.util.List readArchive():68:79 -> a
-    29:37:java.util.List readArchive():75:83 -> a
-    38:67:java.util.List readArchive():61:90 -> a
-    68:68:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    68:68:java.util.List readArchive():90 -> a
-    69:73:java.util.List readArchive():90:94 -> a
-    74:105:java.util.List readArchive():56:87 -> a
-    106:106:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
-    106:106:java.util.List readArchive():87 -> a
-    107:107:java.util.List readArchive():87:87 -> a
-    108:108:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):85:85 -> a
-    1:7:void accept(com.android.tools.r8.DataResourceProvider$Visitor):113:119 -> accept
-    8:8:boolean isProgramResourceName(java.lang.String):137:137 -> accept
-    8:8:void accept(com.android.tools.r8.DataResourceProvider$Visitor):119 -> accept
-    9:10:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> accept
-    9:10:boolean isProgramResourceName(java.lang.String):137 -> accept
-    9:10:void accept(com.android.tools.r8.DataResourceProvider$Visitor):119 -> accept
-    11:11:boolean isProgramResourceName(java.lang.String):137:137 -> accept
-    11:11:void accept(com.android.tools.r8.DataResourceProvider$Visitor):119 -> accept
-    12:19:void accept(com.android.tools.r8.DataResourceProvider$Visitor):120:127 -> accept
-    20:39:void accept(com.android.tools.r8.DataResourceProvider$Visitor):113:132 -> accept
-    40:40:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> accept
-    40:40:void accept(com.android.tools.r8.DataResourceProvider$Visitor):132 -> accept
-    41:41:void accept(com.android.tools.r8.DataResourceProvider$Visitor):132:132 -> accept
-    42:43:void accept(com.android.tools.r8.DataResourceProvider$Visitor):128:129 -> accept
-    44:44:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> accept
-    44:44:void accept(com.android.tools.r8.DataResourceProvider$Visitor):129 -> accept
-    45:45:void accept(com.android.tools.r8.DataResourceProvider$Visitor):129:129 -> accept
+    1:15:java.util.List readArchive():54:68 -> a
+    16:27:java.util.List readArchive():67:78 -> a
+    28:36:java.util.List readArchive():74:82 -> a
+    37:66:java.util.List readArchive():60:89 -> a
+    67:67:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    67:67:java.util.List readArchive():89 -> a
+    68:72:java.util.List readArchive():89:93 -> a
+    73:103:java.util.List readArchive():56:86 -> a
+    104:104:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
+    104:104:java.util.List readArchive():86 -> a
+    105:105:java.util.List readArchive():86:86 -> a
+    106:106:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):84:84 -> a
+    1:6:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:117 -> accept
+    7:7:boolean isProgramResourceName(java.lang.String):135:135 -> accept
+    7:7:void accept(com.android.tools.r8.DataResourceProvider$Visitor):117 -> accept
+    8:9:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> accept
+    8:9:boolean isProgramResourceName(java.lang.String):135 -> accept
+    8:9:void accept(com.android.tools.r8.DataResourceProvider$Visitor):117 -> accept
+    10:10:boolean isProgramResourceName(java.lang.String):135:135 -> accept
+    10:10:void accept(com.android.tools.r8.DataResourceProvider$Visitor):117 -> accept
+    11:18:void accept(com.android.tools.r8.DataResourceProvider$Visitor):118:125 -> accept
+    19:37:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:130 -> accept
+    38:38:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> accept
+    38:38:void accept(com.android.tools.r8.DataResourceProvider$Visitor):130 -> accept
+    39:39:void accept(com.android.tools.r8.DataResourceProvider$Visitor):130:130 -> accept
+    40:41:void accept(com.android.tools.r8.DataResourceProvider$Visitor):126:127 -> accept
+    42:42:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> accept
+    42:42:void accept(com.android.tools.r8.DataResourceProvider$Visitor):127 -> accept
+    43:43:void accept(com.android.tools.r8.DataResourceProvider$Visitor):127:127 -> accept
     1:1:com.android.tools.r8.utils.ArchiveResourceProvider fromArchive(java.nio.file.Path,boolean):43:43 -> fromArchive
     2:2:com.android.tools.r8.shaking.FilteredClassPath com.android.tools.r8.shaking.FilteredClassPath.unfiltered(java.nio.file.Path):39:39 -> fromArchive
     2:2:com.android.tools.r8.utils.ArchiveResourceProvider fromArchive(java.nio.file.Path,boolean):43 -> fromArchive
@@ -62472,7 +62227,7 @@
     3:3:com.android.tools.r8.shaking.FilteredClassPath com.android.tools.r8.shaking.FilteredClassPath.unfiltered(java.nio.file.Path):39 -> fromArchive
     3:3:com.android.tools.r8.utils.ArchiveResourceProvider fromArchive(java.nio.file.Path,boolean):43 -> fromArchive
     4:4:com.android.tools.r8.utils.ArchiveResourceProvider fromArchive(java.nio.file.Path,boolean):43:43 -> fromArchive
-    1:3:java.util.Collection getProgramResources():100:102 -> getProgramResources
+    1:3:java.util.Collection getProgramResources():99:101 -> getProgramResources
 com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.utils.l:
     1:1:void <clinit>():8:8 -> <clinit>
     int intValue(boolean) -> a
@@ -62510,12 +62265,12 @@
     1:2:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):49:50 -> d
     1:1:java.lang.String toString():82:82 -> toString
 com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.utils.q:
-    java.util.Map classes -> a
+    java.util.concurrent.ConcurrentHashMap classes -> a
     java.util.concurrent.atomic.AtomicReference classProvider -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():34:34 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.utils.ClassProvider):58:58 -> <init>
-    2:7:void <init>(java.util.Map,com.android.tools.r8.utils.ClassProvider):56:61 -> <init>
+    1:1:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.utils.ClassProvider):58:58 -> <init>
+    2:7:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.utils.ClassProvider):56:61 -> <init>
     java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass) -> a
     com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass) -> a
     1:28:com.android.tools.r8.graph.DexClass get(com.android.tools.r8.graph.DexType):89:116 -> a
@@ -62576,7 +62331,7 @@
     19:19:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):105 -> a
     20:20:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):105:105 -> a
     21:23:java.util.Collection collectTypes():112:114 -> a
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     24:24:java.util.Collection collectTypes():114 -> a
     25:25:java.util.Collection collectTypes():114:114 -> a
     1:1:java.lang.String toString():121:121 -> toString
@@ -62874,29 +62629,27 @@
     1:1:com.android.tools.r8.utils.FieldSignatureEquivalence get():28:28 -> c
     1:1:com.android.tools.r8.utils.FieldSignatureEquivalence getEquivalenceIgnoreName():32:32 -> d
 com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.utils.G:
-    boolean isAndroid -> a
-    boolean $assertionsDisabled -> b
-    1:14:void <clinit>():21:34 -> <clinit>
-    1:2:boolean isZipFile(java.nio.file.Path):61:62 -> a
-    1:2:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):101 -> a
-    3:4:boolean isJarFile(java.nio.file.Path):56:57 -> a
-    3:4:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):101 -> a
-    5:6:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):102:103 -> a
-    7:11:boolean isArchive(java.nio.file.Path):76:80 -> a
-    12:12:java.lang.String readTextFile(java.nio.file.Path,java.nio.charset.Charset):84:84 -> a
-    13:13:void writeToFile(java.nio.file.Path,java.io.OutputStream,byte[]):165:165 -> a
-    14:15:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):170:171 -> a
-    16:20:java.io.OutputStream openPathWithDefault(com.android.tools.r8.com.google.common.io.Closer,java.nio.file.Path,java.io.OutputStream,java.nio.file.OpenOption[]):129:133 -> a
-    16:20:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):172 -> a
-    21:22:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):179:180 -> a
-    23:33:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):170:180 -> a
-    34:47:java.util.zip.ZipFile createZipFile(java.io.File,java.nio.charset.Charset):194:207 -> a
-    1:6:boolean isClassFile(java.nio.file.Path):47:52 -> b
-    1:17:boolean isClassesDexFile(java.nio.file.Path):139:155 -> c
-    1:2:boolean isDexFile(java.nio.file.Path):37:38 -> d
-    1:2:boolean isVDexFile(java.nio.file.Path):42:43 -> e
-    1:2:boolean isZipFile(java.nio.file.Path):61:62 -> f
-    1:1:java.util.List readAllLines(java.nio.file.Path):88:88 -> g
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:2:boolean isZipFile(java.nio.file.Path):56:57 -> a
+    1:2:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):96 -> a
+    3:4:boolean isJarFile(java.nio.file.Path):51:52 -> a
+    3:4:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):96 -> a
+    5:6:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):97:98 -> a
+    7:11:boolean isArchive(java.nio.file.Path):71:75 -> a
+    12:12:java.lang.String readTextFile(java.nio.file.Path,java.nio.charset.Charset):79:79 -> a
+    13:13:void writeToFile(java.nio.file.Path,java.io.OutputStream,byte[]):160:160 -> a
+    14:15:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):165:166 -> a
+    16:20:java.io.OutputStream openPathWithDefault(com.android.tools.r8.com.google.common.io.Closer,java.nio.file.Path,java.io.OutputStream,java.nio.file.OpenOption[]):124:128 -> a
+    16:20:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):167 -> a
+    21:22:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):174:175 -> a
+    23:33:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):165:175 -> a
+    1:6:boolean isClassFile(java.nio.file.Path):42:47 -> b
+    1:17:boolean isClassesDexFile(java.nio.file.Path):134:150 -> c
+    1:2:boolean isDexFile(java.nio.file.Path):32:33 -> d
+    1:2:boolean isVDexFile(java.nio.file.Path):37:38 -> e
+    1:2:boolean isZipFile(java.nio.file.Path):56:57 -> f
+    1:1:java.util.List readAllLines(java.nio.file.Path):83:83 -> g
 com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.H:
     1:1:void <init>(com.android.tools.r8.shaking.FilteredClassPath):13:13 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.shaking.FilteredClassPath,java.lang.String):13:13 -> a
@@ -62950,116 +62703,114 @@
     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.O:
-    boolean invalidDebugInfoFatal -> f0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> S0
+    boolean hasMarker -> f0
     boolean passthroughDexCode -> i
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> W0
+    int callGraphCycleEliminatorMaxDepthThreshold -> K
+    boolean verbose -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
-    boolean enableRedundantFieldLoadElimination -> X
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> a1
+    boolean enableUninstantiatedTypeOptimization -> X
     boolean enableArgumentRemoval -> q
-    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> G0
-    boolean enableInliningOfInvokesWithNullableReceivers -> y
-    java.util.Set extensiveLoggingFilter -> i0
-    boolean enableNameReflectionOptimization -> G
-    boolean enableInheritanceClassInDexDistributor -> N0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> t0
+    boolean enableClassInlining -> y
+    java.util.List mainDexKeepRules -> J0
+    boolean enableTreeShakingOfLibraryMethodOverrides -> G
     boolean printMemory -> h
     java.util.Set neverMergePrefixes -> k
-    boolean debug -> J0
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> O0
-    boolean $assertionsDisabled -> f1
-    boolean ignoreMissingClasses -> E0
-    java.util.function.Consumer syntheticProguardRulesConsumer -> d1
-    boolean enableTreeShakingOfLibraryMethodOverrides -> I
+    int callGraphLikelySpuriousCallEdgeThreshold -> L
+    boolean encodeChecksums -> I
     boolean enableNeverMergePrefixes -> j
-    boolean enableTreeShaking -> A0
-    int minApiLevel -> l0
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> c1
+    boolean printCfg -> A0
     boolean enableUnusedArgumentRemoval -> r
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> Y0
-    boolean enableMainDexListCheck -> z0
-    java.util.Map missingEnclosingMembers -> P0
-    java.util.List logArgumentsFilter -> o0
-    boolean enableValuePropagation -> Y
-    java.util.List methodsFilter -> k0
-    boolean disableInliningOfLibraryMethodOverrides -> z
-    boolean enableGeneratedExtensionRegistryShrinking -> r0
-    boolean enableStringConcatenationOptimization -> H
-    boolean readCompileTimeAnnotations -> n0
-    java.util.Set reportedMissingForDesugaring -> e1
+    boolean enableMinification -> z0
+    java.util.Map warningInvalidDebugInfo -> P0
+    boolean processCovariantReturnTypeAnnotations -> v0
+    boolean enableRedundantConstNumberOptimization -> Y
+    boolean enableClassStaticizer -> z
+    boolean enableNestBasedAccessDesugaring -> r0
+    boolean enableCallSiteOptimizationInfoPropagation -> H
+    boolean enableLambdaMerging -> n0
     boolean enableHorizontalClassMerging -> o
-    int callGraphCycleEliminatorMaxDepthThreshold -> M
-    boolean ignoreMainDexMissingClasses -> g0
-    java.lang.String printCfgFile -> D0
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> T0
-    boolean useSmaliSyntax -> c0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> b1
-    boolean applyInliningToInlinee -> w
-    com.android.tools.r8.StringConsumer configurationConsumer -> X0
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> K0
-    boolean skipReadingDexCode -> S0
-    boolean enableDeterminismAnalysis -> E
+    int classInliningInstructionLimit -> M
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> T0
+    boolean quiet -> c0
+    boolean enableRedundantFieldLoadElimination -> V
+    boolean enableInliningOfInvokesWithNullableReceivers -> w
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> X0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> Y0
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> h0
+    boolean enableNameReflectionOptimization -> E
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    int callGraphLikelySpuriousCallEdgeThreshold -> N
-    boolean forceProguardCompatibility -> F0
+    boolean minimalMainDex -> K0
+    int inliningInstructionLimit -> N
+    boolean configurationDebugging -> F0
     boolean enableVerticalClassMerging -> p
-    boolean enableMinification -> B0
-    boolean enableInitializedClassesInInstanceMethodsAnalysis -> W
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> w0
+    boolean enableValuePropagation -> W
+    boolean disableInliningOfLibraryMethodOverrides -> x
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    int applyInliningToInlineeMaxDepth -> x
-    boolean enableGeneratedMessageLiteShrinking -> s0
-    boolean enableServiceLoaderRewriting -> F
+    boolean lookupLibraryBeforeProgram -> w0
+    boolean enableNestReduction -> s0
+    java.util.Map warningInvalidParameterAnnotations -> O0
+    boolean enableStringConcatenationOptimization -> F
     boolean printTimes -> g
+    boolean enableDesugaring -> o0
+    boolean intermediate -> k0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean enableDynamicTypeOptimization -> m
-    boolean verbose -> d0
-    int classInliningInstructionLimit -> O
-    java.util.function.BiPredicate dexClassChecksumFilter -> L
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> U0
+    boolean invalidDebugInfoFatal -> d0
+    int inliningInstructionAllowance -> O
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> U0
     boolean enableNonNullTracking -> u
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean enableStringSwitchConversion -> T
-    java.util.List mainDexKeepRules -> L0
-    boolean configurationDebugging -> H0
-    boolean enableInitializedClassesAnalysis -> C
-    int inliningInstructionLimit -> P
+    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> E0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> Z0
+    java.util.Set extensiveLoggingFilter -> g0
+    boolean enableInheritanceClassInDexDistributor -> L0
+    boolean debug -> H0
+    boolean enableDeterminismAnalysis -> C
+    int inliningMonitorEnterValuesAllowance -> P
+    java.util.function.Consumer syntheticProguardRulesConsumer -> b1
     boolean enableFieldBitAccessAnalysis -> n
-    int numberOfThreads -> b0
-    boolean printCfg -> C0
-    boolean enableEnumValueOptimization -> U
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> M0
+    boolean skipIR -> G0
+    boolean $assertionsDisabled -> d1
+    boolean ignoreMissingClasses -> C0
+    boolean enableInitializedClassesInInstanceMethodsAnalysis -> U
     boolean enableInlining -> v
-    boolean processCovariantReturnTypeAnnotations -> x0
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> v0
-    boolean enableNestBasedAccessDesugaring -> t0
-    java.util.Map warningInvalidDebugInfo -> R0
-    boolean enableLambdaMerging -> p0
-    boolean hasMarker -> h0
-    boolean enableSideEffectAnalysis -> D
-    int inliningInstructionAllowance -> Q
-    boolean quiet -> e0
-    boolean enableCallSiteOptimizationInfoPropagation -> J
-    boolean enableRedundantConstNumberOptimization -> a0
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> V0
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> Z0
+    int minApiLevel -> j0
+    boolean enableMainDexListCheck -> x0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> a1
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> W0
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> T
+    boolean enableGeneratedExtensionRegistryShrinking -> p0
+    java.util.List logArgumentsFilter -> m0
+    java.util.Map missingEnclosingMembers -> N0
+    boolean readCompileTimeAnnotations -> l0
+    java.util.Set reportedMissingForDesugaring -> c1
+    java.util.List methodsFilter -> i0
+    boolean enableServiceLoaderRewriting -> D
+    int inliningControlFlowResolutionBlocksThreshold -> Q
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> R0
+    boolean ignoreMainDexMissingClasses -> e0
+    boolean useSmaliSyntax -> a0
+    com.android.tools.r8.StringConsumer configurationConsumer -> V0
+    java.lang.String printCfgFile -> B0
+    boolean enableStringSwitchConversion -> R
     boolean enableUnusedInterfaceRemoval -> s
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> j0
-    boolean enableUninstantiatedTypeOptimization -> Z
-    boolean minimalMainDex -> M0
-    boolean enableClassInlining -> A
-    int inliningMonitorEnterValuesAllowance -> R
-    boolean skipIR -> I0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> I0
+    int numberOfThreads -> Z
+    boolean skipReadingDexCode -> Q0
+    java.util.function.BiPredicate dexClassChecksumFilter -> J
+    boolean enableInitializedClassesAnalysis -> A
+    boolean forceProguardCompatibility -> D0
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
-    boolean encodeChecksums -> K
     boolean libraryInterfacesMayHaveStaticInitialization -> l
-    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> V
-    boolean lookupLibraryBeforeProgram -> y0
+    boolean enableTreeShaking -> y0
+    boolean enableEnumValueOptimization -> S
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> u0
     boolean enableDevirtualization -> t
-    boolean enableNestReduction -> u0
-    java.util.Map warningInvalidParameterAnnotations -> Q0
-    boolean enableDesugaring -> q0
-    boolean intermediate -> m0
-    boolean enableClassStaticizer -> B
-    int inliningControlFlowResolutionBlocksThreshold -> S
+    boolean enableGeneratedMessageLiteShrinking -> q0
+    boolean enableSideEffectAnalysis -> B
     1:22:void <clinit>():66:87 -> <clinit>
     23:23:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():67:67 -> <clinit>
     23:23:void <clinit>():88 -> <clinit>
@@ -63067,192 +62818,192 @@
     25:25:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():67:67 -> <clinit>
     25:25:void <clinit>():88 -> <clinit>
     1:1:void <init>():112:112 -> <init>
-    2:525:void <init>():106:629 -> <init>
-    526:530:void <init>():113:117 -> <init>
-    531:531:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
-    532:1055:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:629 -> <init>
-    1056:1063:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
-    1064:1064:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
-    1065:1588:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:629 -> <init>
-    1589:1600:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
-    1:1:boolean isDesugaredLibraryCompilation():314:314 -> A
-    1:1:boolean isGeneratingClassFiles():335:335 -> B
-    1:1:boolean isGeneratingDexIndexed():327:327 -> C
-    1:1:boolean isGeneratingDex():323 -> C
-    2:2:boolean isGeneratingDexFilePerClassFile():331:331 -> C
-    2:2:boolean isGeneratingDex():323 -> C
-    1:1:boolean hasConsumer():298:298 -> D
-    1:1:boolean isInterfaceMethodDesugaringEnabled():1072 -> D
-    2:4:boolean isInterfaceMethodDesugaringEnabled():1075:1077 -> D
-    1:1:boolean isMinifying():430:430 -> E
-    1:1:boolean isProtoShrinkingEnabled():1085:1085 -> F
-    1:1:boolean isShrinking():426:426 -> G
-    1:1:boolean isStringSwitchConversionEnabled():1081:1081 -> H
-    1:32:boolean printWarnings():804:835 -> I
-    33:72:boolean printWarnings():831:870 -> I
-    1:4:boolean shouldDesugarNests():370:373 -> J
-    5:5:boolean isGeneratingClassFiles():335:335 -> J
-    5:5:boolean canUseNestBasedAccess():1055 -> J
-    5:5:boolean shouldDesugarNests():373 -> J
-    1:1:boolean isDesugaredLibraryCompilation():314:314 -> K
-    1:1:boolean shouldKeepStackMapTable():318 -> K
+    2:522:void <init>():106:626 -> <init>
+    523:527:void <init>():113:117 -> <init>
+    528:528:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
+    529:1049:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:626 -> <init>
+    1050:1057:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
+    1058:1058:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
+    1059:1579:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:626 -> <init>
+    1580:1591:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
+    1:1:boolean isDesugaredLibraryCompilation():311:311 -> A
+    1:1:boolean isGeneratingClassFiles():332:332 -> B
+    1:1:boolean isGeneratingDexIndexed():324:324 -> C
+    1:1:boolean isGeneratingDex():320 -> C
+    2:2:boolean isGeneratingDexFilePerClassFile():328:328 -> C
+    2:2:boolean isGeneratingDex():320 -> C
+    1:1:boolean hasConsumer():295:295 -> D
+    1:1:boolean isInterfaceMethodDesugaringEnabled():1067 -> D
+    2:4:boolean isInterfaceMethodDesugaringEnabled():1070:1072 -> D
+    1:1:boolean isMinifying():427:427 -> E
+    1:1:boolean isProtoShrinkingEnabled():1080:1080 -> F
+    1:1:boolean isShrinking():423:423 -> G
+    1:1:boolean isStringSwitchConversionEnabled():1076:1076 -> H
+    1:32:boolean printWarnings():801:832 -> I
+    33:72:boolean printWarnings():828:867 -> I
+    1:4:boolean shouldDesugarNests():367:370 -> J
+    5:5:boolean isGeneratingClassFiles():332:332 -> J
+    5:5:boolean canUseNestBasedAccess():1050 -> J
+    5:5:boolean shouldDesugarNests():370 -> J
+    1:1:boolean isDesugaredLibraryCompilation():311:311 -> K
+    1:1:boolean shouldKeepStackMapTable():315 -> K
     2:2:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> K
-    2:2:boolean shouldKeepStackMapTable():319 -> K
-    3:3:boolean shouldKeepStackMapTable():319:319 -> K
-    1:13:void signalFinishedToConsumers():351:363 -> L
-    1:1:boolean assertionsEnabled():624:624 -> M
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():491:499 -> N
-    1:9:java.util.Set getExtensiveLoggingFilter():465:473 -> O
-    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():461:461 -> P
+    2:2:boolean shouldKeepStackMapTable():316 -> K
+    3:3:boolean shouldKeepStackMapTable():316:316 -> K
+    1:13:void signalFinishedToConsumers():348:360 -> L
+    1:1:boolean assertionsEnabled():621:621 -> M
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():488:496 -> N
+    1:9:java.util.Set getExtensiveLoggingFilter():462:470 -> O
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():458:458 -> P
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273:273 -> a
-    2:8:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):281:287 -> a
-    2:8:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):276 -> a
-    9:9:boolean isGeneratingClassFiles():335:335 -> a
-    9:9:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):288 -> a
-    9:9:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):276 -> a
-    10:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):289:292 -> a
-    10:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):276 -> a
-    14:14:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632:632 -> a
-    15:15:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):654:654 -> a
-    16:17: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):748:749 -> a
+    1:1:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270:270 -> a
+    2:8:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):278:284 -> a
+    2:8:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    9:9:boolean isGeneratingClassFiles():332:332 -> a
+    9:9:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):285 -> a
+    9:9:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    10:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):286:289 -> a
+    10:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    14:14:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> a
+    15:15:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> a
+    16:17: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):745:746 -> a
     18:18:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    18:18: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):753 -> a
-    19:19: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):753:753 -> a
+    18:18: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):750 -> a
+    19:19: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):750:750 -> a
     20:20:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    20:20: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):754 -> a
-    21:21: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):754:754 -> a
-    22:22: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):749:749 -> a
-    23:24:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761:762 -> a
+    20:20: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):751 -> a
+    21:21: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):751:751 -> a
+    22:22: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):746:746 -> a
+    23:24:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):758:759 -> a
     25:25:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    25:25:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764 -> a
-    26:26:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764:764 -> a
+    25:25:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761 -> a
+    26:26:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761:761 -> a
     27:27:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    27:27:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):766 -> a
-    28:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):766:766 -> a
+    27:27:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763 -> a
+    28:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763:763 -> a
     29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
+    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764 -> a
     30:30:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
-    31:31:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767:767 -> a
+    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764 -> a
+    31:31:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764:764 -> a
     32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    32:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):770 -> a
+    32:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
     33:33:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):770 -> a
-    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):770:770 -> a
-    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762:762 -> a
-    36:39:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):775:778 -> a
-    40:44:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):783:787 -> a
-    45:51:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):792:798 -> a
-    52:52:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):793:793 -> a
+    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
+    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767:767 -> a
+    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):759:759 -> a
+    36:39:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):772:775 -> a
+    40:44:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):780:784 -> a
+    45:51:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789:795 -> a
+    52:52:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790:790 -> a
     53:53:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
-    53:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):793 -> a
+    53:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790 -> a
     54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26 -> a
-    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):793 -> a
-    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):793:793 -> a
-    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):797:797 -> a
-    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):884:889 -> a
-    63:64:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1026:1027 -> a
-    65:66:boolean canHaveArtInstanceOfVerifierBug():1361:1362 -> a
-    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643:646 -> b
+    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790 -> a
+    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790:790 -> a
+    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):794:794 -> a
+    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):881:886 -> a
+    63:64:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1021:1022 -> a
+    65:66:boolean canHaveArtInstanceOfVerifierBug():1356:1357 -> a
+    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):640:643 -> b
     5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):648 -> b
-    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):648:650 -> b
-    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):646:646 -> b
-    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632:632 -> b
-    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):644 -> b
-    11:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):670:674 -> b
-    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):654:654 -> b
-    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):675 -> b
-    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:680 -> b
+    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):645 -> b
+    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):645:647 -> b
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643:643 -> b
+    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> b
+    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):641 -> b
+    11:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):667:671 -> b
+    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> b
+    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):672 -> b
+    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:677 -> b
     19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):682 -> b
-    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):682:682 -> b
-    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):742:742 -> b
-    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):684 -> b
-    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):684:684 -> b
-    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680:680 -> b
-    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):786:786 -> b
-    25:25:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1438:1438 -> b
-    1:1:boolean isGeneratingClassFiles():335:335 -> c
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1452 -> c
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1452:1452 -> c
-    3:6:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):636:639 -> c
-    7:7:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632:632 -> c
-    7:7:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):637 -> c
-    8:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):658:660 -> c
-    11:11:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):654:654 -> c
-    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):661 -> c
-    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:665 -> c
-    13:13:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):742:742 -> c
-    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665 -> c
-    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:665 -> c
-    15:15:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):777:777 -> c
-    1:1:boolean isGeneratingClassFiles():335:335 -> d
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1108 -> d
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1108:1108 -> d
-    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):688:690 -> d
-    6:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):704:738 -> d
-    1:1:boolean isGeneratingClassFiles():335:335 -> e
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1059 -> e
-    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1059:1059 -> e
-    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):697:699 -> e
-    1:1:boolean isGeneratingClassFiles():335:335 -> f
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1098 -> f
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1098:1098 -> f
-    1:1:boolean isGeneratingClassFiles():335:335 -> g
-    1:1:boolean canUseConstantMethodHandle():1039 -> g
-    2:2:boolean canUseConstantMethodHandle():1039:1039 -> g
-    1:1:boolean isGeneratingClassFiles():335:335 -> h
-    1:1:boolean canUseConstantMethodType():1043 -> h
-    2:2:boolean canUseConstantMethodType():1043:1043 -> h
-    1:1:boolean isGeneratingClassFiles():335:335 -> i
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1051 -> i
-    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1051:1051 -> i
-    1:2:boolean canUseFilledNewArrayOfObjects():1120:1121 -> j
-    1:1:boolean isGeneratingClassFiles():335:335 -> k
-    1:1:boolean canUseInvokeCustom():1047 -> k
-    2:2:boolean canUseInvokeCustom():1047:1047 -> k
-    1:1:boolean isGeneratingClassFiles():335:335 -> l
-    1:1:boolean canUseInvokePolymorphic():1035 -> l
-    2:2:boolean canUseInvokePolymorphic():1035:1035 -> l
-    1:1:boolean isGeneratingClassFiles():335:335 -> m
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1031 -> m
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():1031:1031 -> m
-    1:2:boolean canUseMultidex():1089:1090 -> n
-    1:1:boolean isGeneratingClassFiles():335:335 -> o
-    1:1:boolean canUseNotInstruction():1156 -> o
-    2:2:boolean canUseNotInstruction():1156:1156 -> o
-    1:1:boolean isGeneratingClassFiles():335:335 -> p
-    1:1:boolean canUsePrivateInterfaceMethods():1067 -> p
-    2:2:boolean canUsePrivateInterfaceMethods():1067:1067 -> p
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1129:1130 -> q
-    1:1:boolean isGeneratingClassFiles():335:335 -> r
-    1:1:boolean canUseSuppressedExceptions():1094 -> r
-    2:2:boolean canUseSuppressedExceptions():1094:1094 -> r
-    1:1:boolean isGeneratingClassFiles():335:335 -> s
-    1:1:boolean canUseTwrCloseResourceMethod():1063 -> s
-    2:2:boolean canUseTwrCloseResourceMethod():1063:1063 -> s
+    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679 -> b
+    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:679 -> b
+    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):739:739 -> b
+    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681 -> b
+    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681:681 -> b
+    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):677:677 -> b
+    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):783:783 -> b
+    25:25:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1433:1433 -> b
+    1:1:boolean isGeneratingClassFiles():332:332 -> c
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1447 -> c
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1447:1447 -> c
+    3:6:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):633:636 -> c
+    7:7:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> c
+    7:7:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):634 -> c
+    8:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):655:657 -> c
+    11:11:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> c
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):658 -> c
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662:662 -> c
+    13:13:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):739:739 -> c
+    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662 -> c
+    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662:662 -> c
+    15:15:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):774:774 -> c
+    1:1:boolean isGeneratingClassFiles():332:332 -> d
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1103 -> d
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1103:1103 -> d
+    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):685:687 -> d
+    6:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):701:735 -> d
+    1:1:boolean isGeneratingClassFiles():332:332 -> e
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1054 -> e
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1054:1054 -> e
+    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):694:696 -> e
+    1:1:boolean isGeneratingClassFiles():332:332 -> f
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1093 -> f
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1093:1093 -> f
+    1:1:boolean isGeneratingClassFiles():332:332 -> g
+    1:1:boolean canUseConstantMethodHandle():1034 -> g
+    2:2:boolean canUseConstantMethodHandle():1034:1034 -> g
+    1:1:boolean isGeneratingClassFiles():332:332 -> h
+    1:1:boolean canUseConstantMethodType():1038 -> h
+    2:2:boolean canUseConstantMethodType():1038:1038 -> h
+    1:1:boolean isGeneratingClassFiles():332:332 -> i
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1046 -> i
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1046:1046 -> i
+    1:2:boolean canUseFilledNewArrayOfObjects():1115:1116 -> j
+    1:1:boolean isGeneratingClassFiles():332:332 -> k
+    1:1:boolean canUseInvokeCustom():1042 -> k
+    2:2:boolean canUseInvokeCustom():1042:1042 -> k
+    1:1:boolean isGeneratingClassFiles():332:332 -> l
+    1:1:boolean canUseInvokePolymorphic():1030 -> l
+    2:2:boolean canUseInvokePolymorphic():1030:1030 -> l
+    1:1:boolean isGeneratingClassFiles():332:332 -> m
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1026 -> m
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1026:1026 -> m
+    1:2:boolean canUseMultidex():1084:1085 -> n
+    1:1:boolean isGeneratingClassFiles():332:332 -> o
+    1:1:boolean canUseNotInstruction():1151 -> o
+    2:2:boolean canUseNotInstruction():1151:1151 -> o
+    1:1:boolean isGeneratingClassFiles():332:332 -> p
+    1:1:boolean canUsePrivateInterfaceMethods():1062 -> p
+    2:2:boolean canUsePrivateInterfaceMethods():1062:1062 -> p
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1124:1125 -> q
+    1:1:boolean isGeneratingClassFiles():332:332 -> r
+    1:1:boolean canUseSuppressedExceptions():1089 -> r
+    2:2:boolean canUseSuppressedExceptions():1089:1089 -> r
+    1:1:boolean isGeneratingClassFiles():332:332 -> s
+    1:1:boolean canUseTwrCloseResourceMethod():1058 -> s
+    2:2:boolean canUseTwrCloseResourceMethod():1058:1058 -> s
     1:4:void disableAllOptimizations():149:152 -> t
     1:17:void disableGlobalOptimizations():156:172 -> u
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302:302 -> v
-    2:2:boolean hasConsumer():298:298 -> v
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302 -> v
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302:302 -> v
-    4:4:boolean isGeneratingDexIndexed():327:327 -> v
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():303 -> v
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304:304 -> v
-    6:6:boolean isGeneratingDexFilePerClassFile():331:331 -> v
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():305 -> v
-    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():306:306 -> v
-    8:8:boolean isGeneratingClassFiles():335:335 -> v
-    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():307 -> v
-    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():308:310 -> v
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299:299 -> v
+    2:2:boolean hasConsumer():295:295 -> v
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299 -> v
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299:299 -> v
+    4:4:boolean isGeneratingDexIndexed():324:324 -> v
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():300 -> v
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():301:301 -> v
+    6:6:boolean isGeneratingDexFilePerClassFile():328:328 -> v
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302 -> v
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():303:303 -> v
+    8:8:boolean isGeneratingClassFiles():332:332 -> v
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304 -> v
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():305:307 -> v
     1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> w
-    1:1:boolean hasMethodsFilter():879:879 -> x
+    1:1:boolean hasMethodsFilter():876:876 -> x
     1:1:boolean hasProguardConfiguration():95:95 -> y
-    1:1:boolean hasUsageInformationConsumer():586:586 -> z
+    1:1:boolean hasUsageInformationConsumer():583:583 -> z
 com.android.tools.r8.utils.InternalOptions$AssertionProcessing -> com.android.tools.r8.utils.O$a:
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing LEAVE -> a
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing REMOVE -> b
@@ -63263,7 +63014,7 @@
     int expectedParameterCount -> b
     int actualParameterCount -> c
     com.android.tools.r8.graph.DexMethod method -> a
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):543:546 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):540:543 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.O$b:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
@@ -63274,21 +63025,21 @@
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():911:919 -> <init>
+    1:9:void <init>():908:916 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.Q:
     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>():904:908 -> <clinit>
-    6:6:void <clinit>():902:902 -> <clinit>
-    1:1:void <init>(java.lang.String,int):902:902 -> <init>
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():902:902 -> a
+    1:5:void <clinit>():901:905 -> <clinit>
+    6:6:void <clinit>():899:899 -> <clinit>
+    1:1:void <init>(java.lang.String,int):899:899 -> <init>
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():899:899 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.O$d:
     boolean invertConditionals -> m
     boolean dontCreateMarkerInD8 -> o
     boolean enableDeadSwitchCaseElimination -> i
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> J
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> G
     boolean forceRedundantConstNumberRemoval -> k
     boolean disallowLoadStoreOptimization -> u
     java.util.function.Consumer irModifier -> w
@@ -63296,18 +63047,16 @@
     com.android.tools.r8.utils.IROrdering irOrdering -> b
     boolean noLocalsTableOnInput -> s
     int basicBlockMuncherIterationLimit -> y
-    boolean verifyKeptGraphInfo -> E
+    boolean readInputStackMaps -> E
     boolean allowUnusedProguardConfigurationRules -> f
-    boolean allowOutlinerInterfaceArrayArguments -> G
     boolean alwaysUsePessimisticRegisterAllocation -> h
     boolean deterministicSortingBasedOnDexType -> A
-    boolean trackDesugaredAPIConversions -> C
+    boolean enableForceNestBasedAccessDesugaringForTest -> C
     boolean allowTypeErrors -> d
     boolean placeExceptionalBlocksLast -> n
     boolean forceJumboStringProcessing -> p
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> H
-    boolean measureProguardIfRuleEvaluations -> I
     boolean enableSwitchToIfRewriting -> j
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> I
     boolean forceAssumeNoneInsertion -> l
     boolean enableNarrowingChecksInD8 -> v
     boolean enableStatefulLambdaCreateInstanceMethod -> x
@@ -63315,26 +63064,27 @@
     byte[] forceDexVersionBytes -> a
     boolean dontReportFailingCheckDiscarded -> z
     boolean disableL8AnnotationRemoval -> e
-    boolean readInputStackMaps -> F
+    boolean allowOutlinerInterfaceArrayArguments -> F
     boolean reportUnusedProguardConfigurationRules -> g
     java.util.Set validInliningReasons -> r
+    boolean measureProguardIfRuleEvaluations -> H
     boolean addCallEdgesForLibraryInvokes -> c
     java.io.PrintStream whyAreYouNotInliningConsumer -> B
-    boolean enableForceNestBasedAccessDesugaringForTest -> D
-    1:87:void <init>():922:1008 -> <init>
+    boolean verifyKeptGraphInfo -> D
+    1:85:void <init>():919:1003 -> <init>
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.S:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():994:996 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1000:1001 -> 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):1001:1001 -> a
+    1:3:void <init>():989:991 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):995:996 -> 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):996:996 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.utils.T:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1011:1014 -> <init>
+    1:4:void <init>():1006:1009 -> <init>
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.U:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):555:557 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):552:554 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.V:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
@@ -63345,21 +63095,21 @@
     1:1:boolean isGeneratingDex():17:17 -> b
 com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.X:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):20:20 -> a
-    2:5:java.lang.Object peekNext(java.util.ListIterator):60:63 -> a
-    6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):103:115 -> a
-    1:3:java.lang.Object peekPrevious(java.util.ListIterator):53:55 -> b
-    4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):80:83 -> b
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):19:19 -> a
+    2:5:java.lang.Object peekNext(java.util.ListIterator):59:62 -> a
+    6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):92:104 -> a
+    1:3:java.lang.Object peekPrevious(java.util.ListIterator):52:54 -> b
+    4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):69:72 -> b
 com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.utils.W:
     java.util.Iterator val$iterator -> b
     java.util.function.Predicate val$predicate -> c
     java.lang.Object next -> a
-    1:3:void <init>(java.util.Iterator,java.util.function.Predicate):20:22 -> <init>
-    1:3:java.lang.Object advance():26:28 -> f
-    1:1:boolean hasNext():37:37 -> hasNext
-    1:5:java.lang.Object next():42:46 -> next
-    6:6:java.lang.Object next():44:44 -> next
+    1:3:void <init>(java.util.Iterator,java.util.function.Predicate):19:21 -> <init>
+    1:3:java.lang.Object advance():25:27 -> f
+    1:1:boolean hasNext():36:36 -> hasNext
+    1:5:java.lang.Object next():41:45 -> next
+    6:6:java.lang.Object next():43:43 -> next
 com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.Z:
     int columnCapacity -> b
     int rowCapacity -> a
@@ -63532,7 +63282,13 @@
     16:17:int access$900(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):105 -> a
 com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.h0:
     com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.j0:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.j0:
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:java.lang.Object first(java.util.List):16:16 -> a
+    2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):25:26 -> a
+    4:6:java.util.List map(java.util.Collection,java.util.function.Function):34:36 -> a
+    1:2:boolean verifyListIsOrdered(java.util.List):42:43 -> b
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.k0:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -63548,7 +63304,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.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.k0:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.l0:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -63570,7 +63326,7 @@
     11:11:int doHash(java.lang.Object):15 -> a
     1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence get():30:30 -> c
     1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence getEquivalenceIgnoreName():34:34 -> d
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.l0:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.m0:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     boolean ignoreName -> a
@@ -63584,14 +63340,14 @@
     7:10:int doHash(java.lang.Object):14 -> a
     1:1:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> c
     1:1:com.android.tools.r8.utils.MethodSignatureEquivalence getEquivalenceIgnoreName():32:32 -> d
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.m0:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.n0:
     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.n0:
+com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.o0:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
     boolean $assertionsDisabled -> e
@@ -63604,7 +63360,7 @@
     1:1:java.util.Set getClassDescriptors():54:54 -> getClassDescriptors
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
     1:1:com.android.tools.r8.origin.Origin getOrigin():36:36 -> getOrigin
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.o0:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.p0:
     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
@@ -63612,14 +63368,14 @@
     19:19:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):41:41 -> a
     20:27:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):60:67 -> a
     1:11:java.util.List tryParseMulti(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):18:28 -> b
-com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.o0$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.p0$a:
     java.lang.String[] args -> a
     int nextIndex -> b
     1:1:void <init>(java.lang.String[]):76:76 -> <init>
     2:5:void <init>(java.lang.String[]):74:77 -> <init>
     1:1:java.lang.String head():81:81 -> a
     1:5:java.lang.String next():85:89 -> b
-com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.p0:
+com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.q0:
     java.util.List other -> b
     java.util.List one -> a
     int otherIndex -> d
@@ -63642,14 +63398,14 @@
     17:17:com.android.tools.r8.graph.KeyedDexItem next():44 -> next
     18:25:com.android.tools.r8.graph.KeyedDexItem next():46:53 -> next
     26:26:com.android.tools.r8.graph.KeyedDexItem next():51:51 -> next
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.q0:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.r0:
     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.r0:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.s0:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
@@ -63659,7 +63415,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.ProgramClassCollection -> com.android.tools.r8.utils.s0:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.t0:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():24:24 -> <clinit>
@@ -63680,12 +63436,14 @@
     26:26:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79:79 -> a
     27:27:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
     27:27:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> a
-    28:28:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80:80 -> a
-    29:31:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    29:31:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
+    28:28:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    28:28:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> a
+    29:29:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80:80 -> a
+    30:32:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    30:32:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():63:63 -> c
     1:1:java.lang.String toString():48:48 -> toString
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.u0:
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.v0:
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.Diagnostic lastError -> c
     java.util.Collection suppressedExceptions -> d
@@ -63706,9 +63464,9 @@
     1:3:void error(com.android.tools.r8.Diagnostic):43:45 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):33:33 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):38:38 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.t0:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.u0:
     1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.v0:
+com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.w0:
     1:1:void <init>():11:11 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -63722,7 +63480,7 @@
     1:1:java.lang.String getDiagnosticMessage():53:53 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():43:43 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():48:48 -> getPosition
-com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.w0:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.x0:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -63755,7 +63513,7 @@
     1:2:java.lang.String stripLeadingBOM(java.lang.String):279:280 -> c
     1:9:java.lang.String toASCIIString(java.lang.String):49:57 -> d
     1:9:java.lang.String trim(java.lang.String):288:296 -> e
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.w0$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.x0$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
@@ -63764,7 +63522,7 @@
     1:4:void <clinit>():22:25 -> <clinit>
     5:5:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(java.lang.String,int):21:21 -> <init>
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.y0:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.z0:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -63773,31 +63531,31 @@
     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.x0:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.utils.y0:
     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.ThrowingBiConsumer -> com.android.tools.r8.utils.z0:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.A0:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.A0:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.B0:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.B0:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.C0:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.C0:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.D0:
     1:1:void <init>():9:9 -> <init>
     boolean hasNext() -> a
     1:4: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.D0:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.E0:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.E0:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.F0:
     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.F0:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.I0:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.G0:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.J0:
     java.util.Stack stack -> a
     boolean trackMemory -> b
     1:1:void <init>(java.lang.String):31:31 -> <init>
@@ -63830,10 +63588,10 @@
     12:12:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
     13:13:java.util.Map computeMemoryInformation():211:211 -> b
     13:13:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.G0:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.H0:
     long used -> a
     1:2:void <init>(long):43:44 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.H0:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.I0:
     com.android.tools.r8.utils.Timing this$0 -> g
     java.util.Map children -> b
     java.lang.String title -> a
@@ -63880,9 +63638,9 @@
     3:3:java.lang.String com.android.tools.r8.utils.Timing.access$200(long):21 -> toString
     3:3:java.lang.String toString():96 -> toString
     4:4:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.J0:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.K0:
     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.K0:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.L0:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b

compatproguard-master.jar

diff --git a/compatproguard-master.jar b/compatproguard-master.jar
index 0ed9772..28a63d3 100644
--- a/compatproguard-master.jar
+++ b/compatproguard-master.jar
Binary files differ

compatproguard-master.jar.map

diff --git a/compatproguard-master.jar.map b/compatproguard-master.jar.map
index 6185d28..f483619 100644
--- a/compatproguard-master.jar.map
+++ b/compatproguard-master.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 1.7.16-dev
+# compiler_version: 1.7.12-dev
 # compiler_hash: engineering
-# pg_map_id: 6905a68
+# pg_map_id: a55b232
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
@@ -18,58 +18,58 @@
     java.util.zip.ZipFile zipFile -> b
     java.util.Set descriptors -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:1:void <init>(java.nio.file.Path):51:51 -> <init>
-    2:2:void <init>(java.nio.file.Path,java.util.function.Predicate):60:60 -> <init>
-    3:37:void <init>(java.nio.file.Path,java.util.function.Predicate):43:77 -> <init>
-    38:41:void <init>(java.nio.file.Path,java.util.function.Predicate):66:69 -> <init>
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:1:void <init>(java.nio.file.Path):50:50 -> <init>
+    2:2:void <init>(java.nio.file.Path,java.util.function.Predicate):59:59 -> <init>
+    3:37:void <init>(java.nio.file.Path,java.util.function.Predicate):42:76 -> <init>
+    38:41:void <init>(java.nio.file.Path,java.util.function.Predicate):65:68 -> <init>
     boolean lambda$new$0(java.lang.String) -> a
-    1:1:void close():112:112 -> close
-    1:2:void finalize():106:107 -> finalize
-    1:1:java.util.Set getClassDescriptors():84:84 -> getClassDescriptors
-    1:1:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):89:89 -> getProgramResource
-    2:2:java.util.zip.ZipEntry getZipEntryFromDescriptor(java.lang.String):116:116 -> getProgramResource
-    2:2:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):92 -> getProgramResource
-    3:8:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):93:98 -> getProgramResource
-    9:14:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):94:99 -> getProgramResource
-    15:22:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):93:100 -> getProgramResource
+    1:1:void close():111:111 -> close
+    1:2:void finalize():105:106 -> finalize
+    1:1:java.util.Set getClassDescriptors():83:83 -> getClassDescriptors
+    1:1:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):88:88 -> getProgramResource
+    2:2:java.util.zip.ZipEntry getZipEntryFromDescriptor(java.lang.String):115:115 -> getProgramResource
+    2:2:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):91 -> getProgramResource
+    3:8:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):92:97 -> getProgramResource
+    9:14:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):93:98 -> getProgramResource
+    15:22:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):92:99 -> getProgramResource
     23:23:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> getProgramResource
-    23:23:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):100 -> getProgramResource
-    24:24:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):100:100 -> getProgramResource
+    23:23:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):99 -> getProgramResource
+    24:24:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):99:99 -> getProgramResource
 com.android.tools.r8.ArchiveProgramResourceProvider -> com.android.tools.r8.ArchiveProgramResourceProvider:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.function.Predicate include -> c
     com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier supplier -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier,java.util.function.Predicate):82:88 -> <init>
-    1:1:java.util.zip.ZipFile lambda$fromArchive$0(java.nio.file.Path):66:66 -> a
-    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
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier,java.util.function.Predicate):81:87 -> <init>
+    1:1:java.util.zip.ZipFile lambda$fromArchive$0(java.nio.file.Path):65:65 -> a
+    2:8:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):91:97 -> a
+    9:13:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):95:99 -> a
+    14:23:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):91:100 -> 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 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
-    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
-    2:2:com.android.tools.r8.ArchiveProgramResourceProvider fromSupplier(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier,java.util.function.Predicate):78:78 -> fromSupplier
-    1:23:java.util.Collection getProgramResources():108:130 -> getProgramResources
+    24:24:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):100 -> a
+    25:25:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):100:100 -> a
+    26:26:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):99:99 -> a
+    27:32:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):111:116 -> a
+    33:33:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):115:115 -> a
+    34:44:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):114:124 -> 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
+    46:46:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):119:119 -> a
+    1:1:com.android.tools.r8.ArchiveProgramResourceProvider fromArchive(java.nio.file.Path):58:58 -> fromArchive
+    2:2:com.android.tools.r8.ArchiveProgramResourceProvider fromArchive(java.nio.file.Path,java.util.function.Predicate):63:63 -> fromArchive
+    1:1:com.android.tools.r8.ArchiveProgramResourceProvider fromSupplier(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier):71:71 -> fromSupplier
+    2:2:com.android.tools.r8.ArchiveProgramResourceProvider fromSupplier(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier,java.util.function.Predicate):77:77 -> fromSupplier
+    1:23:java.util.Collection getProgramResources():107:129 -> getProgramResources
     24:24:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> getProgramResources
-    24:24:java.util.Collection getProgramResources():130 -> getProgramResources
-    25:32:java.util.Collection getProgramResources():130:137 -> getProgramResources
-    1:1:boolean includeClassFileEntries(java.lang.String):43:43 -> includeClassFileEntries
-    1:1:boolean includeClassFileOrDexEntries(java.lang.String):51:51 -> includeClassFileOrDexEntries
+    24:24:java.util.Collection getProgramResources():129 -> getProgramResources
+    25:32:java.util.Collection getProgramResources():129:136 -> getProgramResources
+    1:1:boolean includeClassFileEntries(java.lang.String):42:42 -> includeClassFileEntries
+    1:1:boolean includeClassFileOrDexEntries(java.lang.String):50:50 -> includeClassFileOrDexEntries
     2:3:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> includeClassFileOrDexEntries
-    2:3:boolean includeClassFileOrDexEntries(java.lang.String):51 -> includeClassFileOrDexEntries
+    2:3:boolean includeClassFileOrDexEntries(java.lang.String):50 -> includeClassFileOrDexEntries
     1:2:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> includeDexEntries
-    1:2:boolean includeDexEntries(java.lang.String):47 -> includeDexEntries
+    1:2:boolean includeDexEntries(java.lang.String):46 -> includeDexEntries
 com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer -> com.android.tools.r8.ArchiveProgramResourceProvider$a:
     void accept(com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream) -> a
 com.android.tools.r8.BaseCommand -> com.android.tools.r8.BaseCommand:
@@ -95,63 +95,65 @@
     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:com.android.tools.r8.utils.AndroidApp$Builder getAppBuilder():152:152 -> a
-    2:2:void lambda$addClasspathResourceProvider$6(com.android.tools.r8.ClassFileResourceProvider):232 -> a
-    3:3:void lambda$addClasspathResourceProvider$6(com.android.tools.r8.ClassFileResourceProvider):232:232 -> a
-    4:4:void lambda$addClasspathFiles$3(java.nio.file.Path[]):216:216 -> a
-    5:5:void lambda$addClasspathFiles$4(java.util.Collection):222:222 -> a
-    6:6:void addClasspathFile(java.nio.file.Path):227:227 -> a
-    7:7:void lambda$addClassProgramData$7(byte[],com.android.tools.r8.origin.Origin):238:238 -> a
-    8:8:void lambda$addMainDexClasses$11(java.lang.String[]):295:295 -> a
-    9:9:void setIgnoreDexInArchive(boolean):350:350 -> a
-    10:12: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 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
+    2:2:void lambda$addClasspathResourceProvider$8(com.android.tools.r8.ClassFileResourceProvider):234 -> a
+    3:3:void lambda$addClasspathResourceProvider$8(com.android.tools.r8.ClassFileResourceProvider):234:234 -> a
+    4:4:void lambda$addClasspathFiles$5(java.nio.file.Path[]):218:218 -> a
+    5:5:void lambda$addClasspathFiles$6(java.util.Collection):224:224 -> a
+    6:6:void addClasspathFile(java.nio.file.Path):229:229 -> a
+    7:7:void lambda$addClassProgramData$9(byte[],com.android.tools.r8.origin.Origin):240:240 -> a
+    8:8:void lambda$addMainDexClasses$13(java.lang.String[]):297:297 -> a
+    9:9:void setIgnoreDexInArchive(boolean):352:352 -> a
+    10:12:void guard(java.lang.Runnable):366:368 -> a
+    1:2:com.android.tools.r8.BaseCommand$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin):240:241 -> addClassProgramData
+    1:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):218:219 -> addClasspathFiles
+    3:4:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):224:225 -> addClasspathFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):234:235 -> addClasspathResourceProvider
+    1:2:com.android.tools.r8.BaseCommand$Builder addLibraryFiles(java.nio.file.Path[]):196:197 -> addLibraryFiles
+    3:14:com.android.tools.r8.BaseCommand$Builder addLibraryFiles(java.util.Collection):202:213 -> addLibraryFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):190:191 -> addLibraryResourceProvider
+    1:2:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.lang.String[]):297:298 -> addMainDexClasses
+    3:4:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.util.Collection):310:311 -> addMainDexClasses
+    1:9:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.nio.file.Path[]):260:268 -> addMainDexListFiles
+    10:18:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.util.Collection):277:285 -> 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
+    3:15:com.android.tools.r8.BaseCommand$Builder addProgramFiles(java.util.Collection):167:179 -> addProgramFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):184:185 -> addProgramResourceProvider
     1:1:com.android.tools.r8.utils.AndroidApp$Builder getAppBuilder():152:152 -> b
-    1:1:void lambda$addClasspathFile$5(java.nio.file.Path):227 -> b
-    2:2:void lambda$addClasspathFile$5(java.nio.file.Path):227:227 -> b
+    1:1:void lambda$addClasspathFile$7(java.nio.file.Path):229 -> b
+    2:2:void lambda$addClasspathFile$7(java.nio.file.Path):229:229 -> b
     3:3:com.android.tools.r8.utils.AndroidApp$Builder getAppBuilder():152:152 -> b
-    3:3:void lambda$addLibraryResourceProvider$1(com.android.tools.r8.ClassFileResourceProvider):189 -> b
-    4:4:void lambda$addLibraryResourceProvider$1(com.android.tools.r8.ClassFileResourceProvider):189:189 -> b
+    3:3:void lambda$addLibraryResourceProvider$2(com.android.tools.r8.ClassFileResourceProvider):190 -> b
+    4:4:void lambda$addLibraryResourceProvider$2(com.android.tools.r8.ClassFileResourceProvider):190:190 -> b
     5:5:com.android.tools.r8.utils.Reporter getReporter():162:162 -> b
-    6:10:void lambda$addLibraryFiles$2(java.util.Collection):203:207 -> b
-    11:11:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):358:358 -> b
-    11:11:void lambda$addLibraryFiles$2(java.util.Collection):207 -> b
-    12:12:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):260:260 -> b
-    13:13:com.android.tools.r8.utils.AndroidApp$Builder com.android.tools.r8.utils.AndroidApp$Builder.addMainDexListFiles(java.nio.file.Path[]):628:628 -> b
-    13:13:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):260 -> b
-    14:15:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):262:263 -> b
-    16:16:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):262:262 -> b
-    17:17:void lambda$setIgnoreDexInArchive$13(boolean):350:350 -> b
+    6:6:void lambda$addLibraryFiles$4(java.util.Collection):204:204 -> b
+    7:7:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):262:262 -> b
+    8:8:com.android.tools.r8.utils.AndroidApp$Builder com.android.tools.r8.utils.AndroidApp$Builder.addMainDexListFiles(java.nio.file.Path[]):628:628 -> b
+    8:8:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):262 -> b
+    9:10:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):264:265 -> b
+    11:11:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):264:264 -> b
+    12:12:void lambda$setIgnoreDexInArchive$15(boolean):352:352 -> b
     1:6:com.android.tools.r8.BaseCommand build():138:143 -> build
     com.android.tools.r8.BaseCommand makeCommand() -> c
-    1:1:void lambda$addMainDexClasses$12(java.util.Collection):308:308 -> c
+    1:3:void lambda$addLibraryFiles$3(java.nio.file.Path):207:209 -> c
+    4:4:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):360:360 -> c
+    4:4:void lambda$addLibraryFiles$3(java.nio.file.Path):209 -> c
+    5:5:void lambda$addMainDexClasses$14(java.util.Collection):310:310 -> 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$addProgramFiles$0(java.nio.file.Path):172:175 -> d
+    5:5:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):360:360 -> d
+    5:5:void lambda$addProgramFiles$0(java.nio.file.Path):175 -> d
+    6:9:void lambda$addMainDexListFiles$12(java.util.Collection):279:282 -> d
+    10:10:void lambda$addMainDexListFiles$12(java.util.Collection):281:281 -> 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
+    1:1:void lambda$addProgramFiles$1(java.util.Collection):169:169 -> e
+    1:1:void error(com.android.tools.r8.Diagnostic):338:338 -> error
+    1:1:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):347:347 -> fatalError
     2:4:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> 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
+    2:4:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):347 -> fatalError
+    1:1:boolean isPrintHelp():316:316 -> isPrintHelp
+    1:1:boolean isPrintVersion():327:327 -> isPrintVersion
+    1:2:com.android.tools.r8.BaseCommand$Builder setPrintHelp(boolean):321:322 -> setPrintHelp
+    1:2:com.android.tools.r8.BaseCommand$Builder setPrintVersion(boolean):332:333 -> setPrintVersion
 com.android.tools.r8.BaseCommand$InputFileOrigin -> com.android.tools.r8.BaseCommand$a:
     java.lang.String inputType -> g
     1:2:void <init>(java.lang.String,java.nio.file.Path):73:74 -> <init>
@@ -352,7 +354,7 @@
     19:19:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):187:187 -> a
     20:20:void lambda$run$4(java.lang.String):197:197 -> a
     21:23:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):244:246 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):362:362 -> a
+    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):358:358 -> a
     24:24:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):246 -> a
     25:29:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):247:251 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:102 -> b
@@ -361,7 +363,7 @@
     2:2:void com.android.tools.r8.utils.Timing.<init>(java.lang.String):31:31 -> d
     2:2:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150 -> d
     3:26:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):153:176 -> d
-    27:27: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):358:358 -> d
+    27:27: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):354:354 -> d
     27:27:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):176 -> d
     28:38:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):177:187 -> d
     39:43:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:187 -> d
@@ -926,7 +928,6 @@
     java.lang.StringBuilder outline11(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String) -> a
     java.lang.StringBuilder outline12(java.lang.String) -> a
     java.lang.StringBuilder outline13(java.lang.String,int,java.lang.String) -> a
-    java.util.Iterator outline14(com.android.tools.r8.graph.DexProgramClass) -> a
     com.android.tools.r8.ir.code.BasicBlock outline2(com.android.tools.r8.ir.code.BasicBlock) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type outline3(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type) -> a
     java.lang.String outline4(com.android.tools.r8.graph.DexMethod,java.lang.StringBuilder,java.lang.String) -> a
@@ -949,20 +950,20 @@
     12:12:void com.android.tools.r8.utils.Timing.<init>(java.lang.String):31:31 -> a
     12:12:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):106 -> a
     12:12:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    13:23:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):109:119 -> a
-    13:23:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    24:24:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):353:353 -> a
-    24:24:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):119 -> a
-    24:24:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    25:37:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):121:133 -> a
-    25:37:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    38:38:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():347:347 -> a
-    38:38:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):135 -> a
-    38:38:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    39:47:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):135:143 -> a
-    39:47:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    48:53:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):138:143 -> a
-    48:53:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    13:27:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):109:123 -> a
+    13:27:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):349:349 -> a
+    28:28:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):123 -> a
+    28:28:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    29:41:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):125:137 -> a
+    29:41:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    42:42:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():344:344 -> a
+    42:42:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139 -> a
+    42:42:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    43:51:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139:147 -> a
+    43:51:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    52:81:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):118:147 -> a
+    52:81:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     1:5:void run(com.android.tools.r8.L8Command):43:47 -> run
     6:6:java.util.concurrent.ExecutorService com.android.tools.r8.utils.ThreadUtils.getExecutorService(com.android.tools.r8.utils.InternalOptions):53:53 -> run
     6:6: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):74 -> run
@@ -1102,10 +1103,10 @@
     3:3:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):226 -> a
     4:4:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):179:179 -> a
     5:6:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):193:194 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     7:7:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):195 -> a
     8:8:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):196:196 -> a
-    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():347:347 -> a
+    9:9:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():344:344 -> a
     9:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198 -> a
     10:16:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198:204 -> a
     17:17:void com.android.tools.r8.dex.ApplicationWriter.<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.dex.ClassesChecksum,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):151:151 -> a
@@ -1229,7 +1230,7 @@
     65:75:com.android.tools.r8.utils.InternalOptions getInternalOptions():826:836 -> c
     76:86:com.android.tools.r8.utils.InternalOptions getInternalOptions():833:843 -> c
     87:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():840:857 -> c
-    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> c
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
     105:105:com.android.tools.r8.utils.InternalOptions getInternalOptions():858 -> c
     106:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():859:873 -> c
     1:1:boolean getEnableMinification():765:765 -> getEnableMinification
@@ -1399,12 +1400,12 @@
     1:6:void visit():157:162 -> a
     7:10:void processFieldValue(com.android.tools.r8.graph.DexValue):178:181 -> a
     7:10:void visit():164 -> a
-    11:11:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():462:462 -> a
+    11:11:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> a
     11:11:void processFieldValue(com.android.tools.r8.graph.DexValue):181 -> a
     11:11:void visit():164 -> a
     12:17:void processFieldValue(com.android.tools.r8.graph.DexValue):182:187 -> a
     12:17:void visit():164 -> a
-    18:18:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():462:462 -> a
+    18:18:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> a
     18:18:void processFieldValue(com.android.tools.r8.graph.DexValue):187 -> a
     18:18:void visit():164 -> a
     19:19:void processFieldValue(com.android.tools.r8.graph.DexValue):188:188 -> a
@@ -1866,12 +1867,12 @@
 com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.x.d:
     com.android.tools.r8.ir.code.Phi phi -> r
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
-    boolean isConstant() -> E
-    boolean needsRegister() -> R
+    boolean isConstant() -> D
+    boolean needsRegister() -> Q
     1:1:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26:26 -> a
     2:2:int com.android.tools.r8.cf.CfRegisterAllocator.getRegisterForValue(com.android.tools.r8.ir.code.Value,int):128:128 -> a
     2:2:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26 -> a
-    1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> c0
+    1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> b0
     1:1:java.lang.String toString():45:45 -> toString
 com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.x.f:
     com.android.tools.r8.graph.AppView appView -> a
@@ -1884,11 +1885,11 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.cf.TypeVerificationHelper):41:41 -> <init>
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.cf.TypeVerificationHelper):38:44 -> <init>
     1:5:void insertLoadsAndStores():99:103 -> a
-    6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     6:6:void insertLoadsAndStores():104 -> a
     7:12:void insertLoadsAndStores():104:109 -> a
     13:31:void insertPhiMoves(com.android.tools.r8.cf.CfRegisterAllocator):114:132 -> a
-    32:32:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    32:32:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     32:32:void insertPhiMoves(com.android.tools.r8.cf.CfRegisterAllocator):132 -> a
     33:34:void insertPhiMoves(com.android.tools.r8.cf.CfRegisterAllocator):133:134 -> a
     35:38:void movePhis(java.util.List,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):245:248 -> a
@@ -2011,13 +2012,13 @@
     53:53:com.android.tools.r8.graph.DexType join(java.util.Set):196:196 -> a
     54:64:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo join(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):205:215 -> a
     65:70:java.util.Map computeVerificationTypes():223:228 -> a
-    71:71:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
+    71:71:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     71:71:java.util.Map computeVerificationTypes():228 -> a
     72:128:java.util.Map computeVerificationTypes():231:287 -> a
     129:131:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.ir.code.Value):313:315 -> a
     129:131:java.util.Map computeVerificationTypes():288 -> a
     132:151:java.util.Map computeVerificationTypes():290:309 -> a
-    152:152:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
+    152:152:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     152:152:java.util.Map computeVerificationTypes():228 -> a
     153:158:void addUsers(com.android.tools.r8.ir.code.Value,java.util.Set):319:324 -> a
     1:19:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):155:173 -> b
@@ -2446,9 +2447,9 @@
     18:18:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):74:74 -> a
     19:19:void print(com.android.tools.r8.cf.CfPrinter):69:69 -> 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):89:93 -> a
-    25:25: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):1294:1294 -> a
+    25:25: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):1290:1290 -> 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):93 -> a
-    26:28: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):1292:1294 -> a
+    26:28: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):1288:1290 -> a
     26:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):93 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):102 -> a
@@ -2538,7 +2539,7 @@
     1:5:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):47:51 -> a
     6:7:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):60:61 -> a
     6:7:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):51 -> a
-    8:8:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():462:462 -> a
+    8:8:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> a
     8:8:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):61 -> a
     8:8:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):51 -> a
     9:23:java.lang.Object decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):61:75 -> a
@@ -2579,7 +2580,7 @@
     14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):61:61 -> a
     15:15:void print(com.android.tools.r8.cf.CfPrinter):66:66 -> 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):79:81 -> a
-    19:19:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    19:19:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     19:19:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):81 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():207:207 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):95 -> a
@@ -2801,35 +2802,35 @@
     159:174:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):183:198 -> a
     175:184:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):290:299 -> a
     175:184:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    185:185:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    185:185:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     185:185:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):299 -> a
     185:185:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     186:186:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):301:301 -> a
     186:186:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    187:187:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    187:187:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     187:187:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):301 -> a
     187:187:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     188:188:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):303:303 -> a
     188:188:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    189:189:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    189:189:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     189:189:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):303 -> a
     189:189:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     190:190:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):305:305 -> a
     190:190:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    191:191:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    191:191:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     191:191:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):305 -> a
     191:191:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     192:192:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):307:307 -> 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):203 -> a
-    193:193:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    193:193:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     193:193:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):307 -> a
     193:193:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     194:194:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):309:309 -> a
     194:194:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    195:195:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    195:195:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     195:195:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):309 -> a
     195:195:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    196:196:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    196:196:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     196:196:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):299 -> a
     196:196:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     197:197:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):199:199 -> a
@@ -2848,65 +2849,65 @@
     204:204:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):191:191 -> a
     205:213:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):154:162 -> a
     214:216:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):142:144 -> a
-    217:217:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    217:217:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     217:217:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):144 -> a
     218:219:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):146:147 -> a
-    220:220:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    220:220:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> 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):147 -> 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):148:148 -> a
-    222:222:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    222:222:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> 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):148 -> a
-    223:223:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    223:223:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     223:223:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):147 -> a
     224:232:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):128:136 -> a
     233:237:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):119:123 -> a
     238:240:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112:114 -> a
-    241:241:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    241:241:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     241:241:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):114 -> a
     242:245:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):103:106 -> a
     246:247:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):97:98 -> a
     248:253:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):226:231 -> a
-    254:254:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    254:254:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     254:254:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):231 -> a
     255:255:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):233:233 -> a
-    256:256:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    256:256:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     256:256:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):233 -> a
     257:257:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):235:235 -> a
-    258:258:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    258:258:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     258:258:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):235 -> a
-    259:259:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    259:259:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     259:259:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):231 -> a
     260:266: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):243:249 -> a
-    267:267:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    267:267:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     267:267: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):249 -> a
     268:268: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):251:251 -> a
-    269:269:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    269:269:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     269:269: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):251 -> a
     270:270: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):253:253 -> a
-    271:271:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    271:271:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     271:271: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):253 -> a
     272:272: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):255:255 -> a
-    273:273:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    273:273:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     273:273: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):255 -> a
-    274:274:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    274:274:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     274:274: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):249 -> a
     275:275:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):323:323 -> 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):262:269 -> b
-    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     9:9:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):269 -> b
     10:10: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):271:271 -> b
-    11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     11:11: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):271 -> b
     12:12: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):273:273 -> b
-    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     13:13: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):273 -> b
     14:14: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):275:275 -> b
-    15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     15:15: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):275 -> b
     16:16:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):277:277 -> b
-    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     17:17:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):277 -> b
-    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     18:18:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):269 -> b
     boolean emitsIR() -> f
     1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():89:89 -> q
@@ -2935,7 +2936,7 @@
     14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):61:61 -> a
     15:15:void print(com.android.tools.r8.cf.CfPrinter):66:66 -> 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):79:80 -> a
-    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():259:259 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):94 -> a
@@ -5484,7 +5485,7 @@
     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[]):1428:1444 -> a
+    3:19:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1424:1440 -> 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
@@ -6009,7 +6010,7 @@
     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):1198:1198 -> a
+    4:4:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     4:4: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() -> h
@@ -6022,7 +6023,7 @@
     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):1198:1198 -> a
+    4:4:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     4:4: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() -> h
@@ -6039,7 +6040,7 @@
     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):1198:1198 -> a
+    6:6:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     6:6: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() -> h
@@ -7350,23 +7351,35 @@
     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.z.a.a.a.o:
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.z.a.a.a.u:
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher whitespace():134:134 -> <clinit>
     1:1:void <clinit>():272 -> <clinit>
-    2:2:com.android.tools.r8.com.google.common.base.CharMatcher ascii():154:154 -> <clinit>
-    2:2:void <clinit>():294 -> <clinit>
-    3:3:com.android.tools.r8.com.google.common.base.CharMatcher digit():165:165 -> <clinit>
-    3:3:void <clinit>():306 -> <clinit>
-    4:4:com.android.tools.r8.com.google.common.base.CharMatcher javaIsoControl():227:227 -> <clinit>
-    4:4:void <clinit>():369 -> <clinit>
-    5:5:com.android.tools.r8.com.google.common.base.CharMatcher invisible():238:238 -> <clinit>
-    5:5:void <clinit>():380 -> <clinit>
-    6:6:com.android.tools.r8.com.google.common.base.CharMatcher singleWidth():252:252 -> <clinit>
-    6:6:void <clinit>():394 -> <clinit>
-    7:7:com.android.tools.r8.com.google.common.base.CharMatcher any():108:108 -> <clinit>
-    7:7:void <clinit>():403 -> <clinit>
-    8:8:com.android.tools.r8.com.google.common.base.CharMatcher none():117:117 -> <clinit>
-    8:8:void <clinit>():412 -> <clinit>
+    2:2:com.android.tools.r8.com.google.common.base.CharMatcher breakingWhitespace():145:145 -> <clinit>
+    2:2:void <clinit>():284 -> <clinit>
+    3:3:com.android.tools.r8.com.google.common.base.CharMatcher ascii():154:154 -> <clinit>
+    3:3:void <clinit>():294 -> <clinit>
+    4:4:com.android.tools.r8.com.google.common.base.CharMatcher digit():165:165 -> <clinit>
+    4:4:void <clinit>():306 -> <clinit>
+    5:5:com.android.tools.r8.com.google.common.base.CharMatcher javaDigit():176:176 -> <clinit>
+    5:5:void <clinit>():317 -> <clinit>
+    6:6:com.android.tools.r8.com.google.common.base.CharMatcher javaLetter():187:187 -> <clinit>
+    6:6:void <clinit>():329 -> <clinit>
+    7:7:com.android.tools.r8.com.google.common.base.CharMatcher javaLetterOrDigit():197:197 -> <clinit>
+    7:7:void <clinit>():339 -> <clinit>
+    8:8:com.android.tools.r8.com.google.common.base.CharMatcher javaUpperCase():207:207 -> <clinit>
+    8:8:void <clinit>():349 -> <clinit>
+    9:9:com.android.tools.r8.com.google.common.base.CharMatcher javaLowerCase():217:217 -> <clinit>
+    9:9:void <clinit>():359 -> <clinit>
+    10:10:com.android.tools.r8.com.google.common.base.CharMatcher javaIsoControl():227:227 -> <clinit>
+    10:10:void <clinit>():369 -> <clinit>
+    11:11:com.android.tools.r8.com.google.common.base.CharMatcher invisible():238:238 -> <clinit>
+    11:11:void <clinit>():380 -> <clinit>
+    12:12:com.android.tools.r8.com.google.common.base.CharMatcher singleWidth():252:252 -> <clinit>
+    12:12:void <clinit>():394 -> <clinit>
+    13:13:com.android.tools.r8.com.google.common.base.CharMatcher any():108:108 -> <clinit>
+    13:13:void <clinit>():403 -> <clinit>
+    14:14:com.android.tools.r8.com.google.common.base.CharMatcher none():117:117 -> <clinit>
+    14:14:void <clinit>():412 -> <clinit>
     1:1:void <init>():484:484 -> <init>
     boolean matches(char) -> a
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher ascii():154:154 -> a
@@ -7391,22 +7404,82 @@
     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.z.a.a.a.e:
+com.android.tools.r8.com.google.common.base.CharMatcher$BreakingWhitespace -> com.android.tools.r8.z.a.a.a.e:
+    com.android.tools.r8.com.google.common.base.CharMatcher INSTANCE -> a
+    1:1:void <clinit>():1351:1351 -> <clinit>
+    1:1:void <init>():1349:1349 -> <init>
+    boolean matches(char) -> a
+    1:1:boolean apply(java.lang.Object):1349:1349 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1349 -> apply
+    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():1349 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.z.a.a.a.f:
     com.android.tools.r8.com.google.common.base.CharMatcher$Digit INSTANCE -> d
     1:1:void <clinit>():1455:1455 -> <clinit>
     1:1:void <init>():1458:1458 -> <init>
     1:3:char[] nines():1448:1450 -> c
     1:1:char[] zeroes():1444:1444 -> d
-com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.z.a.a.a.f:
+com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.z.a.a.a.g:
     com.android.tools.r8.com.google.common.base.CharMatcher$Invisible INSTANCE -> d
     1:1:void <clinit>():1567:1567 -> <clinit>
     1:1:void <init>():1570:1570 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.z.a.a.a.g:
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaDigit -> com.android.tools.r8.z.a.a.a.h:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaDigit INSTANCE -> a
+    1:1:void <clinit>():1465:1465 -> <clinit>
+    1:1:void <init>():1463:1463 -> <init>
+    1:1:boolean matches(char):1469:1469 -> a
+    1:1:boolean apply(java.lang.Object):1463:1463 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1463 -> apply
+    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():1463 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.z.a.a.a.i:
     com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl INSTANCE -> b
     1:1:void <clinit>():1545:1545 -> <clinit>
     1:1:void <init>():1548:1548 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.z.a.a.a.h:
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaLetter -> com.android.tools.r8.z.a.a.a.j:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaLetter INSTANCE -> a
+    1:1:void <clinit>():1481:1481 -> <clinit>
+    1:1:void <init>():1479:1479 -> <init>
+    1:1:boolean matches(char):1485:1485 -> a
+    1:1:boolean apply(java.lang.Object):1479:1479 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1479 -> apply
+    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():1479 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaLetterOrDigit -> com.android.tools.r8.z.a.a.a.k:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaLetterOrDigit INSTANCE -> a
+    1:1:void <clinit>():1497:1497 -> <clinit>
+    1:1:void <init>():1495:1495 -> <init>
+    1:1:boolean matches(char):1501:1501 -> a
+    1:1:boolean apply(java.lang.Object):1495:1495 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1495 -> apply
+    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():1495 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaLowerCase -> com.android.tools.r8.z.a.a.a.l:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaLowerCase INSTANCE -> a
+    1:1:void <clinit>():1529:1529 -> <clinit>
+    1:1:void <init>():1527:1527 -> <init>
+    1:1:boolean matches(char):1533:1533 -> a
+    1:1:boolean apply(java.lang.Object):1527:1527 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1527 -> apply
+    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():1527 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaUpperCase -> com.android.tools.r8.z.a.a.a.m:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaUpperCase INSTANCE -> a
+    1:1:void <clinit>():1513:1513 -> <clinit>
+    1:1:void <init>():1511:1511 -> <init>
+    1:1:boolean matches(char):1517:1517 -> a
+    1:1:boolean apply(java.lang.Object):1511:1511 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1511 -> apply
+    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():1511 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.z.a.a.a.n:
     java.lang.String description -> a
     1:1:void com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.<init>():1047:1047 -> <init>
     1:1:void <init>(java.lang.String):1065 -> <init>
@@ -7421,7 +7494,7 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():1056:1056 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():0 -> negate
     1:1:java.lang.String toString():1071:1071 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.z.a.a.a.i:
+com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.z.a.a.a.o:
     com.android.tools.r8.com.google.common.base.CharMatcher original -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1594:1595 -> <init>
     1:1:boolean matches(char):1600:1600 -> a
@@ -7432,9 +7505,9 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1629:1629 -> negate
     2:2:java.util.function.Predicate negate():1590 -> negate
     1:1:java.lang.String toString():1634:1634 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.z.a.a.a.j:
+com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.z.a.a.a.p:
     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.z.a.a.a.k:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.z.a.a.a.q:
     com.android.tools.r8.com.google.common.base.CharMatcher$None INSTANCE -> b
     1:1:void <clinit>():1216:1216 -> <clinit>
     1:1:void <init>():1219:1219 -> <init>
@@ -7444,7 +7517,7 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():108:108 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1312 -> negate
     2:2:java.util.function.Predicate negate():1214 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.z.a.a.a.l:
+com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.z.a.a.a.r:
     char[] rangeStarts -> b
     char[] rangeEnds -> c
     java.lang.String description -> a
@@ -7456,21 +7529,21 @@
     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.z.a.a.a.m:
+com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.z.a.a.a.s:
     com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth INSTANCE -> d
     1:1:void <clinit>():1577:1577 -> <clinit>
     1:2:void <init>():1582:1583 -> <init>
     3:3:void <init>():1580:1580 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.z.a.a.a.n:
+com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.z.a.a.a.t:
     com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace INSTANCE -> c
     int SHIFT -> b
     1:3:void <clinit>():1326:1328 -> <clinit>
     1:1:void <init>():1331:1331 -> <init>
     1:1:boolean matches(char):1336:1336 -> a
-com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.z.a.a.a.p:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.z.a.a.a.v:
     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.z.a.a.a.u:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.z.a.a.a.A:
     1:1:void <init>():41:41 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -7480,20 +7553,20 @@
     3:3:com.android.tools.r8.com.google.common.base.Equivalence identity():336:336 -> b
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(java.lang.Object):162:162 -> c
     1:1:boolean test(java.lang.Object,java.lang.Object):78:78 -> test
-com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.z.a.a.a.q:
-com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.z.a.a.a.r:
+com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.z.a.a.a.w:
+com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.z.a.a.a.x:
     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 -> a
     2:2:int doHash(java.lang.Object):350:350 -> a
-com.android.tools.r8.com.google.common.base.Equivalence$Identity -> com.android.tools.r8.z.a.a.a.s:
+com.android.tools.r8.com.google.common.base.Equivalence$Identity -> com.android.tools.r8.z.a.a.a.y:
     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>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     1:1:int doHash(java.lang.Object):371:371 -> a
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.z.a.a.a.t:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.z.a.a.a.z:
     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>
@@ -7502,20 +7575,20 @@
     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.z.a.a.a.v:
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.z.a.a.a.x:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.z.a.a.a.B:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.z.a.a.a.D:
     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.z.a.a.a.w:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.z.a.a.a.C:
     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.z.a.a.a.B:
+com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.z.a.a.a.H:
     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$ObjectPredicate.withNarrowedType():0:0 -> a
     2:2:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.alwaysFalse():62 -> a
@@ -7581,8 +7654,8 @@
     6:6:java.lang.Object firstNonNull(java.lang.Object,java.lang.Object):56 -> b
     7:7:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1241:1241 -> b
     7:7:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int):1223 -> b
-com.android.tools.r8.com.google.common.base.MoreObjects$1 -> com.android.tools.r8.z.a.a.a.y:
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.z.a.a.a.A:
+com.android.tools.r8.com.google.common.base.MoreObjects$1 -> com.android.tools.r8.z.a.a.a.E:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.z.a.a.a.G:
     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
@@ -7599,18 +7672,18 @@
     5:5:com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper addHolder(java.lang.String,java.lang.Object):372 -> b
     1:20:java.lang.String toString():331:350 -> toString
     21:39:java.lang.String toString():336:354 -> toString
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> com.android.tools.r8.z.a.a.a.z:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> com.android.tools.r8.z.a.a.a.F:
     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.z.a.a.a.C:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.z.a.a.a.I:
     1:1:void <init>():150:150 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional com.android.tools.r8.com.google.common.base.Absent.withType():33:33 -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional absent():93 -> a
-com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.z.a.a.a.F:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.z.a.a.a.L:
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> b
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -7630,21 +7703,21 @@
     2:2:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66 -> a
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     3:3:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):65 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.z.a.a.a.D:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.z.a.a.a.E:
+com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.z.a.a.a.J:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.z.a.a.a.K:
     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.z.a.a.a.G:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.z.a.a.a.M:
     1:1:boolean test(java.lang.Object):80:80 -> test
-com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.z.a.a.a.H:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.z.a.a.a.I:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.z.a.a.a.N:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.z.a.a.a.O:
     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.z.a.a.a.N:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.z.a.a.a.U:
     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
@@ -7652,15 +7725,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.z.a.a.a.J:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.z.a.a.a.P:
     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.z.a.a.a.K:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.z.a.a.a.Q:
     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.z.a.a.a.L:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.z.a.a.a.S:
     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.z.a.a.a.M:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.z.a.a.a.T:
     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.z.a.a.a.O:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.z.a.a.a.V:
     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>
@@ -7671,7 +7744,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.z.a.a.a.Q:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.z.a.a.a.X:
     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
@@ -7684,24 +7757,24 @@
     10:10:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> a
     10:10:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):218 -> a
     10:10:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.z.a.a.a.P:
+com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.z.a.a.a.W:
     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.z.a.a.a.S:
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.z.a.a.a.T:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.z.a.a.a.Y:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.z.a.a.a.Z:
     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.z.a.a.a.U:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.z.a.a.a.a0:
     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.z.a.a.a.V:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.z.a.a.a.b0:
     java.lang.Object jla -> a
     1:3:java.lang.Object getJLA():482:484 -> <clinit>
     1:3:void <clinit>():452 -> <clinit>
@@ -8405,7 +8478,8 @@
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.BiMap inverse() -> i
 com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.z.a.a.b.q:
-    java.util.stream.Collector TO_IMMUTABLE_SET -> a
+    java.util.stream.Collector TO_IMMUTABLE_SET -> b
+    java.util.stream.Collector TO_IMMUTABLE_LIST -> a
     1:25:void <clinit>():44:68 -> <clinit>
     1:1:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):60:60 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
@@ -9256,33 +9330,31 @@
     1:1:void <init>():483:483 -> <init>
     1:1:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):80:80 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):132:132 -> a
-    3:3:com.android.tools.r8.com.google.common.collect.RegularImmutableMap com.android.tools.r8.com.google.common.collect.RegularImmutableMap.fromEntries(java.util.Map$Entry[]):54:54 -> a
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):132 -> a
-    4:4:void checkNoConflict(boolean,java.lang.String,java.util.Map$Entry,java.util.Map$Entry):190:190 -> a
-    5:13:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):392:400 -> a
-    14:18:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOfEnumMap(java.util.EnumMap):436:440 -> a
-    14:18:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):400 -> a
-    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403:403 -> a
-    20:20:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418:418 -> a
-    20:20:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    21:23:java.util.Collection com.android.tools.r8.com.google.common.collect.Iterables.castOrCopyToCollection(java.lang.Iterable):318:320 -> a
-    21:23:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):297 -> a
-    21:23:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418 -> a
-    21:23:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    24:24:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):298:298 -> a
-    24:24:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418 -> a
-    24:24:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    25:37:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418:430 -> a
-    25:37:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    38:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):423:424 -> a
-    38:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    40:40:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):73:73 -> a
-    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object):123 -> a
-    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):424 -> a
+    3:3:void checkNoConflict(boolean,java.lang.String,java.util.Map$Entry,java.util.Map$Entry):190:190 -> a
+    4:12:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):392:400 -> a
+    13:17:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOfEnumMap(java.util.EnumMap):436:440 -> a
+    13:17:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):400 -> a
+    18:18:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403:403 -> a
+    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418:418 -> a
+    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    20:22:java.util.Collection com.android.tools.r8.com.google.common.collect.Iterables.castOrCopyToCollection(java.lang.Iterable):318:320 -> a
+    20:22:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):297 -> a
+    20:22:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418 -> a
+    20:22:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    23:23:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):298:298 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    24:36:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418:430 -> a
+    24:36:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    37:38:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):423:424 -> a
+    37:38:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):73:73 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object):123 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):424 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap of():113:113 -> a
+    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):421 -> a
     40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    41:41:com.android.tools.r8.com.google.common.collect.ImmutableMap of():113:113 -> a
-    41:41:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):421 -> a
-    41:41:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
     1:2:java.util.Map$Entry entryOf(java.lang.Object,java.lang.Object):175:176 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):73:73 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object):123 -> c
@@ -10572,6 +10644,7 @@
     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$StrongValueEntry -> com.android.tools.r8.z.a.a.b.m1:
 com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$ValueIterator -> com.android.tools.r8.z.a.a.b.Y0$f:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2656:2656 -> <init>
     1:1:java.lang.Object next():2660:2660 -> next
@@ -10587,7 +10660,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.z.a.a.b.n1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry -> com.android.tools.r8.z.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>
@@ -10599,7 +10672,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.z.a.a.b.m1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper -> com.android.tools.r8.z.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>
@@ -10619,7 +10692,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.z.a.a.b.o1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment -> com.android.tools.r8.z.a.a.b.p1:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2149:2149 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2142:2142 -> <init>
@@ -10627,7 +10700,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.z.a.a.b.q1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry -> com.android.tools.r8.z.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>
@@ -10638,7 +10711,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.z.a.a.b.p1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper -> com.android.tools.r8.z.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>
@@ -10658,7 +10731,7 @@
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):931:931 -> a
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):906 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper instance():913:913 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.z.a.a.b.r1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.z.a.a.b.s1:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     java.lang.ref.ReferenceQueue queueForValues -> i
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2189:2189 -> <init>
@@ -10668,12 +10741,12 @@
     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.z.a.a.b.s1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueEntry -> com.android.tools.r8.z.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.z.a.a.b.t1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference -> com.android.tools.r8.z.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.z.a.a.b.u1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReferenceImpl -> com.android.tools.r8.z.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
@@ -10688,13 +10761,13 @@
     1:1:java.lang.Object getValue():2684:2684 -> getValue
     1:1:int hashCode():2700:2700 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):2705:2706 -> setValue
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.z.a.a.b.v1:
-com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.z.a.a.b.w1:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.z.a.a.b.w1:
+com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.z.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.z.a.a.b.x1:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.z.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
@@ -10707,23 +10780,23 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1446 -> next
     3:3:java.util.Map$Entry next():1470 -> next
     3:3:java.lang.Object next():1462 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.z.a.a.b.A1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.z.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.z.a.a.b.y1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.z.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.z.a.a.b.z1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.z.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.z.a.a.b.B1:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.z.a.a.b.C1:
     1:1:void <init>():4112:4112 -> <init>
     java.util.Map map() -> a
     1:1:void clear():4122:4122 -> clear
@@ -10743,11 +10816,11 @@
     4:4:boolean retainAll(java.util.Collection):4166 -> retainAll
     5:11:boolean retainAll(java.util.Collection):4167:4173 -> retainAll
     1:1:int size():4117:4117 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.z.a.a.b.D1:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.z.a.a.b.E1:
     1:1:void <init>():3653:3653 -> <init>
     1:1:java.util.Set entrySet():3666:3666 -> entrySet
     java.util.Iterator entryIterator() -> f
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.z.a.a.b.C1:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.z.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 -> a
@@ -10760,7 +10833,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.z.a.a.b.E1:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.z.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
@@ -10800,7 +10873,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.z.a.a.b.F1:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.z.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
@@ -10861,7 +10934,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.z.a.a.b.G1:
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.z.a.a.b.H1:
     java.util.Collection values -> b
     java.util.Set entrySet -> a
     1:1:void <init>():3612:3612 -> <init>
@@ -10873,31 +10946,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.z.a.a.b.H1:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.z.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.z.a.a.b.I1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.z.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.z.a.a.b.J1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.z.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.z.a.a.b.K1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.z.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.z.a.a.b.M1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.z.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.z.a.a.b.L1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.z.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>
@@ -10910,12 +10983,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.z.a.a.b.N1:
+com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.z.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.z.a.a.b.O1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.z.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
@@ -10933,7 +11006,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.z.a.a.b.R1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.z.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
@@ -10960,17 +11033,17 @@
     4:4:java.util.Iterator iterator():1744 -> iterator
     1:1:java.util.Set elementSet():1786:1786 -> k
     1:1:java.util.Spliterator spliterator():1672:1672 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.z.a.a.b.Q1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.z.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.z.a.a.b.P1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.z.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.z.a.a.b.R1$a:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.z.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 -> a
@@ -10983,7 +11056,7 @@
     1:1:int size():1705:1705 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.Multimaps$Keys.distinctElements():1683:1683 -> size
     2:2:int size():1705 -> size
-com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.z.a.a.b.T1:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.z.a.a.b.U1:
     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
@@ -10995,22 +11068,22 @@
     3:3:void forEach(java.util.function.Consumer):490 -> forEach
     java.util.Set elementSet() -> k
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.z.a.a.b.S1:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.z.a.a.b.T1:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.z.a.a.b.U1:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.z.a.a.b.V1:
     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.z.a.a.b.V1:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.z.a.a.b.W1:
     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.z.a.a.b.X1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.z.a.a.b.Y1:
     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
@@ -11040,25 +11113,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.z.a.a.b.W1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.z.a.a.b.X1:
     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.z.a.a.b.Y1:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.z.a.a.b.Z1:
     1:1:void <init>():1021:1021 -> <init>
     com.android.tools.r8.com.google.common.collect.Multiset multiset() -> a
     1:1:void clear():1061:1061 -> clear
     1:11:boolean contains(java.lang.Object):1026:1036 -> contains
     1:9:boolean remove(java.lang.Object):1045:1053 -> remove
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.z.a.a.b.Z1:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.z.a.a.b.a2:
     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.z.a.a.b.a2:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.z.a.a.b.b2:
     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>
@@ -11072,11 +11145,11 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> compare
     4:4:int compare(java.lang.Comparable,java.lang.Comparable):35 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):25 -> compare
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.z.a.a.b.b2:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.z.a.a.b.c2:
     1:1:void <init>():390:390 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering from(java.util.Comparator):181:181 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Ordering reverse():404:404 -> a
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.z.a.a.b.c2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.z.a.a.b.d2:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> c
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList):35:37 -> <init>
@@ -11088,7 +11161,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:java.util.ListIterator listIterator(int):29 -> listIterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.z.a.a.b.f2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.z.a.a.b.g2:
     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
@@ -11117,8 +11190,8 @@
     boolean isHashCodeFast() -> l
     boolean isPartialView() -> m
     1:1:int size():179:179 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.z.a.a.b.d2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.z.a.a.b.f2$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.z.a.a.b.e2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.z.a.a.b.g2$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>
@@ -11141,7 +11214,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> size
     1:1:int size():199 -> size
     2:2:int size():199:199 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.z.a.a.b.f2$a$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.z.a.a.b.g2$a$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):240:240 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():268:268 -> c
@@ -11152,7 +11225,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():258:258 -> iterator
     2:2:java.util.Iterator iterator():239 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():243:243 -> j
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.z.a.a.b.e2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.z.a.a.b.f2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):268:268 -> <init>
     1:2:java.util.Map$Entry get(int):271:272 -> get
@@ -11161,7 +11234,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 -> h
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.z.a.a.b.g2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.z.a.a.b.h2:
     java.lang.Object[] array -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -11174,7 +11247,7 @@
     2:2:java.util.ListIterator listIterator(int):28 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.z.a.a.b.j2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.z.a.a.b.k2:
     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
@@ -11214,7 +11287,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> k
     boolean isPartialView() -> m
     1:1:int size():159:159 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.z.a.a.b.h2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.z.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):181:182 -> <init>
     boolean isPartialView() -> b
@@ -11223,13 +11296,13 @@
     2:2:boolean contains(java.lang.Object):192 -> contains
     1:1:java.lang.Object get(int):187:187 -> get
     1:1:int size():202:202 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.z.a.a.b.i2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.z.a.a.b.j2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):236:237 -> <init>
     boolean isPartialView() -> b
     1:1:java.lang.Object get(int):242:242 -> get
     1:1:int size():247:247 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.z.a.a.b.l2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.z.a.a.b.m2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset EMPTY -> i
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> e
     int size -> f
@@ -11248,8 +11321,8 @@
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():140:141 -> k
     3:4:java.util.Set elementSet():34 -> k
     1:1:int size():135:135 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.z.a.a.b.k2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.z.a.a.b.l2$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.z.a.a.b.l2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.z.a.a.b.m2$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset):145:145 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset,com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1):145:145 -> <init>
@@ -11259,11 +11332,11 @@
     2:2:boolean contains(java.lang.Object):154 -> contains
     1:1:java.lang.Object get(int):149:149 -> get
     1:1:int size():164:164 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.z.a.a.b.m2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.z.a.a.b.n2:
     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.z.a.a.b.n2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.z.a.a.b.o2:
     java.lang.Object[] table -> d
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> g
     java.lang.Object[] elements -> c
@@ -11284,7 +11357,7 @@
     2:2:java.util.Iterator iterator():30 -> iterator
     1:1:int size():69:69 -> size
     1:1:java.util.Spliterator spliterator():79:79 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.z.a.a.b.o2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.z.a.a.b.p2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet NATURAL_EMPTY_SET -> f
     com.android.tools.r8.com.google.common.collect.ImmutableList elements -> e
     1:2:void <clinit>():44:45 -> <clinit>
@@ -11389,7 +11462,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.z.a.a.b.p2:
+com.android.tools.r8.com.google.common.collect.ReverseNaturalOrdering -> com.android.tools.r8.z.a.a.b.q2:
     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>
@@ -11401,7 +11474,7 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> compare
     3:3:int compare(java.lang.Comparable,java.lang.Comparable):33 -> compare
     3:3:int compare(java.lang.Object,java.lang.Object):26 -> compare
-com.android.tools.r8.com.google.common.collect.ReverseOrdering -> com.android.tools.r8.z.a.a.b.q2:
+com.android.tools.r8.com.google.common.collect.ReverseOrdering -> com.android.tools.r8.z.a.a.b.r2:
     com.android.tools.r8.com.google.common.collect.Ordering forwardOrder -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Ordering):31:32 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering reverse():43:43 -> a
@@ -11409,7 +11482,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.z.a.a.b.s2:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.z.a.a.b.t2:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):744:744 -> <init>
@@ -11421,13 +11494,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.z.a.a.b.r2:
+com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.z.a.a.b.s2:
     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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.z.a.a.b.u2:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.z.a.a.b.v2:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):842:842 -> <init>
@@ -11439,12 +11512,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.z.a.a.b.t2:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.z.a.a.b.u2:
     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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.z.a.a.b.w2:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.z.a.a.b.x2:
     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>
@@ -11457,12 +11530,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.z.a.a.b.v2:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.z.a.a.b.w2:
     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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.z.a.a.b.A2:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.z.a.a.b.B2:
     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>
@@ -11470,31 +11543,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.z.a.a.b.z2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.z.a.a.b.A2:
     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 -> f
     1:29:java.lang.Object computeNext():1688 -> f
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.z.a.a.b.y2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.z.a.a.b.z2:
     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.z.a.a.b.x2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.z.a.a.b.y2:
     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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.z.a.a.b.B2:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.z.a.a.b.C2:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean removeAll(java.util.Collection):80:80 -> removeAll
     1:1:boolean retainAll(java.util.Collection):85:85 -> retainAll
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> retainAll
     2:2:boolean retainAll(java.util.Collection):85 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.z.a.a.b.C2:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.z.a.a.b.D2:
     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
@@ -11504,7 +11577,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.z.a.a.b.D2:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.z.a.a.b.E2:
     java.util.SortedSet unmodifiableDelegate -> b
     java.util.NavigableSet delegate -> a
     com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet descendingSet -> c
@@ -11532,7 +11605,7 @@
     1:2:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1911 -> subSet
     3:3:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1910 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):1921:1921 -> tailSet
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.z.a.a.b.E2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.z.a.a.b.F2:
     java.lang.Object singleValue -> f
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> g
     java.lang.Object singleKey -> e
@@ -11553,7 +11626,7 @@
     1:3:com.android.tools.r8.com.google.common.collect.BiMap inverse():34 -> i
     4:6:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():100:102 -> i
     boolean isPartialView() -> m
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.z.a.a.b.F2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.z.a.a.b.G2:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> b
@@ -11568,7 +11641,7 @@
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> subList
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):65 -> subList
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.z.a.a.b.G2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.z.a.a.b.H2:
     java.lang.Object element -> c
     int cachedHashCode -> d
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -11584,22 +11657,22 @@
     3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> iterator
     3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66 -> iterator
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.z.a.a.b.H2:
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.z.a.a.b.I2:
+com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.z.a.a.b.I2:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.z.a.a.b.J2:
     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.z.a.a.b.J2:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.z.a.a.b.K2:
     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.z.a.a.b.K2:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.z.a.a.b.L2:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.z.a.a.b.L2:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.z.a.a.b.M2:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -11613,17 +11686,17 @@
     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.z.a.a.b.M2:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.z.a.a.b.N2:
     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.z.a.a.b.N2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.z.a.a.b.O2:
     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.z.a.a.b.O2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.z.a.a.b.P2:
     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
@@ -11914,12 +11987,10 @@
     1:3:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):55:57 -> a
     4:4:com.android.tools.r8.com.google.gson.JsonElement createJsonElement(java.lang.Object):122:122 -> a
     4:4:void addProperty(java.lang.String,java.lang.Number):90 -> a
-    5:5:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):57:57 -> a
-    5:5:void addProperty(java.lang.String,java.lang.Number):90 -> a
+    5:5:void addProperty(java.lang.String,java.lang.Number):90:90 -> a
     6:6:com.android.tools.r8.com.google.gson.JsonElement createJsonElement(java.lang.Object):122:122 -> a
     6:6:void addProperty(java.lang.String,java.lang.String):79 -> a
-    7:7:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):57:57 -> a
-    7:7:void addProperty(java.lang.String,java.lang.String):79 -> a
+    7:7:void addProperty(java.lang.String,java.lang.String):79:79 -> a
     8:8:com.android.tools.r8.com.google.gson.JsonElement get(java.lang.String):161:161 -> a
     1:1:com.android.tools.r8.com.google.gson.JsonArray getAsJsonArray(java.lang.String):181:181 -> b
     1:1:boolean has(java.lang.String):151:151 -> c
@@ -12561,10 +12632,10 @@
     253:255:void processDirectory(java.io.File,java.util.List):613:615 -> a
     253:255:void processPath(java.io.File,java.util.List):599 -> a
     256:257:void processPath(java.io.File,java.util.List):602:603 -> a
-    258:259:boolean com.android.tools.r8.utils.FileUtils.isJarFile(java.nio.file.Path):56:57 -> a
+    258:259:boolean com.android.tools.r8.utils.FileUtils.isJarFile(java.nio.file.Path):51:52 -> a
     258:259:void processPath(java.io.File,java.util.List):603 -> a
     260:260:void processPath(java.io.File,java.util.List):603:603 -> a
-    261:262:boolean com.android.tools.r8.utils.FileUtils.isApkFile(java.nio.file.Path):66:67 -> a
+    261:262:boolean com.android.tools.r8.utils.FileUtils.isApkFile(java.nio.file.Path):61:62 -> a
     261:262:void processPath(java.io.File,java.util.List):607 -> a
     263:263:void processPath(java.io.File,java.util.List):608:608 -> a
     264:264:void processPath(java.io.File,java.util.List):604:604 -> a
@@ -12809,7 +12880,7 @@
     135:139:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):205:209 -> a
     140:140:void lambda$readMainDexList$2(com.android.tools.r8.graph.DexApplication$Builder):205:205 -> a
     141:141:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):208:208 -> a
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     142:142:com.android.tools.r8.graph.DexType lambda$readMainDexList$1(java.lang.String):208 -> a
     1:1:com.android.tools.r8.utils.AndroidApp access$300(com.android.tools.r8.dex.ApplicationReader):56:56 -> b
 com.android.tools.r8.dex.ApplicationReader$ClassReader -> com.android.tools.r8.A.a:
@@ -12892,10 +12963,10 @@
     172:180:void write(java.util.concurrent.ExecutorService):369:377 -> a
     181:181:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):305:305 -> a
     182:186:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):316:320 -> a
-    187:187:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():343:343 -> a
+    187:187:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():340:340 -> a
     187:187:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):320 -> a
     188:195:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):323:330 -> a
-    196:196:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():339:339 -> a
+    196:196:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():336:336 -> a
     196:196:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):330 -> a
     197:200:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):334:337 -> a
     201:201:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):336:336 -> a
@@ -12965,10 +13036,10 @@
     496:496:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):649:649 -> a
     497:502:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):645:650 -> a
     1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190:190 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():331:331 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():328:328 -> b
     2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190 -> b
     3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):191:191 -> b
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():343:343 -> b
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():340:340 -> b
     4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):192 -> b
     5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):192:202 -> b
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.A.d:
@@ -13027,6 +13098,8 @@
     14:14:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
     14:14:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
     15:15:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):74:74 -> a
+    16:16:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
+    16:16:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
     1:1:void lambda$new$0(java.util.Map$Entry):31:31 -> b
     1:7:java.lang.String toString():54:60 -> toString
 com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.A.k:
@@ -13037,7 +13110,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):24:25 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26 -> a
     4:6:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
 com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.A.i:
@@ -13377,7 +13450,7 @@
     150:150:void ensureCodesInited(int):159 -> a
     150:150:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):640 -> a
     151:165:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):641:655 -> a
-    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     166:166:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):655 -> a
     167:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):656:659 -> a
     171:171:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
@@ -13664,7 +13737,7 @@
     33:33:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():460 -> c
     34:34:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():460:460 -> c
     1:10:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():364:373 -> d
-    11:11:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):56:56 -> d
+    11:11:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> d
     11:11:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():373 -> d
     12:12:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):475:475 -> d
     13:15:java.lang.Object cacheAt(int,java.util.function.Supplier,java.util.function.Supplier):401:403 -> d
@@ -14167,7 +14240,7 @@
     246:249:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):834:837 -> b
     246:249:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
     250:251:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():227:228 -> b
-    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> b
+    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
     252:252:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228 -> b
     253:258:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228:233 -> b
     259:259:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):828:828 -> b
@@ -14876,6 +14949,8 @@
     22:22:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
     22:22:com.android.tools.r8.dex.Marker internalParse(com.android.tools.r8.dex.Marker$Tool,java.lang.String):168 -> a
     23:23:com.android.tools.r8.dex.Marker internalParse(com.android.tools.r8.dex.Marker$Tool,java.lang.String):169:169 -> a
+    24:24:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
+    24:24:com.android.tools.r8.dex.Marker internalParse(com.android.tools.r8.dex.Marker$Tool,java.lang.String):168 -> a
     1:2:com.android.tools.r8.dex.Marker setSha1(java.lang.String):95:96 -> b
     1:2:com.android.tools.r8.dex.Marker setVersion(java.lang.String):75:76 -> c
     1:3:boolean equals(java.lang.Object):133:135 -> equals
@@ -15951,108 +16026,108 @@
     java.util.Map mayHaveFinalizeMethodDirectlyOrIndirectlyCache -> k
     java.util.Set NO_DIRECT_SUBTYPE -> l
     java.util.Map subtypeMap -> h
-    1:8:void <clinit>():28:35 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):134:134 -> <init>
-    2:23:void <init>(com.android.tools.r8.graph.DexApplication):116:137 -> <init>
-    24:24:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):141:141 -> <init>
-    25:54:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):116:145 -> <init>
-    1:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):150:171 -> a
-    23:46:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):221:244 -> a
-    47:55:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):250:258 -> a
-    56:90:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):263:297 -> a
-    56:90:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):258 -> a
-    91:95:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):327:331 -> a
+    1:8:void <clinit>():27:34 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):133:133 -> <init>
+    2:23:void <init>(com.android.tools.r8.graph.DexApplication):115:136 -> <init>
+    24:24:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):140:140 -> <init>
+    25:54:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):115:144 -> <init>
+    1:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):149:170 -> a
+    23:46:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):219:242 -> a
+    47:55:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):248:256 -> a
+    56:90:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):261:295 -> a
+    56:90:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):256 -> a
+    91:95:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:329 -> a
     96:96:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    96:96:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332 -> a
-    97:97:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332:332 -> a
+    96:96:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330 -> a
+    97:97:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330:330 -> a
     98:98:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    98:98:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332 -> a
-    99:99:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332:332 -> a
+    98:98:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330 -> a
+    99:99:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330:330 -> a
     100:119:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfo.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):208:227 -> a
-    100:119:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):334 -> a
-    120:126:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):356:362 -> a
+    100:119:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332 -> a
+    120:126:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):354:360 -> a
     127:127:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):103:103 -> a
-    127:127:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):362 -> a
-    128:134:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):362:368 -> a
-    135:145:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):390:400 -> a
-    146:146:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():103:103 -> a
-    146:146:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):400 -> a
-    147:156:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):411:420 -> a
+    127:127:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):360 -> a
+    128:134:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):360:366 -> a
+    135:145:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):388:398 -> a
+    146:146:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> a
+    146:146:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):398 -> a
+    147:156:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):409:418 -> a
     157:157:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> a
-    157:157:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):420 -> a
-    158:161:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):421:424 -> a
-    162:162:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):393:393 -> a
-    163:166:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):431:434 -> a
-    167:169:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):439:441 -> a
-    170:185:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):503:518 -> a
-    186:195:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):539:548 -> a
-    196:208:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):624:636 -> a
-    209:218:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):720:729 -> a
-    219:241:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):734:756 -> a
-    242:242:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):457:457 -> a
-    242:242:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):761 -> a
-    243:249:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):761:767 -> a
-    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):206:209 -> b
-    5:53:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):662:710 -> b
-    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):716:716 -> c
-    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):486:489 -> d
-    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:178 -> d
-    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):490 -> d
-    8:16:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):563:571 -> d
-    1:4:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):475:478 -> e
-    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:178 -> e
-    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):479 -> e
-    8:12:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):587:591 -> e
-    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):457:457 -> f
-    2:11:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):522:531 -> f
-    1:1:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):516:516 -> g
-    2:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):641:644 -> g
+    157:157:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):418 -> a
+    158:161:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):419:422 -> a
+    162:162:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):391:391 -> a
+    163:166:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):429:432 -> a
+    167:169:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):437:439 -> a
+    170:185:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):501:516 -> a
+    186:195:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):537:546 -> a
+    196:208:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):622:634 -> a
+    209:229:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):723:743 -> a
+    230:230:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):455:455 -> a
+    230:230:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):748 -> a
+    231:237:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):748:754 -> a
+    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):205:208 -> b
+    5:53:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):660:708 -> b
+    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):714:714 -> c
+    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):484:487 -> d
+    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> d
+    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):488 -> d
+    8:16:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):561:569 -> d
+    1:4:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):473:476 -> e
+    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> e
+    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):477 -> e
+    8:12:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):585:589 -> e
+    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):455:455 -> f
+    2:11:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):520:529 -> f
+    1:1:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):514:514 -> g
+    2:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):639:642 -> g
     6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> g
-    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):644 -> g
+    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642 -> g
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> g
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> g
-    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):644 -> g
-    8:8:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):644:644 -> g
-    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):338:338 -> h
-    2:2:boolean hasSubtyping():446:446 -> h
-    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):470:470 -> i
-    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):609:620 -> j
-    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):619:619 -> j
-    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):465:465 -> k
-    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):595:595 -> l
+    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642 -> g
+    8:8:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642:642 -> g
+    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):336:336 -> h
+    2:2:boolean hasSubtyping():444:444 -> h
+    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):468:468 -> i
+    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):607:618 -> j
+    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):617:617 -> j
+    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):463:463 -> k
+    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):593:593 -> l
     2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):697:701 -> l
-    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):596 -> l
-    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):604:604 -> m
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():452:452 -> n
-    2:2:boolean isUnknown(com.android.tools.r8.graph.DexType):461:461 -> n
-    3:3:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():103:103 -> n
-    3:3:boolean isUnknown(com.android.tools.r8.graph.DexType):461 -> n
-    1:2:java.util.Set getMissingClasses():192:193 -> o
-    3:6:java.util.Set subtypes(com.android.tools.r8.graph.DexType):197:200 -> o
-    1:1:java.util.Set access$000():28:28 -> p
-    2:3:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):215:216 -> p
-    1:1:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):566:566 -> q
-    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):569:569 -> r
-    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):589:589 -> s
-    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):206:206 -> t
+    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):594 -> l
+    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):602:602 -> m
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():450:450 -> n
+    2:2:boolean isUnknown(com.android.tools.r8.graph.DexType):459:459 -> n
+    3:3:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> n
+    3:3:boolean isUnknown(com.android.tools.r8.graph.DexType):459 -> n
+    1:2:java.util.Set getMissingClasses():191:192 -> o
+    3:3:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):718:718 -> o
+    1:1:java.util.Set access$000():27:27 -> p
+    2:5:java.util.Set subtypes(com.android.tools.r8.graph.DexType):196:199 -> p
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):214:214 -> q
+    1:1:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):564:564 -> r
+    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):567:567 -> s
+    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):587:587 -> t
+    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):205:205 -> u
 com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo -> com.android.tools.r8.C.e:
     java.util.Set directSubtypes -> c
     java.util.Set implementedInterfaces -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType type -> a
     int hierarchyLevel -> b
-    1:1:void <clinit>():37:37 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType):51:51 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.DexType):41:52 -> <init>
-    1:11:void setLevel(int):67:77 -> a
-    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):82:85 -> a
-    16:18:boolean isInterface():97:99 -> a
-    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):109:111 -> a
-    1:1:com.android.tools.r8.graph.DexType access$100(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):37:37 -> b
-    2:2:void tagAsInterface():93:93 -> b
-    1:1:void tagAsSubtypeRoot():89:89 -> c
-    1:2:void ensureDirectSubTypeSet():61:62 -> d
-    1:1:java.lang.String toString():57:57 -> toString
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType):50:50 -> <init>
+    2:13:void <init>(com.android.tools.r8.graph.DexType):40:51 -> <init>
+    1:11:void setLevel(int):66:76 -> a
+    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):81:84 -> a
+    16:18:boolean isInterface():96:98 -> a
+    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):108:110 -> a
+    1:1:com.android.tools.r8.graph.DexType access$100(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):36:36 -> b
+    2:2:void tagAsInterface():92:92 -> b
+    1:1:void tagAsSubtypeRoot():88:88 -> c
+    1:2:void ensureDirectSubTypeSet():60:61 -> d
+    1:1:java.lang.String toString():56:56 -> toString
 com.android.tools.r8.graph.AppServices -> com.android.tools.r8.C.i:
     java.util.Map services -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -16099,7 +16174,7 @@
     38:47:boolean lambda$readServiceImplementationsForService$2(com.android.tools.r8.origin.Origin,java.util.List,com.android.tools.r8.graph.DexType):193:202 -> a
     1:2:java.lang.String prefixUntilCommentChar(java.lang.String):209:210 -> b
     1:6:void visit(com.android.tools.r8.DataEntryResource):157:162 -> visit
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> visit
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> visit
     7:7:void visit(com.android.tools.r8.DataEntryResource):162 -> visit
     8:13:void visit(com.android.tools.r8.DataEntryResource):163:168 -> visit
     14:19:void visit(com.android.tools.r8.DataEntryResource):167:172 -> visit
@@ -16377,7 +16452,8 @@
     2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):68 -> f
     1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):61:63 -> g
     1:1:com.android.tools.r8.graph.ClassAccessFlags copy():77:77 -> z
-com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.C.t:
+com.android.tools.r8.graph.ClassHierarchy -> com.android.tools.r8.C.s:
+com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.C.u:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set visited -> c
@@ -16391,7 +16467,7 @@
     com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
     1:22:void visit(java.lang.Iterable,java.util.function.Consumer):65:86 -> a
     23:36:void visit(java.lang.Iterable,java.util.function.Consumer):69:82 -> a
-com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> com.android.tools.r8.C.s:
+com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> com.android.tools.r8.C.t:
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ALL_CLASSES -> a
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_LIBRARY_CLASSES -> b
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_LIBRARY_AND_CLASSPATH_CLASSES -> c
@@ -16400,7 +16476,7 @@
     1:4:void <clinit>():19:22 -> <clinit>
     5:5:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):18:18 -> <init>
-com.android.tools.r8.graph.ClassKind -> com.android.tools.r8.C.v:
+com.android.tools.r8.graph.ClassKind -> com.android.tools.r8.C.w:
     com.android.tools.r8.graph.ClassKind CLASSPATH -> d
     com.android.tools.r8.graph.ClassKind LIBRARY -> e
     java.util.function.Predicate check -> b
@@ -16416,9 +16492,9 @@
     5:5:boolean isOfKind(com.android.tools.r8.graph.DexClass):87:87 -> a
     5:5:void lambda$bridgeConsumer$0(java.util.function.Consumer,com.android.tools.r8.graph.DexClass):92 -> a
     6:8:void lambda$bridgeConsumer$0(java.util.function.Consumer,com.android.tools.r8.graph.DexClass):92:94 -> a
-com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.C.u:
+com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.C.v:
     com.android.tools.r8.graph.DexClass create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.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) -> a
-com.android.tools.r8.graph.Code -> com.android.tools.r8.C.w:
+com.android.tools.r8.graph.Code -> com.android.tools.r8.C.x:
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin) -> a
     void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry) -> a
@@ -16436,7 +16512,7 @@
     boolean isCfCode() -> m
     boolean isDexCode() -> n
     boolean isOutlineCode() -> o
-com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.C.y:
+com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.C.z:
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexString signature -> c
     com.android.tools.r8.graph.DexType type -> b
@@ -16454,7 +16530,7 @@
     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.C.x:
+com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> com.android.tools.r8.C.y:
     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
@@ -16462,7 +16538,7 @@
     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.DefaultUseRegistry -> com.android.tools.r8.C.z:
+com.android.tools.r8.graph.DefaultUseRegistry -> com.android.tools.r8.C.A:
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):10:10 -> <init>
     boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField) -> a
     boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod) -> a
@@ -16475,10 +16551,10 @@
     boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> d
     boolean registerTypeReference(com.android.tools.r8.graph.DexType) -> d
     boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> e
-com.android.tools.r8.graph.Descriptor -> com.android.tools.r8.C.A:
+com.android.tools.r8.graph.Descriptor -> com.android.tools.r8.C.B:
     1:1:void <init>():6:6 -> <init>
     boolean match(com.android.tools.r8.graph.DexItem) -> a
-com.android.tools.r8.graph.DexAnnotation -> com.android.tools.r8.C.B:
+com.android.tools.r8.graph.DexAnnotation -> com.android.tools.r8.C.C:
     com.android.tools.r8.graph.DexEncodedAnnotation annotation -> b
     com.android.tools.r8.graph.DexAnnotation[] EMPTY_ARRAY -> c
     boolean $assertionsDisabled -> d
@@ -16506,7 +16582,7 @@
     62:66:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):232 -> a
     67:67:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):231:231 -> a
     68:69:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):236:237 -> a
-    70:70:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():952:952 -> a
+    70:70:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> a
     70:70:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):238 -> a
     71:74:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):238:241 -> a
     75:75:com.android.tools.r8.graph.DexAnnotation createThrowsAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):246:246 -> a
@@ -16516,7 +16592,7 @@
     93:93:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
     93:93:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):351 -> a
     94:103:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):351:360 -> a
-    104:104:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():952:952 -> a
+    104:104:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> a
     104:104:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):361 -> a
     105:110:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):361:366 -> a
     111:112:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):363:364 -> a
@@ -16543,25 +16619,24 @@
     152:152:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):378 -> a
     153:154:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):378:379 -> a
     155:161:com.android.tools.r8.graph.DexAnnotation createAnnotationSynthesizedClassMap(java.util.TreeSet,com.android.tools.r8.graph.DexItemFactory):385:391 -> a
-    162:169:com.android.tools.r8.graph.DexAnnotation rewrite(java.util.function.Function):403:410 -> a
     1:4:com.android.tools.r8.graph.DexMethod getEnclosingMethodFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):115:118 -> b
     5:5:com.android.tools.r8.graph.DexValue$DexValueType[] lambda$createAnnotationSynthesizedClassMap$0(int):387:387 -> b
     1:3:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):157:159 -> c
     4:4:void com.android.tools.r8.utils.Pair.<init>():20:20 -> c
     4:4:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):159 -> c
     5:8:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):160:163 -> c
-    9:9:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():699:699 -> c
+    9:9:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():683:683 -> c
     9:9:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$DexValueString.getValue():0 -> c
     9:9:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):163 -> c
     10:14:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):163:167 -> c
-    15:15:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():462:462 -> c
+    15:15:int com.android.tools.r8.graph.DexValue$DexValueInt.getValue():446:446 -> c
     15:15:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):167 -> c
     16:16:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):167:167 -> c
     1:6:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):185:190 -> d
-    7:7:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():952:952 -> d
+    7:7:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> d
     7:7:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):190 -> d
     8:8:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):190:190 -> d
-    9:9:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():952:952 -> d
+    9:9:com.android.tools.r8.graph.DexValue[] com.android.tools.r8.graph.DexValue$DexValueArray.getValues():926:926 -> d
     9:9:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):191 -> d
     10:11:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):191:192 -> d
     1:1:boolean isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):123:123 -> e
@@ -16573,7 +16648,7 @@
     1:1:int hashCode():45:45 -> hashCode
     1:1:boolean isSignatureAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):273:273 -> i
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.graph.DexAnnotationDirectory -> com.android.tools.r8.C.C:
+com.android.tools.r8.graph.DexAnnotationDirectory -> com.android.tools.r8.C.D:
     java.util.List methodAnnotations -> b
     java.util.List fieldAnnotations -> d
     com.android.tools.r8.graph.DexProgramClass clazz -> a
@@ -16593,7 +16668,7 @@
     1:1:java.util.List getFieldAnnotations():66:66 -> i
     1:1:java.util.List getMethodAnnotations():58:58 -> j
     1:1:java.util.List getParameterAnnotations():62:62 -> k
-com.android.tools.r8.graph.DexAnnotationElement -> com.android.tools.r8.C.D:
+com.android.tools.r8.graph.DexAnnotationElement -> com.android.tools.r8.C.E:
     com.android.tools.r8.graph.DexAnnotationElement[] EMPTY_ARRAY -> c
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexValue value -> b
@@ -16610,7 +16685,7 @@
     1:3:boolean equals(java.lang.Object):30:32 -> equals
     1:1:int hashCode():22:22 -> hashCode
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.graph.DexAnnotationSet -> com.android.tools.r8.C.E:
+com.android.tools.r8.graph.DexAnnotationSet -> com.android.tools.r8.C.F:
     boolean $assertionsDisabled -> g
     int sorted -> d
     com.android.tools.r8.graph.DexAnnotationSet[] EMPTY_ARRAY -> e
@@ -16620,29 +16695,29 @@
     1:1:void <init>(com.android.tools.r8.graph.DexAnnotation[]):27:27 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DexAnnotation[]):25:28 -> <init>
     1:1:com.android.tools.r8.graph.DexType findDuplicateEntryType(com.android.tools.r8.graph.DexAnnotation[]):32:32 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):70:70 -> a
-    3:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):75:76 -> a
-    5:5:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):88:88 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> a
+    3:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):71:72 -> a
+    5:5:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):84:84 -> a
     6:6:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
-    6:6:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):88 -> a
-    7:8:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):96:97 -> a
-    9:9:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):146:146 -> a
-    10:10:com.android.tools.r8.graph.DexAnnotation lambda$keepIf$1(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):146:146 -> a
-    11:18:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):150:157 -> a
+    6:6:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):84 -> a
+    7:8:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):92:93 -> a
+    9:9:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):142:142 -> a
+    10:10:com.android.tools.r8.graph.DexAnnotation lambda$keepIf$1(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):142:142 -> a
+    11:18:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):146:153 -> a
     19:19:com.android.tools.r8.graph.DexAnnotationSet empty():46:46 -> a
-    19:19:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):158 -> a
-    20:20:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):160:160 -> a
+    19:19:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):154 -> a
+    20:20:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):156:156 -> a
     1:4:com.android.tools.r8.graph.DexType findDuplicateEntryType(java.util.List):36:39 -> b
-    5:7:boolean computeEquals(java.lang.Object):60:62 -> b
-    1:1:int computeHashCode():55:55 -> h
-    1:1:boolean isEmpty():80:80 -> i
-    1:2:void sort():84:85 -> j
-    3:3:int sortedHashCode():121:121 -> j
-    3:3:void sort():85 -> j
-    4:11:void sort():85:92 -> j
+    5:7:boolean computeEquals(java.lang.Object):56:58 -> b
+    1:1:int computeHashCode():51:51 -> h
+    1:1:boolean isEmpty():76:76 -> i
+    1:2:void sort():80:81 -> j
+    3:3:int sortedHashCode():117:117 -> j
+    3:3:void sort():81 -> j
+    4:11:void sort():81:88 -> j
     1:1:com.android.tools.r8.graph.DexAnnotationSet empty():46:46 -> k
-    1:1:java.lang.String toString():165:165 -> toString
-com.android.tools.r8.graph.DexApplication -> com.android.tools.r8.C.F:
+    1:1:java.lang.String toString():161:161 -> toString
+com.android.tools.r8.graph.DexApplication -> com.android.tools.r8.C.G:
     com.android.tools.r8.dex.ClassesChecksum checksums -> g
     com.android.tools.r8.naming.ClassNameMapper proguardMap -> c
     boolean $assertionsDisabled -> i
@@ -16668,7 +16743,7 @@
     1:1:com.android.tools.r8.naming.ClassNameMapper getProguardMap():123:123 -> e
     java.util.List programClasses() -> f
     com.android.tools.r8.graph.DirectMappedDexApplication toDirect() -> g
-com.android.tools.r8.graph.DexApplication$Builder -> com.android.tools.r8.C.F$a:
+com.android.tools.r8.graph.DexApplication$Builder -> com.android.tools.r8.C.G$a:
     java.util.List dataResourceProviders -> b
     com.android.tools.r8.utils.Timing timing -> g
     java.util.List programClasses -> a
@@ -16703,12 +16778,12 @@
     1:1:java.util.Collection getProgramClasses():211:211 -> c
     1:1:java.util.Collection getSynthesizedClasses():215:215 -> d
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.DexApplication$ReorderBox -> com.android.tools.r8.C.G:
+com.android.tools.r8.graph.DexApplication$ReorderBox -> com.android.tools.r8.C.H:
     java.util.List classes -> a
     1:2:void <init>(java.util.List):74:75 -> <init>
     1:1:java.util.List getClasses():88:88 -> a
     1:3:boolean reorderClasses():80:82 -> b
-com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.C.I:
+com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.C.J:
     com.android.tools.r8.graph.DexString methodName -> e
     com.android.tools.r8.graph.DexMethod method -> j
     int instructionOffset -> k
@@ -16751,8 +16826,8 @@
     8:8:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     8:8:java.lang.String toString():107 -> toString
     9:16:java.lang.String toString():107:114 -> toString
-com.android.tools.r8.graph.DexCallSite$1 -> com.android.tools.r8.C.H:
-com.android.tools.r8.graph.DexCallSite$HashBuilder -> com.android.tools.r8.C.I$a:
+com.android.tools.r8.graph.DexCallSite$1 -> com.android.tools.r8.C.I:
+com.android.tools.r8.graph.DexCallSite$HashBuilder -> com.android.tools.r8.C.J$a:
     java.io.ByteArrayOutputStream bytes -> a
     com.android.tools.r8.graph.DexCallSite this$0 -> c
     java.io.ObjectOutputStream out -> b
@@ -16796,7 +16871,7 @@
     35:35:void write(java.util.List):225 -> a
     36:68:void write(java.util.List):229:261 -> a
     69:85:java.lang.String build():267:283 -> a
-com.android.tools.r8.graph.DexClass -> com.android.tools.r8.C.L:
+com.android.tools.r8.graph.DexClass -> com.android.tools.r8.C.M:
     com.android.tools.r8.graph.DexEncodedField[] instanceFields -> j
     com.android.tools.r8.graph.DexEncodedField[] staticFields -> i
     com.android.tools.r8.graph.DexTypeList interfaces -> f
@@ -16820,48 +16895,41 @@
     2:81:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):40:119 -> <init>
     82:82:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):109:109 -> <init>
     1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():654:663 -> A
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():814:814 -> B
-    1:1:java.util.List getInnerClasses():810:810 -> C
-    1:1:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():836 -> C
-    2:3:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():836:837 -> C
-    1:1:java.util.List getInnerClasses():810:810 -> D
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():810:810 -> B
+    1:1:java.util.List getInnerClasses():806:806 -> C
+    1:1:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():832 -> C
+    2:3:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():832:833 -> C
+    1:1:java.util.List getInnerClasses():806:806 -> D
     com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> E
-    1:5:com.android.tools.r8.graph.DexType getNestHost():898:902 -> F
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():908:908 -> G
-    1:1:java.util.List getNestMembersClassAttributes():912:912 -> H
+    1:5:com.android.tools.r8.graph.DexType getNestHost():894:898 -> F
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():904:904 -> G
+    1:1:java.util.List getNestMembersClassAttributes():908:908 -> H
     1:1:com.android.tools.r8.graph.DexType getType():671:671 -> I
     1:1:boolean hasClassInitializer():675:675 -> J
     1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():693:693 -> K
     1:1:boolean hasDefaultInitializer():679 -> K
-    1:1:boolean hasKotlinInfo():919:919 -> L
-    1:2:boolean hasStaticSynchronizedMethods():933:934 -> M
-    3:3:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> M
-    3:3:boolean hasStaticSynchronizedMethods():934 -> M
-    4:4:boolean hasStaticSynchronizedMethods():934:934 -> M
-    5:5:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> M
-    5:5:boolean hasStaticSynchronizedMethods():934 -> M
-    1:5:java.util.List instanceFields():454:458 -> N
-    1:1:boolean isAbstract():589:589 -> O
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isAbstract():137:137 -> O
-    2:2:boolean isAbstract():589 -> O
-    1:4:boolean isAnonymousClass():870:873 -> P
-    boolean isClasspathClass() -> Q
-    1:1:boolean isEnum():597:597 -> R
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isEnum():161:161 -> R
-    2:2:boolean isEnum():597 -> R
-    1:1:boolean isInANest():877:877 -> S
-    1:1:boolean isInterface():593:593 -> T
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> T
-    2:2:boolean isInterface():593 -> T
-    boolean isLibraryClass() -> U
-    1:3:boolean isLocalClass():857:859 -> V
-    1:3:boolean isMemberClass():863:865 -> W
-    4:4:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():814:814 -> W
-    4:4:boolean isMemberClass():865 -> W
-    5:5:boolean isMemberClass():865:865 -> W
-    1:1:boolean isNestHost():890:890 -> X
-    1:1:boolean isNestMember():894:894 -> Y
-    boolean isNotProgramClass() -> Z
+    1:1:boolean hasKotlinInfo():915:915 -> L
+    1:5:java.util.List instanceFields():454:458 -> M
+    1:1:boolean isAbstract():589:589 -> N
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isAbstract():137:137 -> N
+    2:2:boolean isAbstract():589 -> N
+    1:4:boolean isAnonymousClass():866:869 -> O
+    boolean isClasspathClass() -> P
+    1:1:boolean isInANest():873:873 -> Q
+    1:1:boolean isInterface():593:593 -> R
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> R
+    2:2:boolean isInterface():593 -> R
+    boolean isLibraryClass() -> S
+    1:3:boolean isLocalClass():853:855 -> T
+    1:3:boolean isMemberClass():859:861 -> U
+    4:4:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():810:810 -> U
+    4:4:boolean isMemberClass():861 -> U
+    5:5:boolean isMemberClass():861:861 -> U
+    1:1:boolean isNestHost():886:886 -> V
+    1:1:boolean isNestMember():890:890 -> W
+    boolean isNotProgramClass() -> X
+    boolean isProgramClass() -> Y
+    1:1:java.lang.Iterable methods():135:135 -> Z
     java.util.Iterator lambda$allImmediateSupertypes$3(java.util.Iterator) -> a
     1:3:java.lang.Iterable fields(java.util.function.Predicate):129:131 -> a
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
@@ -16893,12 +16961,12 @@
     94:102:boolean hasClassInitializerThatCannotBePostponed():763:771 -> a
     94:102:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):753 -> a
     103:106:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):756:759 -> a
-    107:107:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$4(com.android.tools.r8.graph.DexEncodedField):806:806 -> a
-    108:108:java.util.List getInnerClasses():810:810 -> a
-    108:108:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):845 -> a
-    109:117:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):845:853 -> a
-    118:119:void setNestHost(com.android.tools.r8.graph.DexType):885:886 -> a
-    boolean isProgramClass() -> a0
+    107:107:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$4(com.android.tools.r8.graph.DexEncodedField):802:802 -> a
+    108:108:java.util.List getInnerClasses():806:806 -> a
+    108:108:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):841 -> a
+    109:117:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):841:849 -> a
+    118:119:void setNestHost(com.android.tools.r8.graph.DexType):881:882 -> a
+    1:5:java.util.List staticFields():396:400 -> a0
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> b
     1:5:void removeDirectMethod(int):182:186 -> b
     6:11:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):212:217 -> b
@@ -16921,17 +16989,17 @@
     51:52:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):570 -> b
     53:53:boolean isSerializable(com.android.tools.r8.graph.AppView):729:729 -> b
     54:59:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):789:794 -> b
-    60:60:boolean isValid(com.android.tools.r8.utils.InternalOptions):923:923 -> b
+    60:60:boolean isValid(com.android.tools.r8.utils.InternalOptions):919:919 -> b
     61:65:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):272:276 -> b
-    61:65:boolean isValid(com.android.tools.r8.utils.InternalOptions):923 -> b
-    66:67:boolean isValid(com.android.tools.r8.utils.InternalOptions):924:925 -> b
+    61:65:boolean isValid(com.android.tools.r8.utils.InternalOptions):919 -> b
+    66:67:boolean isValid(com.android.tools.r8.utils.InternalOptions):920:921 -> b
     68:68:java.lang.Iterable fields():125:125 -> b
-    68:68:boolean isValid(com.android.tools.r8.utils.InternalOptions):925 -> b
-    69:71:boolean isValid(com.android.tools.r8.utils.InternalOptions):925:927 -> b
+    68:68:boolean isValid(com.android.tools.r8.utils.InternalOptions):921 -> b
+    69:71:boolean isValid(com.android.tools.r8.utils.InternalOptions):921:923 -> b
     72:72:java.lang.Iterable methods():135:135 -> b
-    72:72:boolean isValid(com.android.tools.r8.utils.InternalOptions):927 -> b
-    73:74:boolean isValid(com.android.tools.r8.utils.InternalOptions):927:928 -> b
-    1:1:java.lang.Iterable methods():135:135 -> b0
+    72:72:boolean isValid(com.android.tools.r8.utils.InternalOptions):923 -> b
+    73:74:boolean isValid(com.android.tools.r8.utils.InternalOptions):923:924 -> b
+    1:5:java.util.List virtualMethods():204:208 -> b0
     1:3:java.lang.Iterable methods(java.util.function.Predicate):139:141 -> c
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
     4:4:java.lang.Iterable methods(java.util.function.Predicate):139 -> c
@@ -16940,19 +17008,17 @@
     15:15:int lambda$virtualMethodsSorted$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):324:324 -> c
     16:16:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):531:531 -> c
     17:17:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):565:565 -> c
-    1:5:java.util.List staticFields():396:400 -> c0
-    1:2:void removeEnclosingMethod(java.util.function.Predicate):822:823 -> d
-    1:5:java.util.List virtualMethods():204:208 -> d0
-    1:1:void removeInnerClasses(java.util.function.Predicate):832:832 -> e
-    1:3:com.android.tools.r8.graph.DexEncodedMethod[] virtualMethodsSorted():321:323 -> e0
-    1:1:boolean verifyNoDuplicateFields():521:521 -> f0
-    2:2:java.lang.Iterable fields():125:125 -> f0
-    2:2:boolean verifyNoDuplicateFields():522 -> f0
-    3:5:boolean verifyNoDuplicateFields():522:524 -> f0
-    1:1:boolean verifyNoDuplicateMethods():284:284 -> g0
-    2:2:java.lang.Iterable methods():135:135 -> g0
-    2:2:boolean verifyNoDuplicateMethods():285 -> g0
-    3:5:boolean verifyNoDuplicateMethods():285:287 -> g0
+    1:3:com.android.tools.r8.graph.DexEncodedMethod[] virtualMethodsSorted():321:323 -> c0
+    1:2:void removeEnclosingMethod(java.util.function.Predicate):818:819 -> d
+    1:1:boolean verifyNoDuplicateFields():521:521 -> d0
+    2:2:java.lang.Iterable fields():125:125 -> d0
+    2:2:boolean verifyNoDuplicateFields():522 -> d0
+    3:5:boolean verifyNoDuplicateFields():522:524 -> d0
+    1:1:void removeInnerClasses(java.util.function.Predicate):828:828 -> e
+    1:1:boolean verifyNoDuplicateMethods():284:284 -> e0
+    2:2:java.lang.Iterable methods():135:135 -> e0
+    2:2:boolean verifyNoDuplicateMethods():285 -> e0
+    3:5:boolean verifyNoDuplicateMethods():285:287 -> e0
     com.android.tools.r8.graph.DexClass asDexClass() -> h
     boolean isDexClass() -> k
     boolean isStaticMember() -> n
@@ -16963,30 +17029,30 @@
     1:6:com.android.tools.r8.graph.DexEncodedMethod[] allMethodsSorted():302:307 -> q
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> r
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> s
-    1:1:void clearEnclosingMethod():818:818 -> t
-    1:1:void clearInnerClasses():828:828 -> u
-    1:1:void clearNestHost():881:881 -> v
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():805:806 -> w
+    1:1:void clearEnclosingMethod():814:814 -> t
+    1:1:void clearInnerClasses():824:824 -> u
+    1:1:void clearNestHost():877:877 -> v
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():801:802 -> w
     1:5:java.util.List directMethods():150:154 -> x
     1:3:com.android.tools.r8.graph.DexEncodedMethod[] directMethodsSorted():313:315 -> y
     1:1:java.lang.Iterable fields():125:125 -> z
-com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.C.J:
+com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.C.K:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.graph.DexClass$MethodSetter -> com.android.tools.r8.C.K:
+com.android.tools.r8.graph.DexClass$MethodSetter -> com.android.tools.r8.C.L:
     void setMethod(int,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.C.M:
+com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.C.N:
     boolean $assertionsDisabled -> s
     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>
     1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():90:90 -> E
-    boolean isClasspathClass() -> Q
-    boolean isNotProgramClass() -> Z
+    boolean isClasspathClass() -> P
+    boolean isNotProgramClass() -> X
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):59:59 -> a
     1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):70:70 -> b
     1:1:java.lang.String toString():64:64 -> toString
     2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():64 -> toString
-com.android.tools.r8.graph.DexCode -> com.android.tools.r8.C.Q:
+com.android.tools.r8.graph.DexCode -> com.android.tools.r8.C.S:
     com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> k
     boolean $assertionsDisabled -> l
     com.android.tools.r8.code.Instruction[] instructions -> h
@@ -17052,7 +17118,7 @@
     2:11:com.android.tools.r8.graph.DexCode withoutThisParameter():81 -> r
     12:12:com.android.tools.r8.graph.DexCode withoutThisParameter():81:81 -> r
     1:1:java.lang.String toString():262:262 -> toString
-com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.C.N:
+com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.C.O:
     boolean $assertionsDisabled -> e
     int handlerIndex -> d
     int startAddress -> b
@@ -17071,7 +17137,7 @@
     4:4:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(int,int):215:215 -> toString
     4:4:java.lang.String toString():495 -> toString
     5:5:java.lang.String toString():495:495 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.C.P:
+com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.C.Q:
     com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] pairs -> a
     int catchAllAddr -> b
     boolean $assertionsDisabled -> c
@@ -17088,7 +17154,7 @@
     15:15:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(int,int):215:215 -> toString
     15:15:java.lang.String toString():571 -> toString
     16:20:java.lang.String toString():571:575 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.C.O:
+com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.C.P:
     com.android.tools.r8.graph.DexType type -> a
     int addr -> b
     boolean $assertionsDisabled -> c
@@ -17098,7 +17164,7 @@
     2:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):597:597 -> a
     1:3:boolean equals(java.lang.Object):610:612 -> equals
     1:1:int hashCode():602:602 -> hashCode
-com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.C.S:
+com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.C.T:
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexString sourceFile -> d
     boolean $assertionsDisabled -> j
@@ -17116,7 +17182,7 @@
     6:6:java.lang.String toString(boolean):57 -> a
     7:40:java.lang.String toString(boolean):57:90 -> a
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.graph.DexDebugEntryBuilder -> com.android.tools.r8.C.V:
+com.android.tools.r8.graph.DexDebugEntryBuilder -> com.android.tools.r8.C.W:
     com.android.tools.r8.graph.DexDebugPositionState positionState -> h
     java.util.Map locals -> c
     boolean $assertionsDisabled -> i
@@ -17161,13 +17227,13 @@
     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.C.T:
-com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> com.android.tools.r8.C.U:
+com.android.tools.r8.graph.DexDebugEntryBuilder$1 -> com.android.tools.r8.C.U:
+com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> com.android.tools.r8.C.V:
     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.C.g0:
+com.android.tools.r8.graph.DexDebugEvent -> com.android.tools.r8.C.h0:
     com.android.tools.r8.graph.DexDebugEvent[] EMPTY_ARRAY -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -17175,7 +17241,7 @@
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> 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.C.W:
+com.android.tools.r8.graph.DexDebugEvent$AdvanceLine -> com.android.tools.r8.C.X:
     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
@@ -17183,7 +17249,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.C.X:
+com.android.tools.r8.graph.DexDebugEvent$AdvancePC -> com.android.tools.r8.C.Y:
     int delta -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():41:41 -> <clinit>
@@ -17193,7 +17259,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.C.Y:
+com.android.tools.r8.graph.DexDebugEvent$Default -> com.android.tools.r8.C.Z:
     int value -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():426:426 -> <clinit>
@@ -17205,7 +17271,7 @@
     1:1:int hashCode():462:462 -> hashCode
     1:2:int getPCDelta():446:447 -> i
     1:1:java.lang.String toString():457:457 -> toString
-com.android.tools.r8.graph.DexDebugEvent$EndLocal -> com.android.tools.r8.C.Z:
+com.android.tools.r8.graph.DexDebugEvent$EndLocal -> com.android.tools.r8.C.a0:
     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
@@ -17213,7 +17279,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.C.a0:
+com.android.tools.r8.graph.DexDebugEvent$RestartLocal -> com.android.tools.r8.C.b0:
     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
@@ -17221,12 +17287,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.C.b0:
+com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin -> com.android.tools.r8.C.c0:
     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.C.c0:
+com.android.tools.r8.graph.DexDebugEvent$SetFile -> com.android.tools.r8.C.d0:
     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
@@ -17237,7 +17303,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.C.d0:
+com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame -> com.android.tools.r8.C.e0:
     com.android.tools.r8.graph.DexMethod callee -> b
     com.android.tools.r8.ir.code.Position caller -> c
     boolean $assertionsDisabled -> d
@@ -17248,12 +17314,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.C.e0:
+com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd -> com.android.tools.r8.C.f0:
     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.C.f0:
+com.android.tools.r8.graph.DexDebugEvent$StartLocal -> com.android.tools.r8.C.g0:
     com.android.tools.r8.graph.DexString name -> c
     com.android.tools.r8.graph.DexString signature -> e
     com.android.tools.r8.graph.DexType type -> d
@@ -17270,7 +17336,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.C.h0:
+com.android.tools.r8.graph.DexDebugEventBuilder -> com.android.tools.r8.C.i0:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexItemFactory factory -> b
     int startLine -> l
@@ -17337,7 +17403,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.C.i0:
+com.android.tools.r8.graph.DexDebugEventVisitor -> com.android.tools.r8.C.j0:
     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
@@ -17348,7 +17414,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.C.j0:
+com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.C.k0:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexDebugEvent[] events -> e
     int startLine -> c
@@ -17361,12 +17427,12 @@
     1:9:boolean computeEquals(java.lang.Object):44:52 -> b
     1:3:int computeHashCode():37:39 -> h
     1:8:java.lang.String toString():71:78 -> toString
-com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.C.k0:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.C.l0:
     1:4:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:20 -> <init>
     5: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.C.l0:
+com.android.tools.r8.graph.DexDebugPositionState -> com.android.tools.r8.C.m0:
     com.android.tools.r8.graph.DexString currentFile -> c
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod currentMethod -> d
@@ -17391,7 +17457,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.C.m0:
+com.android.tools.r8.graph.DexDefinition -> com.android.tools.r8.C.n0:
     1:1:void <init>():13:13 -> <init>
     1:1:java.util.stream.Stream filterDexEncodedField(java.util.stream.Stream):71:71 -> a
     2:2:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):63:63 -> a
@@ -17407,10 +17473,10 @@
     boolean isDexEncodedMethod() -> m
     boolean isStaticMember() -> n
     com.android.tools.r8.graph.DexReference toReference() -> o
-com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.C.n0:
+com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.C.o0:
     com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexItemFactory dexItemFactory() -> a
-com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.C.o0:
+com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.C.p0:
     com.android.tools.r8.graph.DexAnnotationElement[] elements -> b
     com.android.tools.r8.graph.DexType type -> a
     int sorted -> c
@@ -17423,7 +17489,6 @@
     4:4:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):66:66 -> a
     5:5:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
     5:5:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):66 -> a
-    6:12:com.android.tools.r8.graph.DexEncodedAnnotation rewrite(java.util.function.Function,java.util.function.Function):81:87 -> a
     1:3:boolean equals(java.lang.Object):54:56 -> equals
     1:2:void sort():62:63 -> h
     3:3:int sortedHashCode():74:74 -> h
@@ -17434,7 +17499,7 @@
     11:11:void sort():70:70 -> h
     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.C.p0:
+com.android.tools.r8.graph.DexEncodedArray -> com.android.tools.r8.C.q0:
     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 -> a
@@ -17442,7 +17507,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.C.q0:
+com.android.tools.r8.graph.DexEncodedField -> com.android.tools.r8.C.r0:
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
     com.android.tools.r8.graph.DexEncodedField[] EMPTY_ARRAY -> f
     com.android.tools.r8.graph.DexField field -> a
@@ -17456,7 +17521,7 @@
     1:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):37:39 -> a
     4:4:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):59:59 -> a
     5:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):65:66 -> a
-    7:7:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):70:70 -> a
+    7:7:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> a
     7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66 -> a
     8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67:67 -> a
     9:9:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
@@ -17471,10 +17536,10 @@
     27:27:boolean com.android.tools.r8.graph.AccessFlags.isFinal():175:175 -> a
     27:27:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):162 -> a
     28:34:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):162:168 -> a
-    35:35:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):166:166 -> a
+    35:35:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> a
     35:35:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):168 -> a
     36:36:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):169:169 -> a
-    37:37:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):166:166 -> a
+    37:37:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> a
     37:37:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):168 -> a
     38:54:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):179:195 -> a
     55:55:boolean mayTriggerClassInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):194:194 -> a
@@ -17505,7 +17570,7 @@
     1:1:boolean isStatic():114:114 -> v
     2:2:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> v
     2:2:boolean isStatic():114 -> v
-com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.C.y0:
+com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.C.z0:
     com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo callSiteOptimizationInfo -> h
     boolean obsolete -> m
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
@@ -17598,8 +17663,8 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):80:80 -> a
     2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):80:80 -> a
     3:5:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):235:237 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1055 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
     6:6:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317 -> a
     7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318:1318 -> a
     8:8:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
@@ -17716,14 +17781,14 @@
     304:306:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
     307:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):729:733 -> a
     307:311:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
-    312:312:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    312:312:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     312:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):736 -> a
     312:312:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
     313:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):736:736 -> a
     313:313:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
     314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):735:735 -> a
     314:314:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
-    315:315:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    315:315:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     315:315:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):737 -> a
     315:315:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):707 -> a
     316:319:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):738:741 -> a
@@ -17745,7 +17810,7 @@
     342:344:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
     345:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):763:765 -> a
     345:347:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
-    348:348:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    348:348:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     348:348:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):766 -> a
     348:348:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
     349:353:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):767:771 -> a
@@ -17754,7 +17819,7 @@
     354:362:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
     363:363:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):773:773 -> a
     363:363:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
-    364:364:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    364:364:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     364:364:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):777 -> a
     364:364:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
     365:368:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):778:781 -> a
@@ -17776,7 +17841,7 @@
     401:401:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
     402:406:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):714:718 -> a
     407:411:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):717:721 -> a
-    412:412:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    412:412:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     412:412:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):721 -> a
     413:413:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):721:721 -> a
     414:415:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):816:817 -> a
@@ -17959,12 +18024,12 @@
     1:9:com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo getMutableCallSiteOptimizationInfo(com.android.tools.r8.graph.AppView):1177:1185 -> x
     1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1158:1162 -> y
     1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1153:1154 -> z
-com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.C.r0:
+com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.C.s0:
     int[] $SwitchMap$com$android$tools$r8$ir$optimize$Inliner$Constraint -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexEncodedMethod$CompilationState -> a
     1:1:void <clinit>():427:427 -> <clinit>
     2:2:void <clinit>():379:379 -> <clinit>
-com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.C.s0:
+com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.C.t0:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
     com.android.tools.r8.graph.Code code -> e
@@ -17996,10 +18061,10 @@
     2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():216:216 -> c
     2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1273 -> c
     1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1278:1282 -> d
-com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> com.android.tools.r8.C.t0:
+com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> com.android.tools.r8.C.u0:
     boolean returnsReceiver -> a
     1:2:void <init>(boolean):1102:1103 -> <init>
-com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.C.u0:
+com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.C.v0:
     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
@@ -18012,21 +18077,21 @@
     25:25:void <clinit>():90:90 -> <clinit>
     1:1:void <init>(java.lang.String,int):90:90 -> <init>
     1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():90:90 -> a
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> com.android.tools.r8.C.x0:
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> com.android.tools.r8.C.y0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):1107:1107 -> <init>
     2:2:void <init>():1109:1109 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
     boolean isTrivialInstanceInitializer() -> b
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> com.android.tools.r8.C.v0:
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> com.android.tools.r8.C.w0:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):1141:1142 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.C.w0:
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.C.x0:
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer INSTANCE -> a
     1:1:void <clinit>():1124:1124 -> <clinit>
     1:1:void <init>():1127:1127 -> <init>
     boolean isTrivialInstanceInitializer() -> b
-com.android.tools.r8.graph.DexField -> com.android.tools.r8.C.z0:
+com.android.tools.r8.graph.DexField -> com.android.tools.r8.C.A0:
     com.android.tools.r8.graph.DexString name -> g
     com.android.tools.r8.graph.DexType type -> f
     com.android.tools.r8.graph.DexType holder -> e
@@ -18076,7 +18141,7 @@
     com.android.tools.r8.graph.DexField asDexField() -> k
     boolean isDexField() -> o
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.graph.DexItem -> com.android.tools.r8.C.A0:
+com.android.tools.r8.graph.DexItem -> com.android.tools.r8.C.B0:
     1:1:void <init>():12:12 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
@@ -18092,48 +18157,48 @@
     1:1:void lambda$collectAll$2(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem):24:24 -> b
     1:1:java.lang.String toSmaliString():60:60 -> f
     1:1:java.lang.String toSourceString():64:64 -> g
-com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.C.T0:
+com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.C.U0:
     com.android.tools.r8.graph.DexString getDeclaredFieldName -> A0
     com.android.tools.r8.graph.DexString unboxLongMethodName -> Q
     com.android.tools.r8.graph.DexString mathDescriptor -> b1
-    com.android.tools.r8.graph.DexType methodHandleType -> F2
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> j3
+    com.android.tools.r8.graph.DexType invocationHandlerType -> F2
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
     java.util.concurrent.ConcurrentHashMap classTypeLatticeInterfaces -> q
     com.android.tools.r8.graph.DexString assertionErrorDescriptor -> I0
     com.android.tools.r8.graph.DexString proxyDescriptor -> j1
     com.android.tools.r8.graph.DexString nameMethodName -> r0
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> k3
     com.android.tools.r8.graph.DexString shortDescriptor -> A
-    java.util.Map fields -> c
-    com.android.tools.r8.graph.DexType comparableType -> W3
     com.android.tools.r8.graph.DexType intType -> V1
     com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> w2
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> Z3
+    java.util.concurrent.ConcurrentHashMap strings -> a
     com.android.tools.r8.graph.DexString getFieldName -> z0
-    com.android.tools.r8.graph.DexType metafactoryType -> O3
+    java.util.Set libraryTypesAssumedToBePresent -> g4
+    com.android.tools.r8.graph.DexType lookupType -> O3
     com.android.tools.r8.graph.DexType classArrayType -> o2
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> c3
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> a0
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> G3
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> G3
     com.android.tools.r8.graph.DexString unboxFloatMethodName -> R
     com.android.tools.r8.graph.DexType boxedShortType -> g2
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> Y3
+    com.android.tools.r8.graph.DexString unknownTypeName -> k4
     com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> I1
     com.android.tools.r8.graph.DexString valueOfMethodName -> i0
     com.android.tools.r8.graph.DexString classLoaderDescriptor -> Q0
     com.android.tools.r8.graph.DexString comparatorDescriptor -> r1
     com.android.tools.r8.graph.DexString voidDescriptor -> B
-    java.util.Map protos -> d
-    com.android.tools.r8.graph.DexType throwableType -> W2
+    com.android.tools.r8.graph.DexType icceType -> W2
+    com.android.tools.r8.graph.DexType annotationDefault -> x3
     java.util.concurrent.ConcurrentHashMap referenceTypeLatticeElements -> p
     com.android.tools.r8.graph.DexString objectsDescriptor -> Y0
     com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> z1
-    com.android.tools.r8.graph.DexType mapEntryType -> O2
+    com.android.tools.r8.graph.DexType callableType -> O2
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> b4
     com.android.tools.r8.graph.DexString icceDescriptor -> A1
+    com.android.tools.r8.kotlin.Kotlin kotlin -> q3
     com.android.tools.r8.graph.DexString unboxDoubleMethodName -> S
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
     com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> i1
-    com.android.tools.r8.graph.DexType varHandleType -> E2
+    com.android.tools.r8.graph.DexType methodTypeType -> E2
     com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> H0
     com.android.tools.r8.graph.DexString classDescriptor -> P0
     com.android.tools.r8.graph.DexString collectionDescriptor -> q1
@@ -18141,203 +18206,200 @@
     com.android.tools.r8.graph.DexType floatType -> U1
     com.android.tools.r8.graph.DexType strictMathType -> v2
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> C
-    com.android.tools.r8.graph.DexType externalizableType -> V3
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> Y3
     com.android.tools.r8.graph.DexString getDeclaredConstructorName -> y0
-    java.util.Set libraryMethodsReturningNonNull -> f4
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> f4
     com.android.tools.r8.graph.DexType objectArrayType -> n2
-    java.util.Map methods -> e
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> N3
+    com.android.tools.r8.graph.DexType callSiteType -> N3
     com.android.tools.r8.graph.DexString iterableDescriptor -> a1
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> d3
     com.android.tools.r8.graph.DexType boxedLongType -> f2
     com.android.tools.r8.graph.DexString isEmptyMethodName -> T
     com.android.tools.r8.graph.DexString byteDescriptor -> u
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> q3
     com.android.tools.r8.graph.DexString trimName -> h0
     com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> H1
-    com.android.tools.r8.graph.DexType annotationSignature -> F3
+    com.android.tools.r8.graph.DexType annotationThrows -> F3
     com.android.tools.r8.graph.DexString finalizeMethodName -> p0
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> g3
     com.android.tools.r8.graph.DexString throwableArrayDescriptor -> P1
-    com.android.tools.r8.graph.DexType runtimeExceptionType -> V2
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> V2
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> D
     com.android.tools.r8.graph.DexString annotationDescriptor -> X0
     com.android.tools.r8.graph.DexString throwableDescriptor -> y1
-    com.android.tools.r8.graph.DexType mapType -> N2
-    java.util.Map methodHandles -> f
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> a4
+    com.android.tools.r8.graph.DexType comparatorType -> N2
+    java.util.IdentityHashMap internalSentinels -> l4
+    boolean $assertionsDisabled -> m4
+    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> a4
+    java.util.Map libraryMethodsWithoutSideEffects -> e4
     com.android.tools.r8.graph.DexString getDeclaredMethodName -> C0
     com.android.tools.r8.graph.DexString stringBuilderDescriptor -> d1
     java.util.Map setInlineFrames -> o
-    com.android.tools.r8.graph.DexType stringBufferType -> D2
+    com.android.tools.r8.graph.DexType methodHandleType -> D2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap defaults -> i
     com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> K0
     com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> l1
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
     com.android.tools.r8.graph.DexString forNameMethodName -> t0
-    com.android.tools.r8.graph.DexType serializableType -> U3
+    java.util.concurrent.ConcurrentHashMap methods -> e
+    com.android.tools.r8.graph.DexType comparableType -> U3
     com.android.tools.r8.graph.DexType doubleType -> T1
     com.android.tools.r8.graph.DexType mathType -> u2
-    java.util.Set libraryTypesAssumedToBePresent -> i4
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> M3
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> i3
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> h3
+    com.android.tools.r8.graph.DexType metafactoryType -> M3
     com.android.tools.r8.graph.DexString unboxByteMethodName -> M
     com.android.tools.r8.graph.DexType objectType -> m2
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> m3
     com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> C1
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> W3
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> c0
     com.android.tools.r8.graph.DexType boxedIntType -> e2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advancePCs -> h
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> e3
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> E3
-    com.android.tools.r8.graph.DexString unknownTypeName -> m4
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> E3
     com.android.tools.r8.graph.DexString constructorMethodName -> K1
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> r3
     com.android.tools.r8.graph.DexString internMethodName -> k0
     com.android.tools.r8.graph.DexString classArrayDescriptor -> S0
     com.android.tools.r8.graph.DexString supplierDescriptor -> t1
-    com.android.tools.r8.graph.DexType optionalType -> U2
-    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> o3
-    com.android.tools.r8.graph.DexType setType -> M2
+    java.util.concurrent.ConcurrentHashMap protos -> d
+    com.android.tools.r8.graph.DexType throwableType -> U2
+    com.android.tools.r8.graph.DexType mapEntryType -> M2
     com.android.tools.r8.graph.DexString unboxCharMethodName -> N
-    com.android.tools.r8.graph.DexMethod stringConcatMethod -> d4
     com.android.tools.r8.graph.DexString strictMathDescriptor -> c1
     com.android.tools.r8.graph.DexString getMethodName -> B0
-    com.android.tools.r8.graph.DexType stringBuilderType -> C2
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> y3
-    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> d3
+    com.android.tools.r8.graph.DexType varHandleType -> C2
     com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> k1
     com.android.tools.r8.graph.DexString charSequenceDescriptor -> J0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap restartLocals -> k
-    java.util.Map strings -> a
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> l3
     com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> s0
     com.android.tools.r8.graph.DexType charType -> S1
     com.android.tools.r8.graph.DexType iterableType -> t2
-    com.android.tools.r8.graph.DexType enumerationType -> T3
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> h4
+    java.util.concurrent.ConcurrentHashMap fields -> c
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> r3
+    com.android.tools.r8.graph.DexType externalizableType -> T3
+    java.util.Set libraryClassesWithoutStaticInitialization -> h4
     com.android.tools.r8.graph.DexType stringArrayType -> l2
     com.android.tools.r8.graph.DexString unboxShortMethodName -> O
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> L3
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> L3
     com.android.tools.r8.graph.DexString unboxIntMethodName -> P
     com.android.tools.r8.graph.DexString indexOfMethodName -> b0
     com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> B1
     com.android.tools.r8.graph.DexType boxedFloatType -> d2
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> D3
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> f3
+    com.android.tools.r8.graph.DexType annotationSignature -> D3
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> o3
     com.android.tools.r8.graph.DexString toStringMethodName -> j0
     com.android.tools.r8.graph.DexString newUpdaterName -> J1
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap endLocals -> j
     com.android.tools.r8.graph.DexString autoCloseableDescriptor -> R0
     com.android.tools.r8.graph.DexString callableDescriptor -> s1
-    java.util.Map types -> b
-    com.android.tools.r8.graph.DexType runnableType -> T2
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> t3
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> T2
+    java.util.concurrent.ConcurrentHashMap types -> b
     com.android.tools.r8.graph.DexString collectionsDescriptor -> Z0
-    com.android.tools.r8.graph.DexType listType -> L2
-    boolean $assertionsDisabled -> o4
-    java.util.IdentityHashMap internalSentinels -> n4
-    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> c4
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> g3
-    java.util.Map libraryMethodsWithoutSideEffects -> g4
+    com.android.tools.r8.graph.DexType mapType -> L2
     com.android.tools.r8.graph.DexString assertionsDisabled -> E0
     com.android.tools.r8.graph.DexString varHandleDescriptor -> f1
-    com.android.tools.r8.graph.DexType autoCloseableType -> B2
-    com.android.tools.r8.graph.DexType npeType -> c3
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> p3
+    com.android.tools.r8.graph.DexType stringBufferType -> B2
     com.android.tools.r8.graph.DexString equalsMethodName -> Y
     com.android.tools.r8.graph.DexString longDescriptor -> z
     com.android.tools.r8.graph.DexString stringArrayDescriptor -> M0
     com.android.tools.r8.graph.DexString setDescriptor -> n1
     com.android.tools.r8.graph.DexType boxedBooleanType -> Z1
     com.android.tools.r8.graph.DexString getCanonicalNameName -> v0
-    com.android.tools.r8.graph.DexType listIteratorType -> S3
+    com.android.tools.r8.graph.DexType serializableType -> S3
     com.android.tools.r8.graph.DexType byteType -> R1
     com.android.tools.r8.graph.DexType collectionsType -> s2
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> I
-    com.android.tools.r8.graph.DexType nullValueType -> l4
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> K3
+    java.util.Set libraryMethodsReturningReceiver -> c4
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> K3
     com.android.tools.r8.graph.DexType stringType -> k2
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> k3
     com.android.tools.r8.graph.DexString npeDescriptor -> E1
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> r
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> e0
-    com.android.tools.r8.graph.DexType annotationInnerClass -> C3
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> C3
     com.android.tools.r8.graph.DexType boxedDoubleType -> c2
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
     com.android.tools.r8.graph.DexString thisName -> M1
     com.android.tools.r8.graph.DexString wrapperFieldName -> m0
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> p3
     com.android.tools.r8.graph.DexString fieldDescriptor -> U0
     com.android.tools.r8.graph.DexString runnableDescriptor -> v1
-    com.android.tools.r8.graph.DexType consumerType -> S2
+    com.android.tools.r8.graph.DexType optionalType -> S2
+    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> m3
     com.android.tools.r8.graph.DexString boxedShortDescriptor -> J
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> K2
+    com.android.tools.r8.graph.DexType setType -> K2
+    boolean skipNameValidationForTesting -> i4
     com.android.tools.r8.graph.DexString stringBufferDescriptor -> e1
-    com.android.tools.r8.graph.DexType proxyType -> I2
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> I2
     com.android.tools.r8.graph.DexString newInstanceName -> D0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advanceLines -> g
-    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> b3
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> n3
+    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> b3
     com.android.tools.r8.graph.DexString stringDescriptor -> L0
     com.android.tools.r8.graph.DexString listDescriptor -> m1
-    com.android.tools.r8.graph.DexType methodType -> A2
+    com.android.tools.r8.graph.DexType stringBuilderType -> A2
     com.android.tools.r8.graph.DexType voidType -> Y1
-    com.android.tools.r8.graph.DexType fieldType -> z2
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> u3
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> X3
+    com.android.tools.r8.graph.DexType autoCloseableType -> z2
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> Z3
     com.android.tools.r8.graph.DexString getNameName -> u0
-    java.util.Set libraryClassesWithoutStaticInitialization -> j4
     com.android.tools.r8.graph.DexType booleanType -> Q1
     com.android.tools.r8.graph.DexType objectsType -> r2
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> t3
-    com.android.tools.r8.graph.DexType iteratorType -> R3
+    com.android.tools.r8.graph.DexType enumerationType -> R3
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> K
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> j3
     com.android.tools.r8.graph.DexType charSequenceArrayType -> j2
     com.android.tools.r8.graph.DexString compareToMethodName -> d0
     com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> D1
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> J3
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> J3
     java.util.Map setFiles -> n
     com.android.tools.r8.graph.DexType boxedCharType -> b2
     com.android.tools.r8.graph.DexString convertMethodName -> l0
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> B3
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> B3
     com.android.tools.r8.graph.DexString classConstructorMethodName -> L1
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> Z2
+    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> Z2
+    java.util.concurrent.ConcurrentHashMap methodHandles -> f
     com.android.tools.r8.graph.DexString constructorDescriptor -> T0
     com.android.tools.r8.graph.DexString consumerDescriptor -> u1
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> v3
-    com.android.tools.r8.graph.DexType supplierType -> R2
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> w3
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> v3
+    com.android.tools.r8.graph.DexType runnableType -> R2
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> f3
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> w3
     com.android.tools.r8.graph.DexString unboxBooleanMethodName -> L
-    com.android.tools.r8.graph.DexType serviceLoaderType -> J2
-    com.android.tools.r8.graph.DexType invocationHandlerType -> H2
+    com.android.tools.r8.graph.DexType listType -> J2
+    com.android.tools.r8.graph.DexType serviceLoaderType -> H2
     com.android.tools.r8.graph.DexString lengthMethodName -> U
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> n3
     com.android.tools.r8.graph.DexString charDescriptor -> v
     com.android.tools.r8.graph.DexString invokeExactMethodName -> G0
     com.android.tools.r8.graph.DexString methodTypeDescriptor -> h1
-    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> a3
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> e3
+    com.android.tools.r8.graph.DexType npeType -> a3
     com.android.tools.r8.graph.DexString objectArrayDescriptor -> O0
     com.android.tools.r8.graph.DexString mapEntryDescriptor -> p1
     com.android.tools.r8.graph.DexType shortType -> X1
     com.android.tools.r8.graph.DexType classLoaderType -> y2
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> E
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> X3
     com.android.tools.r8.graph.DexString getTypeNameName -> x0
-    com.android.tools.r8.graph.DexType lookupType -> Q3
+    com.android.tools.r8.graph.DexType listIteratorType -> Q3
     com.android.tools.r8.graph.DexType annotationType -> q2
-    java.util.Set libraryMethodsReturningReceiver -> e4
+    com.android.tools.r8.graph.DexType nullValueType -> j4
     com.android.tools.r8.graph.DexType charSequenceType -> i2
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> I3
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> I3
     com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> G1
     com.android.tools.r8.graph.DexString containsMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
     com.android.tools.r8.graph.DexString substringName -> g0
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> b4
     com.android.tools.r8.graph.DexType boxedByteType -> a2
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> A3
+    com.android.tools.r8.graph.DexType annotationInnerClass -> A3
     com.android.tools.r8.graph.DexString getClassMethodName -> o0
-    com.android.tools.r8.graph.DexType icceType -> Y2
-    com.android.tools.r8.graph.DexType annotationDefault -> z3
+    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> Y2
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> z3
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> F
     com.android.tools.r8.graph.DexString enumDescriptor -> W0
     com.android.tools.r8.graph.DexString arraysDescriptor -> x1
-    com.android.tools.r8.graph.DexType callableType -> Q2
-    com.android.tools.r8.graph.DexType methodTypeType -> G2
-    boolean skipNameValidationForTesting -> k4
+    com.android.tools.r8.graph.DexType consumerType -> Q2
+    com.android.tools.r8.graph.DexType proxyType -> G2
     com.android.tools.r8.graph.DexString methodHandleDescriptor -> g1
-    com.android.tools.r8.kotlin.Kotlin kotlin -> s3
     com.android.tools.r8.graph.DexString invokeMethodName -> F0
     com.android.tools.r8.graph.DexString startsWithMethodName -> W
     com.android.tools.r8.graph.DexString floatDescriptor -> x
@@ -18346,206 +18408,202 @@
     boolean sorted -> s
     com.android.tools.r8.graph.DexType longType -> W1
     com.android.tools.r8.graph.DexType classType -> x2
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> V3
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> G
     com.android.tools.r8.graph.DexString getSimpleNameName -> w0
     com.android.tools.r8.graph.DexType charArrayType -> O1
     com.android.tools.r8.graph.DexType enumType -> p2
-    com.android.tools.r8.graph.DexType callSiteType -> P3
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> l3
+    com.android.tools.r8.graph.DexType iteratorType -> P3
+    java.util.Set libraryMethodsReturningNonNull -> d4
     com.android.tools.r8.graph.DexType boxedNumberType -> h2
-    com.android.tools.r8.graph.DexType annotationThrows -> H3
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> H3
     com.android.tools.r8.graph.DexString cloneMethodName -> f0
     com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> F1
     com.android.tools.r8.graph.DexString endsWithMethodName -> X
-    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> i3
     com.android.tools.r8.graph.DexString intDescriptor -> y
     com.android.tools.r8.graph.DexString initMethodName -> n0
     com.android.tools.r8.graph.DexString charArrayDescriptor -> N1
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> X2
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> h3
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> s3
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> X2
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> y3
     com.android.tools.r8.graph.DexString methodDescriptor -> V0
     com.android.tools.r8.graph.DexString optionalDescriptor -> w1
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> x3
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> H
-    com.android.tools.r8.graph.DexType comparatorType -> P2
+    com.android.tools.r8.graph.DexType supplierType -> P2
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> u3
     1:41:void <clinit>():61:101 -> <clinit>
     1:1:void <init>():105:105 -> <init>
-    2:366:void <init>():65:429 -> <init>
-    367:415:void <init>():419:467 -> <init>
-    416:432:void <init>():457:473 -> <init>
-    433:451:void <init>():470:488 -> <init>
-    452:472:void <init>():479:499 -> <init>
-    473:505:void <init>():492:524 -> <init>
-    506:510:void <init>():523:527 -> <init>
-    511:514:void <init>():526:529 -> <init>
-    515:552:void <init>():520:557 -> <init>
-    553:555:void <init>():106:108 -> <init>
-    556:556:void <init>():107:107 -> <init>
+    2:364:void <init>():65:427 -> <init>
+    365:413:void <init>():417:465 -> <init>
+    414:430:void <init>():455:471 -> <init>
+    431:449:void <init>():468:486 -> <init>
+    450:470:void <init>():477:497 -> <init>
+    471:503:void <init>():490:522 -> <init>
+    504:508:void <init>():521:525 -> <init>
+    509:512:void <init>():524:527 -> <init>
+    513:550:void <init>():518:555 -> <init>
+    551:553:void <init>():106:108 -> <init>
+    554:554:void <init>():107:107 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$4(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:com.android.tools.r8.graph.DexType access$1900(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):432:433 -> a
-    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):445:447 -> a
-    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):534:534 -> a
-    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):534:534 -> a
-    10:11:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1176:1177 -> a
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):430:431 -> a
+    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):443:445 -> a
+    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):532:532 -> a
+    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):532:532 -> a
+    10:11:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1156:1157 -> a
     12:12:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    12:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1177 -> a
-    13:14:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1177:1178 -> a
-    15:16:com.android.tools.r8.graph.DexString createString(int,byte[]):1183:1184 -> a
-    17:18:com.android.tools.r8.graph.DexString createString(java.lang.String):1188:1189 -> a
-    19:19:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1225:1225 -> a
-    20:21:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1251:1252 -> a
+    12:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1157 -> a
+    13:14:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1157:1158 -> a
+    15:16:com.android.tools.r8.graph.DexString createString(int,byte[]):1163:1164 -> a
+    17:18:com.android.tools.r8.graph.DexString createString(java.lang.String):1168:1169 -> a
+    19:19:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1205:1205 -> a
+    20:21:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1231:1232 -> a
     22:22:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    22:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1252 -> a
-    23:23:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1252:1252 -> a
-    24:24:com.android.tools.r8.graph.DexType createType(java.lang.String):1243:1243 -> a
-    24:24:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1252 -> a
-    25:27: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):1256:1258 -> a
-    28:28:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1262:1262 -> a
-    29:31: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):1266:1268 -> a
-    32:35:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1272:1275 -> a
-    36:41:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1341:1346 -> a
-    36:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1276 -> a
-    42:42:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1273:1273 -> a
-    43:43:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1280:1280 -> a
-    44:44:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1290:1290 -> a
+    22:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1232 -> a
+    23:23:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1232:1232 -> a
+    24:24:com.android.tools.r8.graph.DexType createType(java.lang.String):1223:1223 -> a
+    24:24:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1232 -> a
+    25:27: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):1236:1238 -> a
+    28:28:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
+    29:31: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):1246:1248 -> a
+    32:35:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1252:1255 -> a
+    36:41:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1321:1326 -> a
+    36:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1256 -> a
+    42:42:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1253:1253 -> a
+    43:43:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1260:1260 -> a
+    44:44:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270:1270 -> a
     45:45:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    45:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1290 -> a
-    46:47:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1290:1291 -> a
+    45:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270 -> a
+    46:47:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270:1271 -> a
     48:48:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    48:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1293 -> a
-    49:51:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1292:1294 -> a
-    52:56:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1307:1311 -> a
-    57:64:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1328:1335 -> a
-    57:64:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1311 -> a
+    48:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1273 -> a
+    49:51:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1272:1274 -> a
+    52:56:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1287:1291 -> a
+    57:64:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1308:1315 -> a
+    57:64:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
     65:74:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.copyWithSparseChanges(java.lang.Class,java.lang.Object[],java.util.Map):25:34 -> a
-    65:74:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1337 -> a
-    65:74:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1311 -> a
-    75:75:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1337:1337 -> a
-    75:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1311 -> a
-    76:82:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1312:1318 -> a
-    83:87:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1317:1321 -> a
-    88:90: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):1350:1352 -> a
-    91:91:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> a
-    92:94:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1363:1365 -> a
-    95:96: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):1374:1375 -> a
-    97:106: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[]):1383:1392 -> a
-    107:109:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1396:1398 -> a
-    110:112:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1434:1436 -> a
-    113:115:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1441:1443 -> a
-    116:116:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1451:1451 -> a
-    117:119:void clearTypeLatticeElementsCache():1455:1457 -> a
-    120:127:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1484:1491 -> a
-    128:156:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1490:1518 -> a
-    157:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1498:1506 -> a
-    166:177:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1505:1516 -> a
-    178:179:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1523:1524 -> a
-    180:181:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1527:1528 -> a
-    182:186:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1535:1539 -> a
-    187:187:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1536:1536 -> a
-    188:194:void sort(com.android.tools.r8.naming.NamingLens):1544:1550 -> a
-    195:195:void forAllTypes(java.util.function.Consumer):1567:1567 -> a
-    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1229:1235 -> b
-    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1234:1236 -> b
+    65:74:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1317 -> a
+    65:74:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
+    75:75:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1317:1317 -> a
+    75:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
+    76:82:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1292:1298 -> a
+    83:87:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1297:1301 -> a
+    88:90: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):1330:1332 -> a
+    91:91:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    92:94:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1343:1345 -> a
+    95:96: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):1354:1355 -> a
+    97:106: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[]):1363:1372 -> a
+    107:109:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1376:1378 -> a
+    110:112:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1414:1416 -> a
+    113:115:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1421:1423 -> a
+    116:116:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1431:1431 -> a
+    117:119:void clearTypeLatticeElementsCache():1435:1437 -> a
+    120:127:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1464:1471 -> a
+    128:156:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1470:1498 -> a
+    157:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1478:1486 -> a
+    166:177:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1485:1496 -> a
+    178:179:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1503:1504 -> a
+    180:181:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1507:1508 -> a
+    182:186:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1515:1519 -> a
+    187:187:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1516:1516 -> a
+    188:194:void sort(com.android.tools.r8.naming.NamingLens):1524:1530 -> a
+    195:195:void forAllTypes(java.util.function.Consumer):1547:1547 -> a
+    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1209:1215 -> b
+    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1214:1216 -> b
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> b
-    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1236 -> b
-    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1236:1237 -> b
-    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1243:1243 -> b
-    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1402:1404 -> b
-    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1426:1426 -> b
-    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1447:1447 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):568:568 -> c
-    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1193:1193 -> c
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1247:1247 -> c
-    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1408:1410 -> c
-    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1430:1430 -> c
-    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1224:1225 -> d
-    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1224:1224 -> d
-    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1414:1416 -> d
-    1:5:java.util.Collection extractMarker():1199:1203 -> e
-    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1420:1422 -> e
-    1:5:java.util.List extractMarkers():1213:1217 -> f
-    1:1:boolean getSkipNameValidationForTesting():564:564 -> g
-    1:10:void resetSortedIndices():1554:1563 -> h
-    1:3:boolean verifyNoCachedTypeLatticeElements():1461:1463 -> i
-    1:12:java.util.Set boxedValueOfMethods():442:453 -> j
-com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.C.B0:
-com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.C.C0:
+    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1216 -> b
+    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1216:1217 -> b
+    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1223:1223 -> b
+    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1382:1384 -> b
+    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1406:1406 -> b
+    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1427:1427 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):566:566 -> c
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1173:1173 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1227:1227 -> c
+    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1388:1390 -> c
+    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1410:1410 -> c
+    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1204:1205 -> d
+    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1204:1204 -> d
+    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1394:1396 -> d
+    1:5:java.util.Collection extractMarker():1179:1183 -> e
+    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1400:1402 -> e
+    1:5:java.util.List extractMarkers():1193:1197 -> f
+    1:1:boolean getSkipNameValidationForTesting():562:562 -> g
+    1:10:void resetSortedIndices():1534:1543 -> h
+    1:3:boolean verifyNoCachedTypeLatticeElements():1441:1443 -> i
+    1:12:java.util.Set boxedValueOfMethods():440:451 -> j
+com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.C.C0:
+com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.C.D0:
     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):618:618 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):622:627 -> <init>
-com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.C.D0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):616:616 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):620:625 -> <init>
+com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.C.E0:
     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):850:850 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):856:875 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):879:879 -> a
-com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.C.E0:
-    com.android.tools.r8.graph.DexMethod newInstance -> m
-    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> l
-    com.android.tools.r8.graph.DexMethod getMethod -> k
-    com.android.tools.r8.graph.DexMethod getDeclaredField -> j
-    com.android.tools.r8.graph.DexMethod getField -> i
-    com.android.tools.r8.graph.DexMethod getDeclaredConstructor -> h
-    com.android.tools.r8.graph.DexMethod getTypeName -> g
-    com.android.tools.r8.graph.DexMethod getSimpleName -> f
-    com.android.tools.r8.graph.DexMethod getCanonicalName -> e
-    com.android.tools.r8.graph.DexMethod getName -> d
-    com.android.tools.r8.graph.DexMethod forName3 -> c
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):830:830 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):836:855 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):859:859 -> a
+com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.C.F0:
+    com.android.tools.r8.graph.DexMethod newInstance -> l
+    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> k
+    com.android.tools.r8.graph.DexMethod getMethod -> j
+    com.android.tools.r8.graph.DexMethod getDeclaredField -> i
+    com.android.tools.r8.graph.DexMethod getField -> h
+    com.android.tools.r8.graph.DexMethod getDeclaredConstructor -> g
+    com.android.tools.r8.graph.DexMethod getTypeName -> f
+    com.android.tools.r8.graph.DexMethod getSimpleName -> e
+    com.android.tools.r8.graph.DexMethod getCanonicalName -> d
+    com.android.tools.r8.graph.DexMethod getName -> c
     com.android.tools.r8.graph.DexMethod forName -> b
     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):661:661 -> <init>
-    2:41:void <init>(com.android.tools.r8.graph.DexItemFactory):679:718 -> <init>
-    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):661:661 -> a
-    2:2:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):722:722 -> a
-    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):726:726 -> b
-    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):730:730 -> c
-com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.C.F0:
+    java.util.Set getMembers -> m
+    java.util.Set getNames -> n
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):659:659 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.DexItemFactory):676:705 -> <init>
+    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):659:659 -> a
+    2:2:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):709:709 -> a
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):713:713 -> b
+com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.C.G0:
     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):734:734 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):738:740 -> <init>
-com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.C.G0:
-    com.android.tools.r8.graph.DexItemFactory this$0 -> f
-    com.android.tools.r8.graph.DexMethod finalize -> e
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):717:717 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):721:723 -> <init>
+com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.C.H0:
     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 <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):748:748 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):758:758 -> <init>
-    3:26:void <init>(com.android.tools.r8.graph.DexItemFactory):755:778 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.C.H0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):731:731 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):738:758 -> <init>
+com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.C.I0:
     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):581:581 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):585:589 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):587:587 -> <init>
-com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.C.I0:
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):571:571 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):575:577 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):576:576 -> <init>
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.C.J0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):579:579 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):583:587 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):585:585 -> <init>
+com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.C.J0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):569:569 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):573:575 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):574:574 -> <init>
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.C.K0:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):786:786 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):790:792 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.C.K0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):766:766 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):770:772 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.C.L0:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):632:632 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):639:646 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.C.L0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):630:630 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):637:644 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.C.M0:
     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):651:651 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):655:657 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):656:656 -> <init>
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.C.M0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):649:649 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):653:655 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):654:654 -> <init>
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.C.N0:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -18553,10 +18611,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):1064:1099 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1107:1117 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):1124:1129 -> a
-com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.C.N0:
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1044:1079 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1087:1097 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1104:1109 -> a
+com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.C.O0:
     com.android.tools.r8.graph.DexField longTYPE -> f
     com.android.tools.r8.graph.DexField intTYPE -> e
     com.android.tools.r8.graph.DexField doubleTYPE -> h
@@ -18566,25 +18624,25 @@
     com.android.tools.r8.graph.DexField booleanTYPE -> a
     com.android.tools.r8.graph.DexField shortTYPE -> d
     com.android.tools.r8.graph.DexField charTYPE -> c
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):806:806 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):818:838 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):842:842 -> a
-com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.C.O0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):786:786 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):798:818 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):822:822 -> a
+com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.C.P0:
     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):1133:1133 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1137:1142 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1139:1139 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.C.P0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1113:1113 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1117:1122 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1119:1119 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.C.Q0:
     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):1146:1146 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1153:1159 -> <init>
-    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1157:1165 -> <init>
-    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1162:1167 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1171:1171 -> a
-com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.C.Q0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1126:1126 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1133:1139 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1137:1145 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1142:1147 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1151:1151 -> a
+com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.C.R0:
     com.android.tools.r8.graph.DexMethod defaultConstructor -> o
     com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
     com.android.tools.r8.graph.DexMethod appendStringBuffer -> m
@@ -18606,20 +18664,20 @@
     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>():956:956 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):956:956 -> <init>
-    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):980:1024 -> <init>
-    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):956:956 -> a
-    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1029:1029 -> a
-    3:7:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1033:1037 -> a
+    1:1:void <clinit>():936:936 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):936:936 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):960:1004 -> <init>
+    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):936:936 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1009:1009 -> a
+    3:7:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1013:1017 -> a
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    8:8:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1037 -> a
-    9:25:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1040:1056 -> a
+    8:8:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1017 -> a
+    9:25:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1020:1036 -> a
     26:26:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    26:26:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1056 -> a
-    27:27:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1059:1059 -> a
-    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):956:956 -> b
-com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.C.R0:
+    26:26:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1036 -> a
+    27:27:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1039:1039 -> a
+    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):936:936 -> b
+com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.C.S0:
     com.android.tools.r8.graph.DexMethod hashCode -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
     com.android.tools.r8.graph.DexMethod compareTo -> m
@@ -18640,26 +18698,26 @@
     com.android.tools.r8.graph.DexMethod intern -> r
     com.android.tools.r8.graph.DexMethod toString -> q
     com.android.tools.r8.graph.DexMethod valueOf -> p
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):883:883 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):908:908 -> <init>
-    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):906:951 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.C.S0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):863:863 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):888:888 -> <init>
+    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):886:931 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.C.T0:
     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):595:595 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):602:604 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):603:606 -> <init>
-    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):605:612 -> <init>
-    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):610:610 -> <init>
-com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.C.U0:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):593:593 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):600:602 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):601:604 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):603:610 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):608:608 -> <init>
+com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.C.V0:
     boolean $assertionsDisabled -> s
     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>
     com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> E
-    boolean isLibraryClass() -> U
-    boolean isNotProgramClass() -> Z
+    boolean isLibraryClass() -> S
+    boolean isNotProgramClass() -> X
     1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74:74 -> a
     2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():118:118 -> a
     2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74 -> a
@@ -18675,7 +18733,7 @@
     1:1:java.lang.String toString():87:87 -> toString
     2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():87 -> toString
-com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.C.Y0:
+com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.C.Z0:
     com.android.tools.r8.graph.Descriptor item -> a
     com.android.tools.r8.graph.DexItem annotations -> b
     1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexItem):14:16 -> <init>
@@ -18683,13 +18741,13 @@
     3:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):28:28 -> a
     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.C.V0:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.C.W0:
     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.C.W0:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.C.X0:
     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.C.X0:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.C.Y0:
     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.C.Z0:
+com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.C.a1:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexProto proto -> f
     com.android.tools.r8.graph.DexString name -> g
@@ -18760,7 +18818,7 @@
     2:2:int getArity():39 -> r
     1:1:java.lang.String qualifiedName():161:161 -> s
     1:1:java.lang.String toString():35:35 -> toString
-com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.C.b1:
+com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.C.c1:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> e
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.Descriptor fieldOrMethod -> f
@@ -18786,52 +18844,46 @@
     11:14:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):228:231 -> a
     15:15:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(java.lang.String,java.lang.String,java.lang.String):84:84 -> a
     15:15:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):231 -> a
-    16:16:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):88:88 -> a
-    16:16:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(java.lang.String,java.lang.String,java.lang.String):84 -> a
-    16:16:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):231 -> a
-    17:17:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):232:232 -> a
-    18:18: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
-    18:18:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):232 -> a
-    19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):96:96 -> a
-    19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):92 -> a
-    19:19:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):232 -> a
-    20:20:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):233:233 -> a
-    21:21:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.JarApplicationReader.getMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):109:109 -> a
-    21:21:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):233 -> a
-    22:27:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):266:271 -> a
-    28:30:boolean com.android.tools.r8.graph.DexMethod.collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:54 -> a
-    28:30:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):271 -> a
-    31:31:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273:273 -> a
+    16:16:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):232:232 -> a
+    17:17: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
+    17:17:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):232 -> a
+    18:18:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):233:233 -> a
+    19:19:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.JarApplicationReader.getMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):109:109 -> a
+    19:19:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):233 -> a
+    20:25:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):266:271 -> a
+    26:28:boolean com.android.tools.r8.graph.DexMethod.collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:54 -> a
+    26:28:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):271 -> a
+    29:29:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273:273 -> a
+    30:30:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62:62 -> a
+    30:30:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> a
+    31:31:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> a
+    31:31:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62 -> a
+    31:31:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> a
     32:32:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62:62 -> a
     32:32:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> a
-    33:33:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> a
-    33:33:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62 -> a
-    33:33:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> a
-    34:34:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):62:62 -> a
-    34:34:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):273 -> a
-    35:35:boolean com.android.tools.r8.graph.DexMethod.collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:52 -> a
-    35:35:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):271 -> a
-    36:36:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):276:276 -> a
-    37:37:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):283:283 -> a
-    38:38:boolean isMethodHandle():297:297 -> a
-    38:38:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):366 -> a
-    39:46:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):367:374 -> a
-    47:47:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    47:47:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):374 -> a
-    48:55:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):374:381 -> a
-    56:56:boolean isFieldHandle():293:293 -> a
-    56:56:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):381 -> a
-    57:64:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):381:388 -> a
-    65:86:int getAsmTag():392:413 -> a
-    65:86:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):388 -> a
-    87:87:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):388:388 -> a
-    88:88:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):316:316 -> a
-    89:89:boolean isFieldHandle():293:293 -> a
-    89:89:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):318 -> a
-    90:92:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):319:321 -> a
-    93:93:boolean isMethodHandle():297:297 -> a
-    93:93:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):321 -> a
-    94:95:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):321:322 -> a
+    33:33:boolean com.android.tools.r8.graph.DexMethod.collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):52:52 -> a
+    33:33:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):271 -> a
+    34:34:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):276:276 -> a
+    35:35:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):283:283 -> a
+    36:36:boolean isMethodHandle():297:297 -> a
+    36:36:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):366 -> a
+    37:44:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):367:374 -> a
+    45:45:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    45:45:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):374 -> a
+    46:53:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):374:381 -> a
+    54:54:boolean isFieldHandle():293:293 -> a
+    54:54:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):381 -> a
+    55:62:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):381:388 -> a
+    63:84:int getAsmTag():392:413 -> a
+    63:84:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):388 -> a
+    85:85:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):388:388 -> a
+    86:86:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):316:316 -> a
+    87:87:boolean isFieldHandle():293:293 -> a
+    87:87:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):318 -> a
+    88:90:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):319:321 -> a
+    91:91:boolean isMethodHandle():297:297 -> a
+    91:91:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):321 -> a
+    92:93:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):321:322 -> a
     1:6:boolean computeEquals(java.lang.Object):243:248 -> b
     1:1:int compareTo(java.lang.Object):15:15 -> compareTo
     2:2:int compareTo(com.android.tools.r8.graph.DexMethodHandle):358:358 -> compareTo
@@ -18858,7 +18910,7 @@
     7:7:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticPut():126:126 -> m
     7:7:boolean isStaticHandle():301 -> m
     1:6:java.lang.String toString():255:260 -> toString
-com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.C.a1:
+com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.C.b1:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_CONSTRUCTOR -> h
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_INSTANCE -> g
@@ -18923,7 +18975,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.C.d1:
+com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.C.e1:
     java.util.Collection synthesizedFrom -> u
     com.android.tools.r8.kotlin.KotlinInfo kotlinInfo -> w
     com.android.tools.r8.graph.DexEncodedArray staticValues -> t
@@ -18938,7 +18990,8 @@
     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,java.util.Collection):92:92 -> <init>
     4:87: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,java.util.Collection):29:112 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():234:234 -> E
-    boolean isNotProgramClass() -> Z
+    boolean isNotProgramClass() -> X
+    boolean isProgramClass() -> Y
     1:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):126:131 -> a
     7:7:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
     7:7:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):131 -> a
@@ -18946,7 +18999,7 @@
     11:11:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> a
     11:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):134 -> a
     12:12:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):136:136 -> a
-    13:13:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):70:70 -> a
+    13:13:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> a
     13:13:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):137 -> a
     14:26:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):139:151 -> a
     27:30:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):168:171 -> a
@@ -18956,7 +19009,6 @@
     42:42:com.android.tools.r8.graph.DexField lambda$sortEncodedFields$0(com.android.tools.r8.graph.DexEncodedField):372:372 -> a
     43:66:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):410:433 -> a
     67:67:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):443:443 -> a
-    boolean isProgramClass() -> a0
     1:3:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):157:159 -> b
     4:8:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):177:181 -> b
     9:12:void sortMembers():364:367 -> b
@@ -19009,31 +19061,31 @@
     18:18:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):342:342 -> d
     19:21:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):371:373 -> d
     22:24:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):377:379 -> d
+    1:12:void computeStaticValues():291:302 -> d0
+    13:13:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> d0
+    13:13:void computeStaticValues():302 -> d0
+    14:16:void computeStaticValues():308:310 -> d0
     1:1:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):378:378 -> e
-    1:12:void computeStaticValues():291:302 -> f0
-    13:13:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):166:166 -> f0
-    13:13:void computeStaticValues():302 -> f0
-    14:16:void computeStaticValues():308:310 -> f0
+    1:2:int getInitialClassFileVersion():397:398 -> e0
+    1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():331:332 -> f0
     1:1:java.lang.String toSourceString():214:214 -> g
-    1:2:int getInitialClassFileVersion():397:398 -> g0
-    1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():331:332 -> h0
-    1:1:java.util.Collection getSynthesizedFrom():163:163 -> i0
-    1:5:boolean hasAnnotations():255:259 -> j0
-    1:1:boolean hasClassFileVersion():393:393 -> k0
-    1:1:boolean hasMethods():247:247 -> l0
-    1:1:boolean hasMethods():247:247 -> m0
-    1:1:boolean hasMethodsOrFields():251 -> m0
-    2:2:boolean hasFields():243:243 -> m0
-    2:2:boolean hasMethodsOrFields():251 -> m0
-    1:4:boolean hasOnlyInternalizableAnnotations():263:266 -> n0
-    1:4:boolean isSorted():315:318 -> o0
-    1:1:boolean originatesFromClassResource():120:120 -> p0
-    1:1:boolean originatesFromDexResource():116:116 -> q0
+    1:1:java.util.Collection getSynthesizedFrom():163:163 -> g0
+    1:5:boolean hasAnnotations():255:259 -> h0
+    1:1:boolean hasClassFileVersion():393:393 -> i0
+    1:1:boolean hasMethods():247:247 -> j0
+    1:1:boolean hasMethods():247:247 -> k0
+    1:1:boolean hasMethodsOrFields():251 -> k0
+    2:2:boolean hasFields():243:243 -> k0
+    2:2:boolean hasMethodsOrFields():251 -> k0
+    1:4:boolean hasOnlyInternalizableAnnotations():263:266 -> l0
+    1:4:boolean isSorted():315:318 -> m0
+    1:1:boolean originatesFromClassResource():120:120 -> n0
+    1:1:boolean originatesFromDexResource():116:116 -> o0
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> s
     1:1:java.lang.String toString():209:209 -> toString
     2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():209 -> toString
-com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.C.c1:
+com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.C.d1:
     java.util.Iterator iterator -> b
     com.android.tools.r8.graph.DexProgramClass next -> a
     java.lang.Iterable val$types -> c
@@ -19043,7 +19095,7 @@
     1:1:boolean hasNext():452:452 -> hasNext
     1:2:com.android.tools.r8.graph.DexProgramClass next():457:458 -> next
     1:2:java.lang.Object next():444 -> next
-com.android.tools.r8.graph.DexProto -> com.android.tools.r8.C.e1:
+com.android.tools.r8.graph.DexProto -> com.android.tools.r8.C.f1:
     com.android.tools.r8.graph.DexProto SENTINEL -> h
     com.android.tools.r8.graph.DexString shorty -> e
     com.android.tools.r8.graph.DexTypeList parameters -> g
@@ -19083,7 +19135,7 @@
     3:3:int com.android.tools.r8.graph.DexTypeList.hashCode():33:33 -> h
     3:3:int computeHashCode():27 -> h
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.graph.DexReference -> com.android.tools.r8.C.f1:
+com.android.tools.r8.graph.DexReference -> com.android.tools.r8.C.g1:
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:java.util.stream.Stream filterDexReference(java.util.stream.Stream):59:59 -> a
@@ -19097,7 +19149,7 @@
     boolean isDexField() -> o
     boolean isDexMethod() -> p
     boolean isDexType() -> q
-com.android.tools.r8.graph.DexString -> com.android.tools.r8.C.h1:
+com.android.tools.r8.graph.DexString -> com.android.tools.r8.C.i1:
     com.android.tools.r8.graph.DexString[] EMPTY_ARRAY -> g
     boolean $assertionsDisabled -> h
     int size -> e
@@ -19149,7 +19201,7 @@
     16:25:java.lang.String decode():130:139 -> p
     26:30:java.lang.String decode():137:141 -> p
     1:3:java.lang.String toString():92:94 -> toString
-com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.C.g1:
+com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.C.h1:
     com.android.tools.r8.graph.DexString this$0 -> b
     boolean $assertionsDisabled -> c
     int i -> a
@@ -19158,7 +19210,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.C.i1:
+com.android.tools.r8.graph.DexType -> com.android.tools.r8.C.j1:
     java.lang.String toStringCache -> f
     com.android.tools.r8.graph.DexString descriptor -> e
     com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> g
@@ -19239,7 +19291,7 @@
     1:1:boolean isArrayType():228:228 -> x
     1:1:boolean isBooleanType():196:196 -> y
     1:1:boolean isClassType():233:233 -> z
-com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.C.j1:
+com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.C.k1:
     com.android.tools.r8.graph.DexType[] values -> a
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> b
     boolean $assertionsDisabled -> c
@@ -19259,426 +19311,418 @@
     1:1:int size():63:63 -> i
     1:1:com.android.tools.r8.graph.DexTypeList empty():19:19 -> j
     1:8:java.lang.String toString():68:75 -> toString
-com.android.tools.r8.graph.DexValue -> com.android.tools.r8.C.H1:
+com.android.tools.r8.graph.DexValue -> com.android.tools.r8.C.I1:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> b
     com.android.tools.r8.graph.DexValue[] EMPTY_ARRAY -> a
     1:3:void <clinit>():28:30 -> <clinit>
     1:1:void <init>():27:27 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo) -> a
     void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
-    1:22:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):77:98 -> a
-    23:36:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):92:105 -> a
-    37:37:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):116:116 -> a
-    38:58:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):133:153 -> a
-    59:75:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):135:151 -> a
-    76:76:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):145:145 -> a
-    77:83:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):143:149 -> a
-    84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):139:139 -> a
-    85:85:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):137:137 -> a
+    1:22:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):61:82 -> a
+    23:36:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):76:89 -> a
+    37:37:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):100:100 -> a
+    38:58:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):117:137 -> a
+    59:75:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):119:135 -> a
+    76:76:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):129:129 -> a
+    77:83:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):127:133 -> a
+    84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):123:123 -> a
+    85:85:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):121:121 -> a
     java.lang.Object asAsmEncodedObject() -> h
-    com.android.tools.r8.graph.DexValue$DexValueArray asDexValueArray() -> i
-    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> j
-    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> k
-    com.android.tools.r8.graph.DexValue$DexValueType asDexValueType() -> l
-    java.lang.Object getBoxedValue() -> m
-    boolean isDexValueArray() -> n
-    boolean isDexValueType() -> o
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-com.android.tools.r8.graph.DexValue$1 -> com.android.tools.r8.C.k1:
-com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.C.l1:
+    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> i
+    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> j
+    java.lang.Object getBoxedValue() -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+com.android.tools.r8.graph.DexValue$1 -> com.android.tools.r8.C.l1:
+com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.C.m1:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
-    1:1:void <clinit>():792:792 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):797:798 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):725:725 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):792 -> a
-    2:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):818:825 -> a
-    10:10:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):833:833 -> a
-    1:1:boolean equals(java.lang.Object):792:792 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():807:807 -> h
-    1:1:int hashCode():792:792 -> hashCode
-    1:1:java.lang.Object getBoxedValue():792:792 -> m
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():802:802 -> s
-    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():699:699 -> t
-    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> t
-    1:1:java.lang.String toString():792:792 -> toString
-com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.C.m1:
+    1:1:void <clinit>():776:776 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):781:782 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):709:709 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):776 -> a
+    2:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):802:809 -> a
+    10:10:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):817:817 -> a
+    1:1:boolean equals(java.lang.Object):776:776 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():791:791 -> h
+    1:1:int hashCode():776:776 -> hashCode
+    1:1:java.lang.Object getBoxedValue():776:776 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():786:786 -> o
+    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():683:683 -> p
+    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> p
+    1:1:java.lang.String toString():776:776 -> toString
+com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.C.n1:
     com.android.tools.r8.graph.DexEncodedAnnotation value -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):1024:1025 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):988:989 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1036 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1037:1037 -> a
-    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1031:1031 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1000 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1001:1001 -> a
+    3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):995:995 -> a
     4:5:void com.android.tools.r8.graph.DexEncodedAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):29:30 -> a
-    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1031 -> a
-    1:3:boolean equals(java.lang.Object):1065:1067 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1047:1047 -> h
-    1:1:int hashCode():1057:1057 -> hashCode
-    1:1:java.lang.Object getBoxedValue():1042:1042 -> m
-    1:1:void sort():1052:1052 -> q
-    1:1:java.lang.String toString():1074:1074 -> toString
-com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.C.n1:
+    4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):995 -> a
+    1:3:boolean equals(java.lang.Object):1029:1031 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1011:1011 -> h
+    1:1:int hashCode():1021:1021 -> hashCode
+    1:1:java.lang.Object getBoxedValue():1006:1006 -> k
+    1:1:void sort():1016:1016 -> m
+    1:1:java.lang.String toString():1038:1038 -> toString
+com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.C.o1:
     com.android.tools.r8.graph.DexValue[] values -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):947:948 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):921:922 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):963 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):964:964 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):937 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):938:938 -> a
     3:3:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):964 -> a
-    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):965:966 -> a
-    6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):958:958 -> a
-    1:3:boolean equals(java.lang.Object):997:999 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():977:977 -> h
-    1:1:int hashCode():989:989 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueArray asDexValueArray() -> i
-    1:1:java.lang.Object getBoxedValue():972:972 -> m
-    boolean isDexValueArray() -> n
-    1:2:void sort():982:983 -> q
-    1:1:com.android.tools.r8.graph.DexValue[] getValues():952:952 -> r
-    1:1:java.lang.String toString():1006:1006 -> toString
-com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.C.o1:
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):938 -> a
+    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):939:940 -> a
+    6:6:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):932:932 -> a
+    1:3:boolean equals(java.lang.Object):971:973 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():951:951 -> h
+    1:1:int hashCode():963:963 -> hashCode
+    1:1:java.lang.Object getBoxedValue():946:946 -> k
+    1:2:void sort():956:957 -> m
+    1:1:com.android.tools.r8.graph.DexValue[] getValues():926:926 -> n
+    1:1:java.lang.String toString():980:980 -> toString
+com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.C.p1:
     com.android.tools.r8.graph.DexValue$DexValueBoolean TRUE -> d
     com.android.tools.r8.graph.DexValue$DexValueBoolean FALSE -> e
     com.android.tools.r8.graph.DexValue$DexValueBoolean DEFAULT -> f
     boolean value -> c
-    1:4:void <clinit>():1132:1135 -> <clinit>
-    1:2:void <init>(boolean):1139:1140 -> <init>
+    1:4:void <clinit>():1096:1099 -> <clinit>
+    1:2:void <init>(boolean):1103:1104 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1144:1144 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1158:1158 -> a
-    3:3:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1108:1108 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1122:1122 -> a
+    3:3:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     3:3:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1158 -> a
-    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1187:1187 -> a
-    1:1:boolean equals(java.lang.Object):1176:1176 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1163:1163 -> h
-    1:1:int hashCode():1168:1168 -> hashCode
-    1:1:boolean getValue():1148:1148 -> m
-    1:1:java.lang.Object getBoxedValue():1153 -> m
-    2:2:java.lang.Object getBoxedValue():1153:1153 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1130:1130 -> r
-    1:1:java.lang.String toString():1181:1181 -> toString
-com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.C.p1:
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1122 -> a
+    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1151:1151 -> a
+    1:1:boolean equals(java.lang.Object):1140:1140 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1127:1127 -> h
+    1:1:int hashCode():1132:1132 -> hashCode
+    1:1:boolean getValue():1112:1112 -> k
+    1:1:java.lang.Object getBoxedValue():1117 -> k
+    2:2:java.lang.Object getBoxedValue():1117:1117 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1094:1094 -> n
+    1:1:java.lang.String toString():1145:1145 -> toString
+com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.C.q1:
     byte value -> c
     com.android.tools.r8.graph.DexValue$DexValueByte DEFAULT -> d
-    1:1:void <clinit>():273:273 -> <clinit>
-    1:2:void <init>(byte):277:278 -> <init>
+    1:1:void <clinit>():257:257 -> <clinit>
+    1:2:void <init>(byte):261:262 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):296 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):297:297 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):280 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):281:281 -> a
     3:3:int com.android.tools.r8.dex.DexOutputBuffer.putSignedEncodedValue(long,int):88:88 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):297 -> a
-    4:4:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):282:282 -> a
-    5:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):326:326 -> a
-    1:1:boolean equals(java.lang.Object):315:315 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():302:302 -> h
-    1:1:int hashCode():307:307 -> hashCode
-    1:1:byte getValue():286:286 -> m
-    1:1:java.lang.Object getBoxedValue():291 -> m
-    2:2:java.lang.Object getBoxedValue():291:291 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:java.lang.String toString():320:320 -> toString
-com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.C.q1:
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):281 -> a
+    4:4:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):266:266 -> a
+    5:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):310:310 -> a
+    1:1:boolean equals(java.lang.Object):299:299 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():286:286 -> h
+    1:1:int hashCode():291:291 -> hashCode
+    1:1:byte getValue():270:270 -> k
+    1:1:java.lang.Object getBoxedValue():275 -> k
+    2:2:java.lang.Object getBoxedValue():275:275 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:java.lang.String toString():304:304 -> toString
+com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.C.r1:
     com.android.tools.r8.graph.DexValue$DexValueChar DEFAULT -> d
     char value -> c
-    1:1:void <clinit>():389:389 -> <clinit>
-    1:2:void <init>(char):392:393 -> <init>
+    1:1:void <clinit>():373:373 -> <clinit>
+    1:2:void <init>(char):376:377 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueChar create(char):397:397 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):411:412 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueChar create(char):381:381 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):395:396 -> a
     4:4:int com.android.tools.r8.dex.DexOutputBuffer.putUnsignedEncodedValue(long,int):92:92 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):412 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):396 -> a
     5:5:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):413 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):397 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):414 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):415:415 -> a
-    8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):444:444 -> a
-    1:1:boolean equals(java.lang.Object):433:433 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():420:420 -> h
-    1:1:int hashCode():425:425 -> hashCode
-    1:1:char getValue():401:401 -> m
-    1:1:java.lang.Object getBoxedValue():406 -> m
-    2:2:java.lang.Object getBoxedValue():406:406 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:java.lang.String toString():438:438 -> toString
-com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.C.r1:
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):398 -> a
+    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):399:399 -> a
+    8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):428:428 -> a
+    1:1:boolean equals(java.lang.Object):417:417 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():404:404 -> h
+    1:1:int hashCode():409:409 -> hashCode
+    1:1:char getValue():385:385 -> k
+    1:1:java.lang.Object getBoxedValue():390 -> k
+    2:2:java.lang.Object getBoxedValue():390:390 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:java.lang.String toString():422:422 -> toString
+com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.C.s1:
     com.android.tools.r8.graph.DexValue$DexValueDouble DEFAULT -> d
     double value -> c
-    1:1:void <clinit>():627:627 -> <clinit>
-    1:2:void <init>(double):631:632 -> <init>
+    1:1:void <clinit>():611:611 -> <clinit>
+    1:2:void <init>(double):615:616 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueDouble create(double):636:636 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):650:651 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueDouble create(double):620:620 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):634:635 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):652 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):636 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):653 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):654:654 -> a
-    7:7: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):665:665 -> a
-    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1016:1017 -> a
-    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):665 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1016:1016 -> a
-    10: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):665 -> a
-    1:2:boolean equals(java.lang.Object):678:679 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():659:659 -> h
-    1:1:int hashCode():670:670 -> hashCode
-    1:1:double getValue():640:640 -> m
-    1:1:java.lang.Object getBoxedValue():645 -> m
-    2:2:java.lang.Object getBoxedValue():645:645 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:double getValue():640:640 -> r
-    1:1:java.lang.String toString():684:684 -> toString
-com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.C.s1:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):905:905 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):902:902 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):916:916 -> a
-    1:1:boolean equals(java.lang.Object):902:902 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():902:902 -> h
-    1:1:int hashCode():902:902 -> hashCode
-    1:1:java.lang.Object getBoxedValue():902:902 -> m
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():902:902 -> toString
-com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.C.t1:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):869:869 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):866:866 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):880:880 -> a
-    1:1:boolean equals(java.lang.Object):866:866 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():866:866 -> h
-    1:1:int hashCode():866:866 -> hashCode
-    1:1:java.lang.Object getBoxedValue():866:866 -> m
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():866:866 -> toString
-com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.C.u1:
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):637 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):638:638 -> a
+    7:7: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):649:649 -> a
+    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1012:1013 -> a
+    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):649 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1012:1012 -> a
+    10: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):649 -> a
+    1:2:boolean equals(java.lang.Object):662:663 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():643:643 -> h
+    1:1:int hashCode():654:654 -> hashCode
+    1:1:double getValue():624:624 -> k
+    1:1:java.lang.Object getBoxedValue():629 -> k
+    2:2:java.lang.Object getBoxedValue():629:629 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:double getValue():624:624 -> n
+    1:1:java.lang.String toString():668:668 -> toString
+com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.C.t1:
+    1:1:void <init>(com.android.tools.r8.graph.DexField):879:879 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):876:876 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):890:890 -> a
+    1:1:boolean equals(java.lang.Object):876:876 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():876:876 -> h
+    1:1:int hashCode():876:876 -> hashCode
+    1:1:java.lang.Object getBoxedValue():876:876 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():876:876 -> toString
+com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.C.u1:
+    1:1:void <init>(com.android.tools.r8.graph.DexField):843:843 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):840:840 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):854:854 -> a
+    1:1:boolean equals(java.lang.Object):840:840 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():840:840 -> h
+    1:1:int hashCode():840:840 -> hashCode
+    1:1:java.lang.Object getBoxedValue():840:840 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():840:840 -> toString
+com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.C.v1:
     float value -> c
     com.android.tools.r8.graph.DexValue$DexValueFloat DEFAULT -> d
-    1:1:void <clinit>():564:564 -> <clinit>
-    1:2:void <init>(float):567:568 -> <init>
+    1:1:void <clinit>():548:548 -> <clinit>
+    1:2:void <init>(float):551:552 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueFloat create(float):572:572 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):586:587 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueFloat create(float):556:556 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):570:571 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):588 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):572 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):589 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):590:590 -> a
-    7:7: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):601:601 -> a
-    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1021:1022 -> a
-    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):601 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1021:1021 -> a
-    10: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):601 -> a
-    1:2:boolean equals(java.lang.Object):614:615 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():595:595 -> h
-    1:1:int hashCode():606:606 -> hashCode
-    1:1:float getValue():576:576 -> m
-    1:1:java.lang.Object getBoxedValue():581 -> m
-    2:2:java.lang.Object getBoxedValue():581:581 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:float getValue():576:576 -> r
-    1:1:java.lang.String toString():620:620 -> toString
-com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.C.v1:
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):573 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):574:574 -> a
+    7:7: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):585:585 -> a
+    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1017:1018 -> a
+    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):585 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1017:1017 -> a
+    10: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):585 -> a
+    1:2:boolean equals(java.lang.Object):598:599 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():579:579 -> h
+    1:1:int hashCode():590:590 -> hashCode
+    1:1:float getValue():560:560 -> k
+    1:1:java.lang.Object getBoxedValue():565 -> k
+    2:2:java.lang.Object getBoxedValue():565:565 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:float getValue():560:560 -> n
+    1:1:java.lang.String toString():604:604 -> toString
+com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.C.w1:
     int value -> c
     com.android.tools.r8.graph.DexValue$DexValueInt DEFAULT -> d
-    1:1:void <clinit>():450:450 -> <clinit>
-    1:2:void <init>(int):453:454 -> <init>
+    1:1:void <clinit>():434:434 -> <clinit>
+    1:2:void <init>(int):437:438 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):472:472 -> a
-    2:2: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):501:501 -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):458:458 -> b
-    1:1:boolean equals(java.lang.Object):490:490 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():477:477 -> h
-    1:1:int hashCode():482:482 -> hashCode
-    1:1:int getValue():462:462 -> m
-    1:1:java.lang.Object getBoxedValue():467 -> m
-    2:2:java.lang.Object getBoxedValue():467:467 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:java.lang.String toString():495:495 -> toString
-com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.C.w1:
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):456:456 -> a
+    2:2: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):485:485 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):442:442 -> b
+    1:1:boolean equals(java.lang.Object):474:474 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():461:461 -> h
+    1:1:int hashCode():466:466 -> hashCode
+    1:1:int getValue():446:446 -> k
+    1:1:java.lang.Object getBoxedValue():451 -> k
+    2:2:java.lang.Object getBoxedValue():451:451 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:java.lang.String toString():479:479 -> toString
+com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.C.x1:
     com.android.tools.r8.graph.DexValue$DexValueLong DEFAULT -> d
     long value -> c
-    1:1:void <clinit>():507:507 -> <clinit>
-    1:2:void <init>(long):510:511 -> <init>
+    1:1:void <clinit>():491:491 -> <clinit>
+    1:2:void <init>(long):494:495 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):515:515 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):529:529 -> a
-    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):558:558 -> a
-    4:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1035:1036 -> a
-    4:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):558 -> a
-    6:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1035:1035 -> a
-    6:6:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):558 -> a
-    1:1:boolean equals(java.lang.Object):547:547 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():534:534 -> h
-    1:1:int hashCode():539:539 -> hashCode
-    1:1:long getValue():519:519 -> m
-    1:1:java.lang.Object getBoxedValue():524 -> m
-    2:2:java.lang.Object getBoxedValue():524:524 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:long getValue():519:519 -> r
-    1:1:java.lang.String toString():552:552 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.C.x1:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod):887:887 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):884:884 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):898:898 -> a
-    1:1:boolean equals(java.lang.Object):884:884 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():884:884 -> h
-    1:1:int hashCode():884:884 -> hashCode
-    1:1:java.lang.Object getBoxedValue():884:884 -> m
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():884:884 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.C.y1:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1194:1194 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1191:1191 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1210:1210 -> a
-    1:1:boolean equals(java.lang.Object):1191:1191 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1191:1191 -> h
-    1:1:int hashCode():1191:1191 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> j
-    1:1:java.lang.Object getBoxedValue():1191:1191 -> m
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():1191:1191 -> toString
-com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.C.z1:
-    1:1:void <init>(com.android.tools.r8.graph.DexProto):923:923 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):920:920 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):939:939 -> a
-    1:1:boolean equals(java.lang.Object):920:920 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():920:920 -> h
-    1:1:int hashCode():920:920 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> k
-    1:1:java.lang.Object getBoxedValue():920:920 -> m
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():920:920 -> toString
-com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.C.A1:
+    1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):499:499 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):513:513 -> a
+    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542:542 -> a
+    4:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1031:1032 -> a
+    4:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542 -> a
+    6:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1031:1031 -> a
+    6:6:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542 -> a
+    1:1:boolean equals(java.lang.Object):531:531 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():518:518 -> h
+    1:1:int hashCode():523:523 -> hashCode
+    1:1:long getValue():503:503 -> k
+    1:1:java.lang.Object getBoxedValue():508 -> k
+    2:2:java.lang.Object getBoxedValue():508:508 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:long getValue():503:503 -> n
+    1:1:java.lang.String toString():536:536 -> toString
+com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.C.y1:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod):861:861 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):858:858 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):872:872 -> a
+    1:1:boolean equals(java.lang.Object):858:858 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():858:858 -> h
+    1:1:int hashCode():858:858 -> hashCode
+    1:1:java.lang.Object getBoxedValue():858:858 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():858:858 -> toString
+com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.C.z1:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1158:1158 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1155:1155 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1174:1174 -> a
+    1:1:boolean equals(java.lang.Object):1155:1155 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1155:1155 -> h
+    1:1:int hashCode():1155:1155 -> hashCode
+    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> i
+    1:1:java.lang.Object getBoxedValue():1155:1155 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():1155:1155 -> toString
+com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.C.A1:
+    1:1:void <init>(com.android.tools.r8.graph.DexProto):897:897 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):894:894 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):913:913 -> a
+    1:1:boolean equals(java.lang.Object):894:894 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():894:894 -> h
+    1:1:int hashCode():894:894 -> hashCode
+    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> j
+    1:1:java.lang.Object getBoxedValue():894:894 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():894:894 -> toString
+com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.C.B1:
     com.android.tools.r8.graph.DexValue NULL -> c
-    1:1:void <clinit>():1080:1080 -> <clinit>
-    1:1:void <init>():1083:1083 -> <init>
+    1:1:void <clinit>():1044:1044 -> <clinit>
+    1:1:void <init>():1047:1047 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1092 -> a
-    2:3:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1059:1060 -> a
-    2:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1126 -> a
-    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1059:1059 -> a
-    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1126 -> a
-    1:1:boolean equals(java.lang.Object):1115:1115 -> equals
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1056 -> a
+    2:3:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1056 -> a
+    2:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
+    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1055 -> a
+    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
+    1:1:boolean equals(java.lang.Object):1079:1079 -> equals
     java.lang.Object asAsmEncodedObject() -> h
-    java.lang.Object getBoxedValue() -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.C.B1:
+    java.lang.Object getBoxedValue() -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.C.C1:
     com.android.tools.r8.graph.DexValue$DexValueShort DEFAULT -> d
     short value -> c
-    1:1:void <clinit>():332:332 -> <clinit>
-    1:2:void <init>(short):335:336 -> <init>
+    1:1:void <clinit>():316:316 -> <clinit>
+    1:2:void <init>(short):319:320 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int) -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):340:340 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):354:354 -> a
-    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):383:383 -> a
-    1:1:boolean equals(java.lang.Object):372:372 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():359:359 -> h
-    1:1:int hashCode():364:364 -> hashCode
-    1:1:short getValue():344:344 -> m
-    1:1:java.lang.Object getBoxedValue():349 -> m
-    2:2:java.lang.Object getBoxedValue():349:349 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    1:1:java.lang.String toString():377:377 -> toString
-com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.C.C1:
-    1:1:void <init>(com.android.tools.r8.graph.DexString):759:759 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):725:725 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):756 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):756:756 -> a
-    3:7: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):775:779 -> a
-    1:1:boolean equals(java.lang.Object):756:756 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():764:764 -> h
-    1:1:int hashCode():756:756 -> hashCode
-    1:1:java.lang.Object getBoxedValue():756:756 -> m
-    boolean mayHaveSideEffects() -> p
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():699:699 -> s
-    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> s
-    1:1:java.lang.String toString():756:756 -> toString
-com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.C.D1:
-    1:1:void <init>(com.android.tools.r8.graph.DexType):841:841 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):838:838 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):852:852 -> a
-    1:1:boolean equals(java.lang.Object):838:838 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():838:838 -> h
-    1:1:int hashCode():838:838 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueType asDexValueType() -> l
-    1:1:java.lang.Object getBoxedValue():838:838 -> m
-    boolean isDexValueType() -> o
-    void sort() -> q
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():838:838 -> toString
-com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.C.E1:
+    1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):324:324 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):338:338 -> a
+    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):367:367 -> a
+    1:1:boolean equals(java.lang.Object):356:356 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():343:343 -> h
+    1:1:int hashCode():348:348 -> hashCode
+    1:1:short getValue():328:328 -> k
+    1:1:java.lang.Object getBoxedValue():333 -> k
+    2:2:java.lang.Object getBoxedValue():333:333 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    1:1:java.lang.String toString():361:361 -> toString
+com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.C.D1:
+    1:1:void <init>(com.android.tools.r8.graph.DexString):743:743 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue$NestedDexValue.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):709:709 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):740 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):740:740 -> a
+    3:7: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):759:763 -> a
+    1:1:boolean equals(java.lang.Object):740:740 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():748:748 -> h
+    1:1:int hashCode():740:740 -> hashCode
+    1:1:java.lang.Object getBoxedValue():740:740 -> k
+    boolean mayHaveSideEffects() -> l
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():683:683 -> o
+    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():0 -> o
+    1:1:java.lang.String toString():740:740 -> toString
+com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.C.E1:
+    1:1:void <init>(com.android.tools.r8.graph.DexType):825:825 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):822:822 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):836:836 -> a
+    1:1:boolean equals(java.lang.Object):822:822 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():822:822 -> h
+    1:1:int hashCode():822:822 -> hashCode
+    1:1:java.lang.Object getBoxedValue():822:822 -> k
+    void sort() -> m
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():822:822 -> toString
+com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.C.F1:
     com.android.tools.r8.graph.IndexedDexItem value -> c
-    1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):688:688 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):692:693 -> <init>
-    1:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):704:705 -> a
+    1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):672:672 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):676:677 -> <init>
+    1:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):688:689 -> a
     3:3:int com.android.tools.r8.dex.DexOutputBuffer.putUnsignedEncodedValue(long,int):92:92 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):706 -> a
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):690 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):707 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):708:708 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):691 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):692:692 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):708 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):709:709 -> a
-    1:3:boolean equals(java.lang.Object):743:745 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():719:719 -> h
-    1:1:int hashCode():735:735 -> hashCode
-    1:1:java.lang.Object getBoxedValue():714:714 -> m
-    byte getValueKind() -> r
-    1:1:java.lang.String toString():752:752 -> toString
-com.android.tools.r8.graph.DexValue$SimpleDexValue -> com.android.tools.r8.C.F1:
-    1:1:void <init>():242:242 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexValue$1):242:242 -> <init>
-    1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):263:263 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):692 -> a
+    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):693:693 -> a
+    1:3:boolean equals(java.lang.Object):727:729 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():703:703 -> h
+    1:1:int hashCode():719:719 -> hashCode
+    1:1:java.lang.Object getBoxedValue():698:698 -> k
+    byte getValueKind() -> n
+    1:1:java.lang.String toString():736:736 -> toString
+com.android.tools.r8.graph.DexValue$SimpleDexValue -> com.android.tools.r8.C.G1:
+    1:1:void <init>():226:226 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexValue$1):226:226 -> <init>
+    1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):247:247 -> a
     2:2:int com.android.tools.r8.dex.DexOutputBuffer.putSignedEncodedValue(long,int):88:88 -> a
-    2:2:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):264 -> a
+    2:2:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):248 -> a
     3:3:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    3:3:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):265 -> a
-    4:4:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    3:3:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):249 -> a
+    4:4:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     4:4:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):266 -> a
-    5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):267:267 -> a
-com.android.tools.r8.graph.DexValue$UnknownDexValue -> com.android.tools.r8.C.G1:
+    4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):250 -> a
+    5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):251:251 -> a
+com.android.tools.r8.graph.DexValue$UnknownDexValue -> com.android.tools.r8.C.H1:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> c
-    1:1:void <clinit>():184:184 -> <clinit>
-    1:1:void <init>():186:186 -> <init>
+    1:1:void <clinit>():168:168 -> <clinit>
+    1:1:void <init>():170:170 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):192:192 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):207:207 -> a
-    1:1:java.lang.Object asAsmEncodedObject():217:217 -> h
-    1:1:int hashCode():222:222 -> hashCode
-    1:1:java.lang.Object getBoxedValue():212:212 -> m
-    boolean mayHaveSideEffects() -> p
-    1:1:void sort():197:197 -> q
-com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.C.K1:
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):176:176 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):191:191 -> a
+    1:1:java.lang.Object asAsmEncodedObject():201:201 -> h
+    1:1:int hashCode():206:206 -> hashCode
+    1:1:java.lang.Object getBoxedValue():196:196 -> k
+    boolean mayHaveSideEffects() -> l
+    1:1:void sort():181:181 -> m
+com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.C.L1:
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> n
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> m
     boolean $assertionsDisabled -> o
@@ -19709,8 +19753,8 @@
     1:1:java.util.Collection allClasses():63:63 -> h
     1:1:java.util.Collection libraryClasses():72:72 -> i
     1:12:boolean verifyCodeObjectsOwners():144:155 -> j
-com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.C.I1:
-com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.C.J1:
+com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.C.J1:
+com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.C.K1:
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> m
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> l
     1:1:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DirectMappedDexApplication$1):161:161 -> <init>
@@ -19718,7 +19762,7 @@
     8:10:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication):176:178 -> <init>
     1:16:com.android.tools.r8.graph.DexApplication build():190:205 -> a
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.C.L1:
+com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.C.M1:
     com.android.tools.r8.graph.DexType enclosingClass -> a
     com.android.tools.r8.graph.DexMethod enclosingMethod -> b
     boolean $assertionsDisabled -> c
@@ -19741,7 +19785,7 @@
     3:3:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> toString
     3:3:java.lang.String toString():79 -> toString
     4:6:java.lang.String toString():79:81 -> toString
-com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.C.M1:
+com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.C.N1:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):44:44 -> <init>
@@ -19763,9 +19807,9 @@
     3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):59 -> g
     1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> z
     1:1:int getAsCfAccessFlags():72 -> z
-com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.C.N1:
-com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.C.O1:
-com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.C.P1:
+com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.C.O1:
+com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.C.P1:
+com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.C.Q1:
     java.util.Map infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -19780,7 +19824,7 @@
     9:10:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl rewrittenWithLens(com.android.tools.r8.graph.GraphLense):40:41 -> a
     11:11:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):43:43 -> a
     12:12:boolean verifyMappingIsOneToOne():50:50 -> a
-com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.C.Q1:
+com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.C.R1:
     java.util.Map readsWithContexts -> b
     java.util.Map writesWithContexts -> c
     com.android.tools.r8.graph.FieldAccessInfoImpl MISSING_FIELD_ACCESS_INFO -> d
@@ -19814,7 +19858,7 @@
     2:2:java.util.Set lambda$recordWrite$8(com.android.tools.r8.graph.DexField):180:180 -> e
     1:1:java.util.Set lambda$rewrittenWithLens$11(com.android.tools.r8.graph.DexField):209:209 -> f
     1:1:java.util.Set lambda$rewrittenWithLens$9(com.android.tools.r8.graph.DexField):200:200 -> g
-com.android.tools.r8.graph.GraphLense -> com.android.tools.r8.C.a2:
+com.android.tools.r8.graph.GraphLense -> com.android.tools.r8.C.b2:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():50:50 -> <clinit>
     1:1:void <init>():50:50 -> <init>
@@ -19871,8 +19915,8 @@
     3:3:com.android.tools.r8.graph.GraphLense getIdentityLense():497:497 -> d
     1:6:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):451:456 -> e
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.graph.GraphLense$1 -> com.android.tools.r8.C.R1:
-com.android.tools.r8.graph.GraphLense$Builder -> com.android.tools.r8.C.S1:
+com.android.tools.r8.graph.GraphLense$1 -> com.android.tools.r8.C.S1:
+com.android.tools.r8.graph.GraphLense$Builder -> com.android.tools.r8.C.T1:
     java.util.Map typeMap -> a
     java.util.Map methodMap -> b
     java.util.Map fieldMap -> c
@@ -19885,13 +19929,13 @@
     1:1:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):362:362 -> b
     1:1:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):376 -> b
     2:2:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):377:377 -> b
-com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> com.android.tools.r8.C.T1:
+com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> com.android.tools.r8.C.U1:
     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):62:64 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getMethod():68:68 -> a
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():72:72 -> b
-com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> com.android.tools.r8.C.U1:
+com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> com.android.tools.r8.C.V1:
     com.android.tools.r8.graph.GraphLense$IdentityGraphLense INSTANCE -> b
     1:1:void <clinit>():772:772 -> <clinit>
     1:1:void <init>():774:774 -> <init>
@@ -19907,7 +19951,7 @@
     1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense getInstance():777:777 -> e
     1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense access$100():770 -> e
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):817:817 -> f
-com.android.tools.r8.graph.GraphLense$NestedGraphLense -> com.android.tools.r8.C.V1:
+com.android.tools.r8.graph.GraphLense$NestedGraphLense -> com.android.tools.r8.C.W1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     java.util.Map typeMap -> d
     boolean $assertionsDisabled -> j
@@ -19945,7 +19989,7 @@
     1:3:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):1015:1017 -> e
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):962:962 -> f
     1:17:java.lang.String toString():1040:1056 -> toString
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription -> com.android.tools.r8.C.Z1:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription -> com.android.tools.r8.C.a2:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none -> d
     boolean hasBeenChangedToReturnVoid -> a
@@ -19968,7 +20012,7 @@
     1:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription withConstantReturn():322:323 -> e
     1:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription withExtraNullParameter():333:334 -> f
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none():257:257 -> g
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.C.X1:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.C.Y1:
     com.android.tools.r8.graph.DexType type -> c
     boolean isAlwaysNull -> b
     int argumentIndex -> a
@@ -19979,7 +20023,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():127:127 -> b
     1:1:boolean isAlwaysNull():131:131 -> c
     1:1:boolean isNeverUsed():135:135 -> d
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.C.W1:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.C.X1:
     com.android.tools.r8.graph.DexType type -> c
     boolean isAlwaysNull -> b
     boolean $assertionsDisabled -> d
@@ -19990,7 +20034,7 @@
     2:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):97:97 -> a
     3:5:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo build():102:104 -> a
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setIsAlwaysNull():92:92 -> b
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo -> com.android.tools.r8.C.Y1:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo -> com.android.tools.r8.C.Z1:
     java.util.List removedArguments -> a
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty -> b
     boolean $assertionsDisabled -> c
@@ -20006,7 +20050,7 @@
     1:3:java.util.ListIterator iterator():174:176 -> b
     1:1:int numberOfRemovedArguments():195:195 -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty():170:170 -> d
-com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.C.b2:
+com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.C.c2:
     int sortedIndex -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
@@ -20018,7 +20062,7 @@
     1:4:int sortedCompareTo(int):45:48 -> c
     1:1:int getSortedIndex():40:40 -> i
     1:1:void resetSortedIndex():58:58 -> j
-com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.C.c2:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.C.d2:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType outer -> c
@@ -20057,7 +20101,7 @@
     5:5:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> toString
     5:5:java.lang.String toString():110 -> toString
     6:7:java.lang.String toString():110:111 -> toString
-com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.C.d2:
+com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.C.e2:
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
     java.util.concurrent.ConcurrentHashMap asmTypeCache -> c
@@ -20105,7 +20149,7 @@
     1:4:java.lang.String getShortyDescriptor(java.lang.String):130:133 -> h
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmObjectType$0(java.lang.String):32:32 -> i
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmType$1(java.lang.String):36:36 -> j
-com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.C.j2:
+com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.C.k2:
     com.android.tools.r8.dex.ClassesChecksum checksums -> c
     java.util.function.Consumer classConsumer -> b
     boolean $assertionsDisabled -> e
@@ -20156,7 +20200,7 @@
     7:8:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):184:185 -> b
     9:15:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):184:190 -> b
     1:1:com.android.tools.r8.graph.FieldAccessFlags createFieldAccessFlags(int):149:149 -> c
-com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.C.e2:
+com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.C.f2:
     java.util.List values -> d
     java.util.List names -> c
     boolean $assertionsDisabled -> e
@@ -20166,26 +20210,23 @@
     1:1:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):883:883 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.JarApplicationReader,java.util.function.BiConsumer):878:885 -> <init>
     1:2:void visitEnum(java.lang.String,java.lang.String,java.lang.String):895:896 -> a
-    3:3:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.JarApplicationReader.getField(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):88:88 -> a
-    3:3:void visitEnum(java.lang.String,java.lang.String,java.lang.String):896 -> a
-    4:4:void visitEnum(java.lang.String,java.lang.String,java.lang.String):896:896 -> a
-    5:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):901:901 -> a
-    6:7:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):902:903 -> a
-    8:8:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):902:902 -> a
-    9:9:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):908:908 -> a
-    10:11:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):909:910 -> a
-    12:12:void visitEnd():916:916 -> a
-    13:18:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):921:926 -> a
-    19:40:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):992:1013 -> a
-    19:40:void visit(java.lang.String,java.lang.Object):890 -> a
-    41:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):930:985 -> a
-    41:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1015 -> a
-    41:96:void visit(java.lang.String,java.lang.Object):890 -> a
-    97:97:void visit(java.lang.String,java.lang.Object):890:890 -> a
-    98:98:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):987:987 -> a
-    98:98:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1015 -> a
-    98:98:void visit(java.lang.String,java.lang.Object):890 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.C.f2:
+    3:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):901:901 -> a
+    4:5:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):902:903 -> a
+    6:6:void lambda$visitAnnotation$0(java.lang.String,java.lang.String,java.util.List,java.util.List):902:902 -> a
+    7:7:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):908:908 -> a
+    8:9:void lambda$visitArray$1(java.lang.String,java.util.List,java.util.List):909:910 -> a
+    10:10:void visitEnd():916:916 -> a
+    11:16:void addElement(java.lang.String,com.android.tools.r8.graph.DexValue):921:926 -> a
+    17:38:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):992:1013 -> a
+    17:38:void visit(java.lang.String,java.lang.Object):890 -> a
+    39:94:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):930:985 -> a
+    39:94:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1015 -> a
+    39:94:void visit(java.lang.String,java.lang.Object):890 -> a
+    95:95:void visit(java.lang.String,java.lang.Object):890:890 -> a
+    96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):987:987 -> a
+    96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1015 -> a
+    96:96:void visit(java.lang.String,java.lang.Object):890 -> a
+com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.C.g2:
     com.android.tools.r8.graph.ClassKind classKind -> d
     java.util.List annotations -> r
     java.util.Set methodSignatures -> y
@@ -20223,107 +20264,104 @@
     8:22:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):244:258 -> a
     23:23:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):253:253 -> a
     24:29:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):264:269 -> a
-    30:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):96:96 -> a
-    30:30:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):269 -> a
-    31:31:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):269:269 -> a
-    32:34:void visitNestHost(java.lang.String):274:276 -> a
-    35:35:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299:299 -> a
-    36:36:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):287:287 -> a
+    30:32:void visitNestHost(java.lang.String):274:276 -> a
+    33:33:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299:299 -> a
+    34:34:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):287:287 -> a
+    34:34:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299 -> a
+    35:35:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> a
+    35:35:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):288 -> a
+    35:35:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299 -> a
+    36:36:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):288:288 -> a
     36:36:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299 -> a
-    37:37:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> a
-    37:37:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):288 -> a
-    37:37:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299 -> a
-    38:38:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):288:288 -> a
-    38:38:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299 -> a
-    39:39:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299:299 -> a
-    40:40:java.lang.String illegalClassFilePostfix(int):294:294 -> a
-    40:40:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):301 -> a
-    41:41:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):301:301 -> a
-    42:57:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):307:322 -> a
-    58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    58:58:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):322 -> a
-    59:62:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):322:325 -> a
-    63:63:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> a
-    63:63:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):325 -> a
-    64:67:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):326:329 -> a
-    68:68:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328:328 -> a
-    69:69:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    69:69:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    69:69:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328 -> a
-    70:77:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328:335 -> a
-    78:85:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.JarApplicationReader.getTypeListFromNames(java.lang.String[]):62:69 -> a
-    78:85:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335 -> a
-    86:88:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335:337 -> a
-    89:89:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
+    37:37:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):299:299 -> a
+    38:38:java.lang.String illegalClassFilePostfix(int):294:294 -> a
+    38:38:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):301 -> a
+    39:39:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,int,java.lang.String):301:301 -> a
+    40:55:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):307:322 -> a
+    56:56:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    56:56:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    56:56:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):322 -> a
+    57:60:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):322:325 -> a
+    61:61:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> a
+    61:61:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):325 -> a
+    62:65:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):326:329 -> a
+    66:66:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328:328 -> a
+    67:67:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    67:67:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    67:67:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328 -> a
+    68:75:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):328:335 -> a
+    76:83:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.JarApplicationReader.getTypeListFromNames(java.lang.String[]):62:69 -> a
+    76:83:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335 -> a
+    84:86:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335:337 -> a
+    87:87:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
+    87:87:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):337 -> a
+    88:88:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):337:337 -> a
+    89:89:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):521:521 -> a
     89:89:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):337 -> a
-    90:90:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):337:337 -> a
-    91:91:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):521:521 -> a
-    91:91:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):337 -> a
-    92:92:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.JarApplicationReader.getTypeListFromNames(java.lang.String[]):62:62 -> a
-    92:92:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335 -> a
-    93:95:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):316:318 -> a
+    90:90:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.JarApplicationReader.getTypeListFromNames(java.lang.String[]):62:62 -> a
+    90:90:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):335 -> a
+    91:93:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):316:318 -> a
+    94:94:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):317:317 -> a
+    95:95:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    95:95:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    95:95:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):317 -> a
     96:96:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):317:317 -> a
-    97:97:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    97:97:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    97:97:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):317 -> a
-    98:98:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):317:317 -> a
+    97:97:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309:309 -> a
+    98:98:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    98:98:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    98:98:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309 -> a
     99:99:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309:309 -> a
-    100:100:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    100:100:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    100:100:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309 -> a
-    101:101:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):309:309 -> a
-    102:107:void visitSource(java.lang.String,java.lang.String):344:349 -> a
-    108:108:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    108:108:void visitSource(java.lang.String,java.lang.String):349 -> a
-    109:112: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):199:202 -> a
-    109:112:void visitSource(java.lang.String,java.lang.String):348 -> a
-    113:113:void visitSource(java.lang.String,java.lang.String):347:347 -> a
-    114:115:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):356:357 -> a
-    116:116:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
-    116:116:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):358 -> a
-    117:119:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):362:364 -> a
-    120:121:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):370:371 -> a
-    122:122:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    100:105:void visitSource(java.lang.String,java.lang.String):344:349 -> a
+    106:106:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
+    106:106:void visitSource(java.lang.String,java.lang.String):349 -> a
+    107:110: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):199:202 -> a
+    107:110:void visitSource(java.lang.String,java.lang.String):348 -> a
+    111:111:void visitSource(java.lang.String,java.lang.String):347:347 -> a
+    112:113:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):356:357 -> a
+    114:114:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
+    114:114:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):358 -> a
+    115:117:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):362:364 -> a
+    118:119:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):370:371 -> a
+    120:120:boolean com.android.tools.r8.graph.AccessFlags.isStatic():167:167 -> a
+    120:120:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):372 -> a
+    121:121:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> a
+    121:121:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):372 -> a
+    122:122:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
     122:122:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):372 -> a
-    123:123:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> a
-    123:123:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):372 -> a
-    124:124:boolean com.android.tools.r8.graph.AccessFlags.isPrivate():141:141 -> a
-    124:124:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):372 -> a
-    125:126:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:377 -> a
-    127:127:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):382:382 -> a
-    128:129:void visitEnd():399:400 -> a
-    130:130:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    130:130:void visitEnd():401 -> a
-    131:131:void visitEnd():400:400 -> a
-    132:132:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):521:521 -> a
-    132:132:void visitEnd():400 -> a
-    133:133:void checkReachabilitySensitivity():478:478 -> a
+    123:124:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:377 -> a
+    125:125:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):382:382 -> a
+    126:127:void visitEnd():399:400 -> a
+    128:128:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
+    128:128:void visitEnd():401 -> a
+    129:129:void visitEnd():400:400 -> a
+    130:130:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):521:521 -> a
+    130:130:void visitEnd():400 -> a
+    131:131:void checkReachabilitySensitivity():478:478 -> a
+    131:131:void visitEnd():403 -> a
+    132:132:boolean hasReachabilitySensitiveField():495:495 -> a
+    132:132:void checkReachabilitySensitivity():478 -> a
+    132:132:void visitEnd():403 -> a
+    133:133:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
+    133:133:boolean hasReachabilitySensitiveField():495 -> a
+    133:133:void checkReachabilitySensitivity():478 -> a
     133:133:void visitEnd():403 -> a
-    134:134:boolean hasReachabilitySensitiveField():495:495 -> a
-    134:134:void checkReachabilitySensitivity():478 -> a
-    134:134:void visitEnd():403 -> a
-    135:135:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    135:135:boolean hasReachabilitySensitiveField():495 -> a
-    135:135:void checkReachabilitySensitivity():478 -> a
-    135:135:void visitEnd():403 -> a
-    136:146:boolean hasReachabilitySensitiveField():495:505 -> a
-    136:146:void checkReachabilitySensitivity():478 -> a
-    136:146:void visitEnd():403 -> a
-    147:156:void checkReachabilitySensitivity():479:488 -> a
-    147:156:void visitEnd():403 -> a
-    157:174:void visitEnd():404:421 -> a
-    175:175:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
-    175:175:void visitEnd():422 -> a
-    176:176:void visitEnd():422:422 -> a
-    177:215:void visitEnd():405:443 -> a
-    216:216:void visitEnd():439:439 -> a
-    217:217:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    217:217:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    217:217:void visitEnd():439 -> a
-    218:242:void visitEnd():439:463 -> a
-    243:246:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):514:517 -> a
-    243:246:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):193 -> a
+    134:144:boolean hasReachabilitySensitiveField():495:505 -> a
+    134:144:void checkReachabilitySensitivity():478 -> a
+    134:144:void visitEnd():403 -> a
+    145:154:void checkReachabilitySensitivity():479:488 -> a
+    145:154:void visitEnd():403 -> a
+    155:172:void visitEnd():404:421 -> a
+    173:173:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():40:40 -> a
+    173:173:void visitEnd():422 -> a
+    174:174:void visitEnd():422:422 -> a
+    175:213:void visitEnd():405:443 -> a
+    214:214:void visitEnd():439:439 -> a
+    215:215:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    215:215:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    215:215:void visitEnd():439 -> a
+    216:240:void visitEnd():439:463 -> a
+    241:244:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):514:517 -> a
+    241:244:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):193 -> a
     1:1:int access$1100(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> b
     2:4:void visitNestMember(java.lang.String):281:283 -> b
     5:5:boolean isInANest():540:540 -> b
@@ -20346,7 +20384,7 @@
     1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> j
     1:1:com.android.tools.r8.graph.ClassKind access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> k
     1:1:com.android.tools.r8.origin.Origin access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> l
-com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.C.g2:
+com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.C.h2:
     com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> b
     java.lang.Object value -> f
     boolean $assertionsDisabled -> h
@@ -20381,7 +20419,7 @@
     57:60:java.util.List getAnnotations():658:661 -> a
     57:60:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):584 -> a
     61:61:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):584:584 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.C.h2:
+com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.C.i2:
     java.util.List parameterFlags -> r
     int annotableParameterCount -> o
     java.util.List parameterNames -> q
@@ -20424,14 +20462,14 @@
     5:5:void visitEnd():798 -> c
     6:8:boolean classRequiresCode():788:790 -> c
     6:8:void visitEnd():798 -> c
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> c
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1055 -> c
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> c
     9:9:boolean classRequiresCode():790 -> c
     9:9:void visitEnd():798 -> c
     10:12:boolean classRequiresCode():790:792 -> c
     10:12:void visitEnd():798 -> c
     13:23:void visitEnd():799:809 -> c
-    24:24:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):56:56 -> c
+    24:24:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> c
     24:24:void visitEnd():809 -> c
     25:29:void visitEnd():811:815 -> c
     30:36:void visitEnd():814:820 -> c
@@ -20461,17 +20499,17 @@
     87:87:void visitEnd():841:841 -> c
     88:96:void visitEnd():839:847 -> c
     1:4:java.util.List getAnnotations():863:866 -> d
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.C.i2:
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.C.j2:
     com.android.tools.r8.graph.DexClass owner -> b
     byte[] classCache -> a
     java.util.List codeList -> c
     1:8:void <init>():1019:1026 -> <init>
-com.android.tools.r8.graph.KeyedDexItem -> com.android.tools.r8.C.k2:
+com.android.tools.r8.graph.KeyedDexItem -> com.android.tools.r8.C.l2:
     1:1:void <init>():6:6 -> <init>
     1:1:boolean equals(java.lang.Object):15:15 -> equals
     1:1:int hashCode():20:20 -> hashCode
     com.android.tools.r8.graph.PresortedComparable getKey() -> p
-com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.C.q2:
+com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.C.r2:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> e
     com.android.tools.r8.graph.JarApplicationReader application -> c
     com.android.tools.r8.graph.CfCode code -> d
@@ -20513,8 +20551,8 @@
     boolean isCfCode() -> m
     1:2:void markReachabilitySensitive():106:107 -> p
     1:1:java.lang.String toString():214:214 -> toString
-com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.C.l2:
-com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.C.m2:
+com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.C.m2:
+com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.C.n2:
     java.util.function.BiFunction codeLocator -> d
     com.android.tools.r8.graph.JarApplicationReader application -> e
     boolean usrJsrInliner -> f
@@ -20526,7 +20564,7 @@
     3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isNative():142:142 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):265 -> a
     4:11:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):266:273 -> a
-com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.C.n2:
+com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.C.o2:
     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):226:226 -> <init>
@@ -20535,9 +20573,9 @@
     1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):226:226 -> apply
     2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):238:238 -> apply
     2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):226 -> apply
-com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.C.o2:
+com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.C.p2:
     1:1:void <init>(java.lang.String):87:87 -> <init>
-com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.C.p2:
+com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.C.q2:
     java.util.Map canonicalDebugLocalInfo -> q
     java.util.Map labelMap -> r
     int maxStack -> l
@@ -20561,7 +20599,7 @@
     9:11:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):324 -> a
     12:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):325:325 -> a
     13:14:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):386:387 -> a
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     15:15:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):387 -> a
     16:16:void visitInsn(int):553:553 -> a
     17:19:void visitInsn(int):421:423 -> a
@@ -20597,56 +20635,53 @@
     277:277:void visitInsn(int):544:544 -> a
     278:278:void visitInsn(int):541:541 -> a
     279:279:void visitTypeInsn(int,java.lang.String):665:665 -> a
-    280:280:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    280:280:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     280:280:void visitTypeInsn(int,java.lang.String):665 -> a
     281:284:void visitTypeInsn(int,java.lang.String):677:680 -> a
     285:285:void visitTypeInsn(int,java.lang.String):674:674 -> a
     286:286:void visitTypeInsn(int,java.lang.String):671:671 -> a
     287:287:void visitTypeInsn(int,java.lang.String):668:668 -> a
     288:289:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):686:687 -> a
-    290:290:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    290:290:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     290:290:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):687 -> a
-    291:291:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1262:1262 -> a
+    291:291:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
     291:291:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):687 -> a
     292:292:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):690:690 -> a
     293:293:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):695:695 -> a
     294:294: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
     294:294:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):695 -> a
-    295:295:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String):96:96 -> a
-    295:295:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):92 -> a
-    295:295:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):695 -> a
-    296:296:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):696:696 -> a
-    297:299:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):701:703 -> a
-    300:330:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):708:738 -> a
-    331:335:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):732:736 -> a
-    336:336:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):728:728 -> a
-    337:337:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):772:772 -> a
-    338:344:void visitLdcInsn(java.lang.Object):777:783 -> a
-    345:345:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    345:345:void visitLdcInsn(java.lang.Object):783 -> a
-    346:363:void visitLdcInsn(java.lang.Object):783:800 -> a
-    364:368:void visitLdcInsn(java.lang.Object):798:802 -> a
-    369:369:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    369:369:void visitLdcInsn(java.lang.Object):802 -> a
-    370:370:void visitLdcInsn(java.lang.Object):802:802 -> a
-    371:371:void visitIincInsn(int,int):808:808 -> a
-    372:377:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):813:818 -> a
-    378:382:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):823:827 -> a
-    383:384:void visitMultiANewArrayInsn(java.lang.String,int):832:833 -> a
-    385:385:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    385:385:void visitMultiANewArrayInsn(java.lang.String,int):833 -> a
-    386:424:void visitMultiANewArrayInsn(java.lang.String,int):833:871 -> a
-    425:425: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):879:879 -> a
-    426:429: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):878:881 -> a
-    430:433: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):887:890 -> a
-    434:434:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    434:434: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):891 -> a
-    435:435: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):892:892 -> a
-    436:442: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):888:894 -> a
-    443:444:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):55:56 -> a
-    443:444:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):894 -> a
-    445:445: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):893:893 -> a
-    446:446:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):898:898 -> a
+    295:295:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):696:696 -> a
+    296:298:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):701:703 -> a
+    299:329:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):708:738 -> a
+    330:334:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):732:736 -> a
+    335:335:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):728:728 -> a
+    336:336:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):772:772 -> a
+    337:343:void visitLdcInsn(java.lang.Object):777:783 -> a
+    344:344:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    344:344:void visitLdcInsn(java.lang.Object):783 -> a
+    345:362:void visitLdcInsn(java.lang.Object):783:800 -> a
+    363:367:void visitLdcInsn(java.lang.Object):798:802 -> a
+    368:368:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    368:368:void visitLdcInsn(java.lang.Object):802 -> a
+    369:369:void visitLdcInsn(java.lang.Object):802:802 -> a
+    370:370:void visitIincInsn(int,int):808:808 -> a
+    371:376:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):813:818 -> a
+    377:381:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):823:827 -> a
+    382:383:void visitMultiANewArrayInsn(java.lang.String,int):832:833 -> a
+    384:384:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    384:384:void visitMultiANewArrayInsn(java.lang.String,int):833 -> a
+    385:423:void visitMultiANewArrayInsn(java.lang.String,int):833:871 -> a
+    424:424: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):879:879 -> a
+    425:428: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):878:881 -> a
+    429:432: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):887:890 -> a
+    433:433:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    433:433: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):891 -> a
+    434:434: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):892:892 -> a
+    435:441: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):888:894 -> a
+    442:443:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):55:56 -> a
+    442:443:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):894 -> a
+    444:444: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):893:893 -> a
+    445:445:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):898:898 -> a
     1:6:void visitCode():304:309 -> b
     7:11:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):351:355 -> b
     12:24:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):367:379 -> b
@@ -20703,7 +20738,7 @@
     4:8:void visitVarInsn(int,int):637:641 -> d
     9:35:void visitVarInsn(int,int):633:659 -> d
     36:36:void visitVarInsn(int,int):652:652 -> d
-com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.C.t2:
+com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.C.u2:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> l
     com.android.tools.r8.utils.ProgramClassCollection programClasses -> j
@@ -20725,8 +20760,8 @@
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication toDirect():253:253 -> g
     1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses loadAllClasses():191:191 -> h
     1:1:java.lang.String toString():258:258 -> toString
-com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.C.r2:
-com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.C.s2:
+com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.C.s2:
+com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.C.t2:
     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
@@ -20740,7 +20775,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getLibraryClasses():166:166 -> b
     boolean lambda$new$2(com.android.tools.r8.graph.DexType) -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getProgramClasses():158:158 -> c
-com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.C.t2$a:
+com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.C.u2$a:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver resolver -> n
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> m
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> l
@@ -20752,7 +20787,7 @@
     3:3:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setLibraryClassCollection(com.android.tools.r8.utils.LibraryClassCollection):226:226 -> a
     4:10:com.android.tools.r8.graph.LazyLoadedDexApplication build():232:238 -> a
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.C.u2:
+com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.C.v2:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):61:61 -> <init>
@@ -20801,21 +20836,21 @@
     5:5:void unsetDeclaredSynchronized():192:192 -> e
     5:5:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):89 -> e
     1:1:com.android.tools.r8.graph.MethodAccessFlags copy():66:66 -> z
-com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.C.v2:
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.C.w2:
     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.C.w2:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.C.x2:
     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.ObjectToOffsetMapping -> com.android.tools.r8.C.y2:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.C.z2:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap types -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap methods -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap fields -> e
@@ -20861,13 +20896,13 @@
     1:1:java.util.Collection getStrings():179:179 -> i
     1:1:java.util.Collection getTypes():167:167 -> j
     1:1:boolean hasJumboStrings():191:191 -> k
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.C.x2:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.C.y2:
     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):103:103 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexApplication):101:105 -> <init>
     1:22:int getDepth(com.android.tools.r8.graph.DexProgramClass):109:130 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.C.z2:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.C.A2:
     com.android.tools.r8.graph.DexProto[] protos -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
@@ -20907,38 +20942,37 @@
     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.C.A2:
+com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.C.B2:
     com.android.tools.r8.graph.ParameterAnnotationsList EMPTY_PARAMETER_ANNOTATIONS_LIST -> c
     com.android.tools.r8.graph.DexAnnotationSet[] values -> a
     int missingParameterAnnotations -> b
     boolean $assertionsDisabled -> d
-    1:3:void <clinit>():38:40 -> <clinit>
-    1:3:void <init>():50:52 -> <init>
-    4:7:void <init>(com.android.tools.r8.graph.DexAnnotationSet[],int):59:62 -> <init>
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):88:88 -> a
-    2:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):94:95 -> a
-    4:12:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):178:186 -> a
-    13:13:com.android.tools.r8.graph.ParameterAnnotationsList empty():47:47 -> a
-    13:13:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):194 -> a
-    14:14:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):196:196 -> a
-    15:17:com.android.tools.r8.graph.ParameterAnnotationsList rewrite(java.util.function.Function):200:202 -> a
-    1:3:void forEachAnnotation(java.util.function.Consumer):104:106 -> b
-    4:8:com.android.tools.r8.graph.DexAnnotationSet get(int):147:151 -> b
-    1:2:boolean isMissing(int):134:135 -> c
-    1:13:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):156:168 -> d
-    1:2:boolean equals(java.lang.Object):79:80 -> equals
-    1:1:int countNonMissing():124:124 -> h
-    1:1:int hashCode():71:71 -> hashCode
-    1:1:boolean isEmpty():99:99 -> i
-    1:1:int size():116:116 -> j
-    1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():47:47 -> k
-com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.C.B2:
+    1:3:void <clinit>():36:38 -> <clinit>
+    1:3:void <init>():48:50 -> <init>
+    4:7:void <init>(com.android.tools.r8.graph.DexAnnotationSet[],int):57:60 -> <init>
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):86:86 -> a
+    2:3:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):92:93 -> a
+    4:12:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):176:184 -> a
+    13:13:com.android.tools.r8.graph.ParameterAnnotationsList empty():45:45 -> a
+    13:13:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):192 -> a
+    14:14:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):194:194 -> a
+    1:3:void forEachAnnotation(java.util.function.Consumer):102:104 -> b
+    4:8:com.android.tools.r8.graph.DexAnnotationSet get(int):145:149 -> b
+    1:2:boolean isMissing(int):132:133 -> c
+    1:13:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):154:166 -> d
+    1:2:boolean equals(java.lang.Object):77:78 -> equals
+    1:1:int countNonMissing():122:122 -> h
+    1:1:int hashCode():69:69 -> hashCode
+    1:1:boolean isEmpty():97:97 -> i
+    1:1:int size():114:114 -> j
+    1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():45:45 -> k
+com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.C.C2:
     int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens) -> a
     int slowCompareTo(java.lang.Object) -> a
     1:1:boolean isSorted(java.util.List):15:15 -> a
     2:4:boolean isSorted(java.util.List,java.util.function.Function):25:27 -> a
     5:5:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):44:44 -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.C.C2:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.C.D2:
     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>
@@ -20951,76 +20985,76 @@
     16:17:void accept(com.android.tools.r8.graph.DexTypeList):50:51 -> b
     16:17:void accept(com.android.tools.r8.graph.DexClass):60 -> b
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> b
-com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.C.L2:
+com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.C.M2:
     1:1:void <clinit>():14:14 -> <clinit>
     void forEachTarget(java.util.function.Consumer) -> a
     boolean hasSingleTarget() -> a
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
-    1:2:void lambda$lookupVirtualTargets$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):53:54 -> a
-    3:64:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):64:125 -> a
+    1:2:void lambda$lookupVirtualTargets$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):50:51 -> a
+    3:63:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):60:120 -> a
     com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    1:14:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):38:51 -> b
-    15:15:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):111:111 -> b
-    16:16:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> b
-    16:16:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):111 -> b
-    17:17:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):111:111 -> b
-    18:18:boolean com.android.tools.r8.graph.MethodAccessFlags.isBridge():122:122 -> b
-    18:18:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):111 -> b
-    19:19:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):112:112 -> b
+    1:12:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):37:48 -> b
+    13:13:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):107:107 -> b
+    14:14:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> b
+    14:14:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):107 -> b
+    15:15:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):107:107 -> b
+    16:16:boolean com.android.tools.r8.graph.MethodAccessFlags.isBridge():122:122 -> b
+    16:16:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):107 -> b
+    17:17:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):108:108 -> b
     com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve() -> c
-    1:1:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):100:100 -> c
+    1:1:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):96:96 -> c
     2:2:boolean com.android.tools.r8.graph.MethodAccessFlags.isAbstract():150:150 -> c
-    2:2:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):100 -> c
-    3:3:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):101:101 -> c
+    2:2:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):96 -> c
+    3:3:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):97:97 -> c
     boolean isValidVirtualTargetForDynamicDispatch() -> d
     java.util.List asListOfTargets() -> e
-com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.C.D2:
+com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.C.E2:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():38:38 -> <clinit>
-com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.C.E2:
+    1:1:void <clinit>():37:37 -> <clinit>
+com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.C.F2:
     com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult INSTANCE -> a
-    1:1:void <clinit>():228:228 -> <clinit>
-    1:1:void <init>():230:230 -> <init>
+    1:1:void <clinit>():223:223 -> <clinit>
+    1:1:void <init>():225:225 -> <init>
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isValidVirtualTargetForDynamicDispatch() -> d
-com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.C.F2:
+com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.C.G2:
     com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult INSTANCE -> a
-    1:1:void <clinit>():259:259 -> <clinit>
-    1:1:void <init>():261:261 -> <init>
-com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.C.G2:
-    1:1:void <init>():188:188 -> <init>
+    1:1:void <clinit>():254:254 -> <clinit>
+    1:1:void <init>():256:256 -> <init>
+com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.C.H2:
+    1:1:void <init>():183:183 -> <init>
     void forEachTarget(java.util.function.Consumer) -> a
     boolean hasSingleTarget() -> a
     java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> a
     com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
     java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve() -> c
-    1:1:java.util.List asListOfTargets():207:207 -> e
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.C.H2:
-    1:1:void <init>():245:245 -> <init>
+    1:1:java.util.List asListOfTargets():202:202 -> e
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.C.I2:
+    1:1:void <init>():240:240 -> <init>
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isValidVirtualTargetForDynamicDispatch() -> d
-com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.C.I2:
+com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.C.J2:
     com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult INSTANCE -> a
-    1:1:void <clinit>():267:267 -> <clinit>
-    1:1:void <init>():269:269 -> <init>
-com.android.tools.r8.graph.ResolutionResult$MultiResult -> com.android.tools.r8.C.J2:
+    1:1:void <clinit>():262:262 -> <clinit>
+    1:1:void <init>():264:264 -> <init>
+com.android.tools.r8.graph.ResolutionResult$MultiResult -> com.android.tools.r8.C.K2:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList methods -> a
-    1:1:void <clinit>():131:131 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):135:137 -> <init>
+    1:1:void <clinit>():126:126 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):130:132 -> <init>
     boolean hasSingleTarget() -> a
-    1:2:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):142:143 -> a
-    3:3:void forEachTarget(java.util.function.Consumer):184:184 -> a
+    1:2:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):137:138 -> a
+    3:3:void forEachTarget(java.util.function.Consumer):179:179 -> a
     com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():163:163 -> c
-    1:2:boolean isValidVirtualTargetForDynamicDispatch():152:153 -> d
-    1:1:java.util.List asListOfTargets():179:179 -> e
-com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.C.K2:
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():158:158 -> c
+    1:2:boolean isValidVirtualTargetForDynamicDispatch():147:148 -> d
+    1:1:java.util.List asListOfTargets():174:174 -> e
+com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.C.L2:
     com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult INSTANCE -> a
-    1:1:void <clinit>():275:275 -> <clinit>
-    1:1:void <init>():277:277 -> <init>
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.C.M2:
+    1:1:void <clinit>():270:270 -> <clinit>
+    1:1:void <init>():272:272 -> <init>
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.C.N2:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):14:14 -> <init>
     com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
     1:1:void visit(java.lang.Iterable,java.util.function.Consumer):9:9 -> a
@@ -21048,7 +21082,7 @@
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):50:50 -> b
     2:3:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:61 -> b
     2:3:com.android.tools.r8.graph.ClassHierarchyTraversal excludeInterfaces():0 -> b
-com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.C.O2:
+com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.C.P2:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -21079,12 +21113,12 @@
     boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> d
     boolean registerTypeReference(com.android.tools.r8.graph.DexType) -> d
     boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> e
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.C.N2:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.C.O2:
     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>():20:21 -> <clinit>
     1:1:void <init>(java.lang.String,int):19:19 -> <init>
-com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.C.P2.a:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.C.Q2.a:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> b
     java.util.List r8InstructionSequence -> d
     java.util.List javacInstructionSequence -> c
@@ -21103,13 +21137,13 @@
     49:55:boolean hasJavacClinitAssertionCode(com.android.tools.r8.graph.CfCode):98:104 -> a
     49:55:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):36 -> a
     56:56:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):37:37 -> a
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.C.P2.b:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.C.Q2.b:
     1:1:void <init>():13:13 -> <init>
     void done() -> a
     void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.C.P2.e:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.C.Q2.e:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):59:59 -> <init>
@@ -21117,8 +21151,8 @@
     1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):65:81 -> a
     18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):79:79 -> a
     19:19:void done():87:87 -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.C.P2.c:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.C.P2.d:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.C.Q2.c:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.C.Q2.d:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):19:19 -> <init>
@@ -21275,48 +21309,14 @@
     40:40:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):96 -> a
     41:49:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):98:106 -> a
     50:52:boolean isSubtypeOf(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):122:124 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.D.a.k:
-    com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.graph.DexType context -> c
-    com.android.tools.r8.ir.code.IRCode code -> b
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):32:35 -> <init>
-    1:33:boolean valueMayBeMutatedBeforeMethodExit(com.android.tools.r8.ir.code.Value,java.util.Set):216:248 -> a
-    34:34:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    34:34:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):53 -> a
-    35:54:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):54:73 -> a
-    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    55:55:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):73 -> a
-    56:86:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):74:104 -> a
-    87:87:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    87:87:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):104 -> a
-    88:102:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):111:125 -> a
-    103:103:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    103:103:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):104 -> a
-    104:127:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):129:152 -> a
-    128:128:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    128:128:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):73 -> a
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    1:1:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):39 -> b
-    2:5:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):40:43 -> b
-    6:24:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value):156:174 -> b
-    6:24:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):46 -> b
-    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    25:25:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value):174 -> b
-    25:25:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):46 -> b
-    26:46:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value):192:212 -> b
-    26:46:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):46 -> b
-    47:47:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    47:47:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):39 -> b
-com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.D.a.l.a:
+com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.D.a.k.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.D.a.l.b:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.D.a.k.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
@@ -21325,7 +21325,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.D.a.l.c:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.D.a.k.c:
     com.android.tools.r8.ir.code.Value value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -21341,7 +21341,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.D.a.l.d:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.D.a.k.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
@@ -21350,7 +21350,7 @@
     boolean isConst() -> d
     boolean isTop() -> e
     boolean isValueRange() -> f
-com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.D.a.l.e:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.D.a.k.e:
     java.util.Deque flowEdges -> d
     java.util.BitSet visitedBlocks -> g
     java.util.Map mapping -> b
@@ -21366,10 +21366,10 @@
     29:46:void run():53:70 -> a
     47:47:boolean lambda$rewriteCode$0(java.util.Map$Entry):83:83 -> a
     48:64:void lambda$rewriteCode$3(java.util.List,java.util.Map$Entry):86:102 -> a
-    65:65:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    65:65:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     65:65:void lambda$rewriteCode$3(java.util.List,java.util.Map$Entry):102 -> a
     66:66:void lambda$rewriteCode$3(java.util.List,java.util.Map$Entry):104:104 -> a
-    67:67:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    67:67:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     67:67:void lambda$rewriteCode$3(java.util.List,java.util.Map$Entry):104 -> a
     68:74:void lambda$rewriteCode$3(java.util.List,java.util.Map$Entry):105:111 -> a
     75:75:boolean lambda$rewriteCode$1(com.android.tools.r8.ir.code.Instruction):99:99 -> a
@@ -21391,14 +21391,14 @@
     53:110:void addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):178:235 -> b
     53:110:void visitInstruction(com.android.tools.r8.ir.code.Instruction):173 -> b
     111:116:void setExecutableEdge(int,int):241:246 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.D.a.l.f:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.D.a.k.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.D.a.m.a:
+com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.D.a.l.a:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexType context -> b
     boolean $assertionsDisabled -> c
@@ -21423,23 +21423,23 @@
     113:122:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):133:142 -> a
     123:123:boolean isSubsumedBy(com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.ir.code.InstructionIterator,java.util.Set):141:141 -> a
     124:130:boolean definesValueWithNonLocalUsages(com.android.tools.r8.ir.code.Instruction):159:165 -> a
-    131:131:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    131:131:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     131:131:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):178 -> a
-    132:132:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    132:132:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     132:132:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):179 -> a
     133:136:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):183:186 -> a
     137:179:boolean instructionsDefineIdenticalValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):190:232 -> a
     137:179:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):186 -> a
-    180:180:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    180:180:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     180:180:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):179 -> a
-    181:181:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    181:181:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     181:181:boolean valuesAreIdentical(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):178 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.ir.code.Instruction):174:174 -> b
     1:1:boolean definesBlockLocalValue(com.android.tools.r8.ir.code.Instruction):155:155 -> c
     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.D.a.n.a:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.D.a.m.a:
     java.util.Deque valuesToTrack -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set trackedValues -> c
@@ -21457,28 +21457,28 @@
     48:70:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):178:200 -> a
     48:70: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
     48:70:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    71:71:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    71:71:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     71:71:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):200 -> a
     71:71: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
     71:71:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
     72:72:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):201:201 -> a
     72:72: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
     72:72:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    73:73:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    73:73:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     73:73:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):200 -> a
     73:73: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
     73:73:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
     74:75:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):204:205 -> a
     74:75: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
     74:75:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     76:76:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):205 -> a
     76:76: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
     76:76:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
     77:77:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):206:206 -> a
     77: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
     77:77:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
-    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     78:78:boolean isDirectlyEscaping(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod,java.util.List):205 -> a
     78:78: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
     78:78:void run(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,java.util.function.Predicate):108 -> a
@@ -21493,9 +21493,9 @@
     104:104:boolean isValueOfInterestOrAlias(com.android.tools.r8.ir.code.Value):212:212 -> a
     1:9:boolean isEscaping(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):55:63 -> b
     10:12:void addToWorklist(com.android.tools.r8.ir.code.Value):170:172 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.D.a.n.b:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.D.a.m.b:
     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) -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.D.a.o.a:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.D.a.n.a:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():20:20 -> <clinit>
@@ -21511,16 +21511,16 @@
     29:48:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     49:54:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):70:75 -> a
     49:54:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
-    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     55:55:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):76 -> a
     55:55:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     56:60:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):77:81 -> a
     56:60:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
-    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     61:61:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):76 -> a
     61:61:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     62:62:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52:52 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.D.a.p.a:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.D.a.o.a:
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():25:25 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
@@ -21530,7 +21530,7 @@
     boolean isBottom() -> d
     boolean isKnownFieldSet() -> e
     boolean isTop() -> f
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.D.a.p.b:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.D.a.o.b:
     java.util.Set fields -> a
     1:2:void <init>():18:19 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.DexEncodedField):22:23 -> <init>
@@ -21543,7 +21543,7 @@
     1:5:boolean equals(java.lang.Object):81:85 -> equals
     1:1:int hashCode():73:73 -> hashCode
     1:1:int size():68:68 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.D.a.p.c:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.D.a.o.c:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -21552,61 +21552,61 @@
     boolean isBottom() -> d
     boolean isKnownFieldSet() -> e
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet getInstance():16:16 -> g
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.D.a.p.d:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.D.a.o.d:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> c
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexEncodedMethod method -> d
     com.android.tools.r8.ir.code.IRCode code -> b
     java.util.Map fieldsMaybeReadBeforeBlockInclusiveCache -> e
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:5: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):46:50 -> <init>
-    1:4:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):55:58 -> a
-    5:47:void computeFieldOptimizationInfo():71:113 -> a
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:5: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):45:49 -> <init>
+    1:4:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):54:57 -> a
+    5:47:void computeFieldOptimizationInfo():70:112 -> a
     48:49:boolean com.android.tools.r8.ir.code.DominatorTree.dominatesAllOf(com.android.tools.r8.ir.code.BasicBlock,java.lang.Iterable):118:119 -> a
-    48:49:void computeFieldOptimizationInfo():113 -> a
-    50:50:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):127:127 -> a
-    50:50:void computeFieldOptimizationInfo():117 -> a
-    51:51:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):153:153 -> a
-    51:51:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):130 -> a
-    51:51:void computeFieldOptimizationInfo():117 -> a
-    52:55:java.util.Map getOrCreateFieldsMaybeReadBeforeBlockInclusive():63:66 -> a
-    52:55:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):163 -> a
-    52:55:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):154 -> a
-    52:55:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):130 -> a
-    52:55:void computeFieldOptimizationInfo():117 -> a
-    56:56:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):163:163 -> a
-    56:56:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):154 -> a
-    56:56:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):130 -> a
-    56:56:void computeFieldOptimizationInfo():117 -> a
-    57:64:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):136:143 -> a
-    57:64:void computeFieldOptimizationInfo():117 -> a
-    65:65:void computeFieldOptimizationInfo():120:120 -> a
-    66:67:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):247:248 -> a
-    66:67:void computeFieldOptimizationInfo():120 -> a
+    48:49:void computeFieldOptimizationInfo():112 -> a
+    50:50:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):126:126 -> a
+    50:50:void computeFieldOptimizationInfo():116 -> a
+    51:51:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):152:152 -> a
+    51:51:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):129 -> a
+    51:51:void computeFieldOptimizationInfo():116 -> a
+    52:55:java.util.Map getOrCreateFieldsMaybeReadBeforeBlockInclusive():62:65 -> a
+    52:55:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):162 -> a
+    52:55:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):153 -> a
+    52:55:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):129 -> a
+    52:55:void computeFieldOptimizationInfo():116 -> a
+    56:56:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):162:162 -> a
+    56:56:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):153 -> a
+    56:56:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):129 -> a
+    56:56:void computeFieldOptimizationInfo():116 -> a
+    57:64:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):135:142 -> a
+    57:64:void computeFieldOptimizationInfo():116 -> a
+    65:65:void computeFieldOptimizationInfo():119:119 -> a
+    66:67:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):246:247 -> a
+    66:67:void computeFieldOptimizationInfo():119 -> a
     68:68:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    68:68:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):248 -> a
-    68:68:void computeFieldOptimizationInfo():120 -> a
-    69:76:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):249:256 -> a
-    69:76:void computeFieldOptimizationInfo():120 -> a
-    77:77:java.util.LinkedList lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField):90:90 -> a
-    78:78:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$1(com.android.tools.r8.ir.code.BasicBlock):178:178 -> a
-    1:70:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():171:240 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.D.a.p.e:
+    68:68:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):247 -> a
+    68:68:void computeFieldOptimizationInfo():119 -> a
+    69:71:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):248:250 -> a
+    69:71:void computeFieldOptimizationInfo():119 -> a
+    72:72:java.util.LinkedList lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField):89:89 -> a
+    73:73:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$1(com.android.tools.r8.ir.code.BasicBlock):177:177 -> a
+    1:70:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():170:239 -> b
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.D.a.o.e:
     boolean isConcreteFieldSet() -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet() -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.D.a.p.f:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.D.a.o.f:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
     boolean isTop() -> f
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet getInstance():16:16 -> g
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.D.a.q.a:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.D.a.p.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.D.a.r.b:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.D.a.q.b:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set removedExtensionFields -> c
@@ -21635,12 +21635,12 @@
     5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> b
     5:5:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):110 -> b
     6:8:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):110:112 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.D.a.r.a:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.D.a.q.a:
     java.util.Set val$remainingProtoExtensionFieldReads -> d
     java.util.function.Predicate val$skip -> c
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker,com.android.tools.r8.graph.DexItemFactory,java.util.function.Predicate,java.util.Set):182:182 -> <init>
     1:2:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):186:187 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.D.a.r.c:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.D.a.q.c:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement objectArrayType -> f
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder encoder -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -21661,7 +21661,7 @@
     17:17:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):136 -> a
     17:17:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     17:17:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     18:18: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):144 -> a
     18:18:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):136 -> a
     18:18:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21679,7 +21679,7 @@
     21:23:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     21:23:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     21:23:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     24:24:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):156 -> a
     24:24:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     24:24:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21688,7 +21688,7 @@
     25:32:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     25:32:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     25:32:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     33:33:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):164 -> a
     33:33:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     33:33:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21697,7 +21697,7 @@
     34:35:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     34:35:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     34:35:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    36:36:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    36:36:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     36:36:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):165 -> a
     36:36:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     36:36:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21706,7 +21706,7 @@
     37:39:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     37:39:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     37:39:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    40:40:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    40:40:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     40:40:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):173 -> a
     40:40:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     40:40:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21715,7 +21715,7 @@
     41:43:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     41:43:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     41:43:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    44:44:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    44:44:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     44:44:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):174 -> a
     44:44:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     44:44:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -21742,7 +21742,7 @@
     63:63:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
     64:67:void forEachDynamicMethod(java.util.function.Consumer):85:88 -> a
     68:71:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):194:197 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.D.a.r.d:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.D.a.q.d:
     com.android.tools.r8.graph.DexProto dynamicMethodProto -> i
     com.android.tools.r8.graph.DexProto findLiteExtensionByNumberProto -> j
     com.android.tools.r8.graph.DexMethod rawMessageInfoConstructor -> l
@@ -21766,24 +21766,24 @@
     2:2:boolean isDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod):83 -> a
     3:4:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):87:88 -> a
     1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92:92 -> b
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.D.a.r.e:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.D.a.q.e:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> a
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker generatedExtensionRegistryShrinker -> c
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> e
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker generatedMessageLiteShrinker -> d
     1:14:void <init>(com.android.tools.r8.graph.AppView):19:32 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.D.a.r.f:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.D.a.q.f:
     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
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     4:4:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):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
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     4:4:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):26 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.D.a.r.j:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.D.a.q.j:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> a
     boolean $assertionsDisabled -> c
@@ -21811,7 +21811,7 @@
     121:121:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):89 -> a
     122:122:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo run(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):184:184 -> a
     123:123:int invalidInfoFailure():236:236 -> a
-    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     124:124:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):191 -> a
     125:132:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):192:199 -> a
     133:134:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):541:542 -> a
@@ -21820,18 +21820,18 @@
     155:155:boolean com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo.isForFieldName():0:0 -> a
     155:155:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):212 -> a
     156:166:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):222:232 -> a
-    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     167:167:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexClass):191 -> a
     168:176:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):300:308 -> a
-    177:177:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    177:177:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     177:177:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):308 -> a
     178:188:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):309:319 -> a
     189:189:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):312:312 -> a
-    190:190:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    190:190:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     190:190:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):308 -> a
     191:191:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):301:301 -> a
     1:1:com.android.tools.r8.ir.code.Value invalidObjectsFailure():240:240 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.D.a.r.g:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.D.a.q.g:
     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):254:256 -> <init>
@@ -21844,7 +21844,7 @@
     9:9:int nextInt():286:286 -> b
     10:10:int nextInt():275:275 -> b
     11:11:int nextInt():266:266 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.D.a.r.h:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.D.a.q.h:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -21852,36 +21852,36 @@
     1:2:boolean hasNext():325:326 -> a
     3:4:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):358:359 -> a
     3:4:boolean hasNext():327 -> a
-    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     5:5:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):359 -> a
     5:5:boolean hasNext():327 -> a
     6:6:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):359:359 -> a
     6:6:boolean hasNext():327 -> a
-    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     7:7:boolean isArrayPutOfInterest(com.android.tools.r8.ir.code.Instruction):359 -> a
     7:7:boolean hasNext():327 -> a
     8:11:boolean hasNext():330:333 -> a
     1:7:com.android.tools.r8.ir.code.Value next():340:346 -> b
     1:7:java.lang.Object next():319 -> b
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     8:8:com.android.tools.r8.ir.code.Value next():346 -> b
     8:8:java.lang.Object next():319 -> b
     9:16:com.android.tools.r8.ir.code.Value next():347:354 -> b
     9:16:java.lang.Object next():319 -> b
-    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     17:17:com.android.tools.r8.ir.code.Value next():354 -> b
     17:17:java.lang.Object next():319 -> b
     18:18:com.android.tools.r8.ir.code.Value next():350:350 -> b
     18:18:java.lang.Object next():319 -> b
-    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     19:19:com.android.tools.r8.ir.code.Value next():346 -> b
     19:19:java.lang.Object next():319 -> b
     20:20:com.android.tools.r8.ir.code.Value next():341:341 -> b
     20:20:java.lang.Object next():319 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.D.a.r.i:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.D.a.q.i:
     1:1:void <init>():364:364 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):364:364 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.D.a.r.k:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.D.a.q.k:
     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
@@ -21894,7 +21894,7 @@
     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.D.a.r.l.a:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.D.a.q.l.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>
@@ -21904,18 +21904,18 @@
     2:2:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     2:2:java.lang.String toString():37 -> toString
     3:3:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.D.a.r.l.b:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.D.a.q.l.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
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35:35 -> a
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34 -> a
     3:8:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:41 -> a
     boolean isLiveProtoFieldObject() -> e
     1:1:com.android.tools.r8.graph.DexField getField():28:28 -> h
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.D.a.r.l.c:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.D.a.q.l.c:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> d
@@ -21949,7 +21949,7 @@
     210:223:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo):308 -> a
     224:246:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):345:367 -> a
     247:247:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):355:355 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.D.a.r.l.d:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.D.a.q.l.d:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
     boolean $assertionsDisabled -> e
@@ -21979,11 +21979,11 @@
     2:2:boolean hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):119:119 -> d
     1:1:boolean hasAuxData():41:41 -> e
     1:15:java.lang.String toString():189:203 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.D.a.r.l.e:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.D.a.q.l.e:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject asProtoFieldObject() -> b
     boolean isProtoFieldObject() -> f
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.D.a.r.l.f:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.D.a.q.l.f:
     boolean $assertionsDisabled -> e
     boolean isRequired -> b
     boolean needsIsInitializedCheck -> c
@@ -22008,11 +22008,11 @@
     1:1:boolean isValid():111:111 -> k
     1:1:boolean needsIsInitializedCheck():116:116 -> l
     1:8:int serialize():136:143 -> m
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.D.a.r.l.g:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.D.a.q.l.g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> a
     1:3:void <init>():10:12 -> <init>
     1:4:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):15:18 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.D.a.r.l.j:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.D.a.q.l.j:
     java.util.LinkedList oneOfObjects -> d
     java.util.LinkedList fields -> b
     int flags -> a
@@ -22029,8 +22029,8 @@
     1:1:int numberOfHasBitsObjects():216:216 -> h
     1:1:int numberOfOneOfObjects():220:220 -> i
     1:9:java.lang.String toString():225:233 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.D.a.r.l.h:
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.D.a.r.l.i:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.D.a.q.l.h:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.D.a.q.l.i:
     boolean $assertionsDisabled -> e
     java.util.LinkedList oneOfObjects -> d
     java.util.LinkedList fields -> b
@@ -22050,7 +22050,7 @@
     49:86:void removeUnusedSharedData():121:158 -> c
     87:87:void removeUnusedSharedData():157:157 -> c
     88:89:void removeUnusedSharedData():76:77 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.D.a.r.l.k:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.D.a.q.l.k:
     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
@@ -22060,25 +22060,25 @@
     boolean isLiveProtoFieldObject() -> e
     boolean isProtoFieldObject() -> f
     boolean isProtoTypeObject() -> g
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.D.a.r.l.l:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.D.a.q.l.l:
     com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):21:22 -> <init>
     1:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:30 -> a
     5:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29 -> a
-    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
     7:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31:31 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.D.a.r.l.m:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.D.a.q.l.m:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26:28 -> a
     4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> 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.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29:29 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.D.a.r.l.n:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.D.a.q.l.n:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean):18:18 -> <init>
@@ -22090,7 +22090,7 @@
     boolean isOneOf() -> h
     boolean isSingular() -> j
     1:1:boolean isValid():47:47 -> k
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.D.a.r.l.o:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.D.a.q.l.o:
     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>
@@ -22098,30 +22098,30 @@
     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.D.a.r.l.p:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.D.a.q.l.p:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):16:17 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26:26 -> a
-    2:2:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1049:1049 -> a
+    2:2:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045:1045 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1049 -> a
+    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045 -> a
     3:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    4:4:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1049 -> 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.TypeLatticeElement):1008:1008 -> a
+    4:4:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    5:5:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1050:1050 -> a
+    5:5:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1046:1046 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> c
     boolean isProtoTypeObject() -> g
     1:1:com.android.tools.r8.graph.DexType getType():21:21 -> h
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.D.a.s.a:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.D.a.r.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.ArrayTypeLatticeElement -> com.android.tools.r8.D.a.t.a:
+    1:3:void <clinit>():22:24 -> <clinit>
+    1:1:void <init>(java.lang.String,int):21:21 -> <init>
+com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement -> com.android.tools.r8.D.a.s.a:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement memberTypeLattice -> r
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> s
     boolean $assertionsDisabled -> t
@@ -22182,14 +22182,14 @@
     7:7:boolean equals(java.lang.Object):124:124 -> equals
     1:1:int hashCode():129:129 -> hashCode
     1:1:java.lang.String toString():109:109 -> toString
-com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement -> com.android.tools.r8.D.a.t.b:
+com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement -> com.android.tools.r8.D.a.s.b:
     com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeLatticeElement getInstance():11:11 -> A
     boolean isBoolean() -> f
     1:1:int hashCode():31:31 -> hashCode
-com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement -> com.android.tools.r8.D.a.t.c:
+com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement -> com.android.tools.r8.D.a.s.c:
     com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement INSTANCE -> o
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -22197,21 +22197,21 @@
     1:1:int hashCode():35:35 -> hashCode
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():11:11 -> x
     1:1:com.android.tools.r8.ir.analysis.type.BottomTypeLatticeElement getInstance():15:15 -> z
-com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement -> com.android.tools.r8.D.a.t.d:
+com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement -> com.android.tools.r8.D.a.s.d:
     com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ByteTypeLatticeElement getInstance():11:11 -> A
     boolean isByte() -> h
     1:1:int hashCode():31:31 -> hashCode
-com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement -> com.android.tools.r8.D.a.t.e:
+com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement -> com.android.tools.r8.D.a.s.e:
     com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.CharTypeLatticeElement getInstance():11:11 -> A
     1:1:int hashCode():31:31 -> hashCode
     boolean isChar() -> i
-com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement -> com.android.tools.r8.D.a.t.h:
+com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement -> com.android.tools.r8.D.a.s.h:
     com.android.tools.r8.graph.AppView appView -> s
     boolean $assertionsDisabled -> v
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> t
@@ -22277,16 +22277,16 @@
     1:1:int hashCode():131:131 -> hashCode
     boolean isClassType() -> j
     1:11:java.lang.String toString():115:125 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker -> com.android.tools.r8.D.a.t.f:
+com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker -> com.android.tools.r8.D.a.s.f:
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker RIGHT -> b
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceMarker LEFT -> a
     1:2:void <clinit>():213:214 -> <clinit>
     1:1:void <init>(java.lang.String,int):212:212 -> <init>
-com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceWithMarker -> com.android.tools.r8.D.a.t.g:
+com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$InterfaceWithMarker -> com.android.tools.r8.D.a.s.g:
     com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement$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.ClassTypeLatticeElement$InterfaceMarker):221:223 -> <init>
-com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.D.a.t.i:
+com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.D.a.s.i:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     java.util.function.Function mapping -> b
@@ -22308,35 +22308,35 @@
     51:51:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     51:51:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):71 -> a
     52:52:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):71:71 -> a
-com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement -> com.android.tools.r8.D.a.t.j:
+com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement -> com.android.tools.r8.D.a.s.j:
     com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeLatticeElement getInstance():11:11 -> A
     1:1:int hashCode():26:26 -> hashCode
     boolean isDouble() -> k
-com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement -> com.android.tools.r8.D.a.t.k:
+com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement -> com.android.tools.r8.D.a.s.k:
     com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement getInstance():10:10 -> A
     1:1:int hashCode():25:25 -> hashCode
     boolean isFloat() -> m
-com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement -> com.android.tools.r8.D.a.t.l:
+com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement -> com.android.tools.r8.D.a.s.l:
     com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.IntTypeLatticeElement getInstance():10:10 -> A
     1:1:int hashCode():25:25 -> hashCode
     boolean isInt() -> n
-com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement -> com.android.tools.r8.D.a.t.m:
+com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement -> com.android.tools.r8.D.a.s.m:
     com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.LongTypeLatticeElement getInstance():11:11 -> A
     1:1:int hashCode():26:26 -> hashCode
     boolean isLong() -> o
-com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.D.a.t.n:
+com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.D.a.s.n:
     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
@@ -22357,7 +22357,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.Nullability definitelyNull():79:79 -> 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.D.a.t.o:
+com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.D.a.s.o:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement definitelyNotNullVariant -> c
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement definitelyNullVariant -> b
@@ -22369,7 +22369,7 @@
     4:12:void set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement):26:34 -> a
     13:21:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement get(com.android.tools.r8.ir.analysis.type.Nullability):39:47 -> a
     22:35:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):53:66 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement -> com.android.tools.r8.D.a.t.p:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement -> com.android.tools.r8.D.a.s.p:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -22383,7 +22383,7 @@
     boolean isPrimitive() -> r
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():19:19 -> x
     1:8:boolean hasDexType():66:73 -> z
-com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement -> com.android.tools.r8.D.a.t.r:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement -> com.android.tools.r8.D.a.s.r:
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> o
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_BOTTOM_INSTANCE -> q
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL_INSTANCE -> p
@@ -22404,7 +22404,7 @@
     boolean isReference() -> s
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():69:69 -> x
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement asMeetWithNotNull():79:79 -> z
-com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement -> com.android.tools.r8.D.a.t.q:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement$NullLatticeElement -> com.android.tools.r8.D.a.s.q:
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
     1:1:boolean equals(java.lang.Object):50:50 -> equals
@@ -22414,21 +22414,21 @@
     2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():37 -> toString
     3:3:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement -> com.android.tools.r8.D.a.t.s:
+com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement -> com.android.tools.r8.D.a.s.s:
     com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement INSTANCE -> q
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ShortTypeLatticeElement getInstance():11:11 -> A
     1:1:int hashCode():31:31 -> hashCode
     boolean isShort() -> t
-com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement -> com.android.tools.r8.D.a.t.t:
+com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement -> com.android.tools.r8.D.a.s.t:
     com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement INSTANCE -> p
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeLatticeElement getInstance():17:17 -> A
     1:1:int hashCode():37:37 -> hashCode
     boolean isSinglePrimitive() -> u
-com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement -> com.android.tools.r8.D.a.t.u:
+com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement -> com.android.tools.r8.D.a.s.u:
     com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement INSTANCE -> o
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -22436,7 +22436,7 @@
     boolean isTop() -> v
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():11:11 -> x
     1:1:com.android.tools.r8.ir.analysis.type.TopTypeLatticeElement getInstance():15:15 -> z
-com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.D.a.t.w:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.D.a.s.w:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> c
     boolean $assertionsDisabled -> e
@@ -22468,14 +22468,14 @@
     84:96:com.android.tools.r8.graph.DexType getRefinedReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethodWithReceiver):181:193 -> a
     1:1:boolean verifyValuesUpToDate(java.lang.Iterable):80:80 -> b
     1:1:void widening(java.lang.Iterable):68:68 -> c
-com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.D.a.t.v:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.D.a.s.v:
     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>():30:34 -> <clinit>
     1:1:void <init>(java.lang.String,int):29:29 -> <init>
-com.android.tools.r8.ir.analysis.type.TypeLatticeElement -> com.android.tools.r8.D.a.t.x:
+com.android.tools.r8.ir.analysis.type.TypeLatticeElement -> com.android.tools.r8.D.a.s.x:
     com.android.tools.r8.ir.analysis.type.FloatTypeLatticeElement FLOAT -> h
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement NULL -> m
@@ -22573,7 +22573,7 @@
     boolean isWidePrimitive() -> w
     com.android.tools.r8.ir.analysis.type.Nullability nullability() -> x
     1:1:int requiredRegisters():338:338 -> y
-com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement -> com.android.tools.r8.D.a.t.y:
+com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement -> com.android.tools.r8.D.a.s.y:
     com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeLatticeElement INSTANCE -> p
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -22583,8 +22583,8 @@
     int requiredRegisters() -> y
 com.android.tools.r8.ir.code.Add -> com.android.tools.r8.D.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>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> H2
     boolean isAdd() -> O0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -22603,7 +22603,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):67:67 -> e
     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
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.D.b.b:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22613,9 +22613,9 @@
     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:int maxInValueRegister():56:56 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():56:56 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.D.b.c:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -22627,9 +22627,9 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):65:65 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():54:54 -> x2
-    1:1:int maxOutValueRegister():59:59 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():54:54 -> w2
+    1:1:int maxOutValueRegister():59:59 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.D.b.d:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():15:15 -> <clinit>
@@ -22644,13 +22644,13 @@
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
     4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:2:int maxInValueRegister():54:55 -> x2
-    1:1:int maxOutValueRegister():60:60 -> y2
-    int opcode() -> z2
+    1:2:int maxInValueRegister():54:55 -> w2
+    1:1:int maxOutValueRegister():60:60 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.And -> com.android.tools.r8.D.b.e:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):19:19 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> H2
     boolean isAnd() -> Q0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -22664,7 +22664,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):64:64 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):69:69 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> d
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.D.b.f:
     boolean $assertionsDisabled -> i
     boolean knownToBeBoolean -> h
@@ -22685,14 +22685,14 @@
     6:6:boolean outTypeKnownToBeBoolean(java.util.Set):114:114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.Argument asArgument() -> d
-    1:1:int maxInValueRegister():52:52 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():52:52 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.D.b.g:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> I2
+    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> H2
     boolean isArithmeticBinop() -> S0
     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
@@ -22719,9 +22719,9 @@
     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():264:264 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> D2
-    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> E2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> C2
+    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isArrayGet() -> T0
@@ -22790,14 +22790,14 @@
     219:219:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):276:276 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.D.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():154:154 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> D2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isArrayLength() -> U0
@@ -22823,19 +22823,19 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:88 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.D.b.j:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():30:30 -> <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):40:44 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():266:266 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> D2
-    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> E2
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> F2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> C2
+    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> D2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> E2
     boolean hasInvariantOutType() -> I0
     1:5:boolean instructionInstanceCanThrow():136:140 -> M0
     boolean instructionTypeCanThrow() -> N0
@@ -22864,154 +22864,157 @@
     111:111:void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver):271:271 -> a
     112:112:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):271:271 -> a
     1:7:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):150:156 -> b
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     8:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):156 -> b
     9:14:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157:162 -> b
-    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     15:15:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):162 -> b
     16:20:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):163:167 -> b
-    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     21:21:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):167 -> b
     22:51:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):168:197 -> b
-    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     52:52:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):167 -> b
-    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     53:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):162 -> b
-    54:54:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    54:54:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     54:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):156 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():125:125 -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():125:125 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.D.b.p:
     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:void <clinit>():21:21 -> <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):30:35 -> <init>
+    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> C2
     boolean isIntroducingAnAlias() -> D1
-    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():82:82 -> D2
-    1:1:com.android.tools.r8.ir.code.Instruction origin():90:90 -> E2
-    1:1:com.android.tools.r8.ir.code.Value src():86:86 -> F2
+    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> E2
     boolean hasInvariantOutType() -> I0
     boolean isAssume() -> W0
-    1:1:boolean isAssumeDynamicType():137:137 -> X0
-    1:1:boolean isAssumeNonNull():150:150 -> Y0
+    1:1:boolean isAssumeDynamicType():132:132 -> X0
+    1:1:boolean isAssumeNonNull():145:145 -> Y0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:1: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
-    2:2:com.android.tools.r8.ir.code.Assume createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,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
-    3:3:boolean outTypeKnownToBeBoolean(java.util.Set):95:95 -> a
-    4:22:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):167:185 -> a
-    23:29:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):183:189 -> a
-    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204:204 -> a
-    31:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):209:209 -> a
-    32:36:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):229:233 -> a
+    1:1: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):45:45 -> a
+    2:2:com.android.tools.r8.ir.code.Assume createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,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):55:55 -> a
+    3:3:boolean outTypeKnownToBeBoolean(java.util.Set):90:90 -> a
+    4:22:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):162:180 -> a
+    23:29:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):178:184 -> a
+    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):199:199 -> a
+    31:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):204:204 -> a
+    32:36:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):224:228 -> a
     37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAssume():235:235 -> a
-    37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):239 -> a
-    38:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):244:251 -> a
-    46:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):245:245 -> a
-    47:47:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):256:256 -> a
-    48:48:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):266:266 -> a
-    1:1:com.android.tools.r8.ir.code.Assume createAssumeNoneInstruction(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:41 -> b
-    2:4:boolean verifyTypes(com.android.tools.r8.graph.AppView):276:278 -> b
+    37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):234 -> a
+    38:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):239:246 -> a
+    46:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):240:240 -> a
+    47:47:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):251:251 -> a
+    48:48:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):261:261 -> a
+    1:1:com.android.tools.r8.ir.code.Assume createAssumeNoneInstruction(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):40:40 -> b
+    2:4:boolean verifyTypes(com.android.tools.r8.graph.AppView):271:273 -> b
     5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    5:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):279 -> b
-    6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):279:279 -> b
-    7:7:boolean isAssumeNone():124:124 -> b
-    7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):280 -> b
-    8:8:boolean isAssumeDynamicType():137:137 -> b
-    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):280 -> b
-    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):285:285 -> b
-    10:10:boolean isAssumeNonNull():150:150 -> b
-    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):285 -> b
-    11:14:boolean verifyTypes(com.android.tools.r8.graph.AppView):285:288 -> b
-    15:17:boolean verifyTypes(com.android.tools.r8.graph.AppView):287:289 -> b
-    18:20:boolean verifyTypes(com.android.tools.r8.graph.AppView):281:283 -> b
+    5:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):274 -> b
+    6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):274:274 -> b
+    7:7:boolean isAssumeNone():119:119 -> b
+    7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):275 -> b
+    8:8:boolean isAssumeDynamicType():132:132 -> b
+    8:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):275 -> b
+    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):280:280 -> b
+    10:10:boolean isAssumeNonNull():145:145 -> b
+    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):280 -> b
+    11:14:boolean verifyTypes(com.android.tools.r8.graph.AppView):280:283 -> b
+    15:17:boolean verifyTypes(com.android.tools.r8.graph.AppView):282:284 -> b
+    18:20:boolean verifyTypes(com.android.tools.r8.graph.AppView):276:278 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    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
+    1:1:boolean isAssumeDynamicType():132:132 -> c
+    1:1:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):65 -> c
+    2:2:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):66:66 -> c
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> c
-    3:3:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):71 -> c
-    4:4:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):71:71 -> c
-    boolean isOutConstant() -> g2
+    3:3:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):66 -> c
+    4:4:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):66:66 -> c
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
-    1:1:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():142:142 -> j
-    2:2:boolean isAssumeDynamicType():137:137 -> j
-    2:2:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():142 -> j
-    3:3:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():142:142 -> j
-    1:1:com.android.tools.r8.ir.code.Assume asAssumeNonNull():155:155 -> k
-    2:2:boolean isAssumeNonNull():150:150 -> k
-    2:2:com.android.tools.r8.ir.code.Assume asAssumeNonNull():155 -> k
-    3:3:com.android.tools.r8.ir.code.Assume asAssumeNonNull():155:155 -> k
-    1:1:java.lang.String toString():302:302 -> toString
-    2:2:boolean isAssumeNone():124:124 -> toString
-    2:2:java.lang.String toString():303 -> toString
-    3:3:boolean isAssumeNonNull():150:150 -> toString
-    3:3:java.lang.String toString():303 -> toString
-    4:4:boolean isAssumeDynamicType():137:137 -> toString
-    4:4:java.lang.String toString():306 -> toString
-    5:5:java.lang.String toString():307:307 -> toString
-    6:6:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():82:82 -> toString
-    6:6:java.lang.String toString():307 -> toString
-    7:16:java.lang.String toString():307:316 -> toString
-    17:17:java.lang.String toString():304:304 -> toString
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():199:199 -> w0
-    1:1:int maxInValueRegister():214:214 -> x2
-    1:1:int maxOutValueRegister():219:219 -> y2
-    1:1:boolean isAssumeNone():124:124 -> z0
-    1:1:java.lang.String getInstructionName():100 -> z0
-    2:2:boolean isAssumeDynamicType():137:137 -> z0
-    2:2:java.lang.String getInstructionName():103 -> z0
-    3:3:boolean isAssumeNonNull():150:150 -> z0
-    3:3:java.lang.String getInstructionName():106 -> z0
-    4:4:java.lang.String getInstructionName():109:109 -> z0
-    int opcode() -> z2
+    1:1:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():137:137 -> j
+    2:2:boolean isAssumeDynamicType():132:132 -> j
+    2:2:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():137 -> j
+    3:3:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():137:137 -> j
+    1:1:com.android.tools.r8.ir.code.Assume asAssumeNonNull():150:150 -> k
+    2:2:boolean isAssumeNonNull():145:145 -> k
+    2:2:com.android.tools.r8.ir.code.Assume asAssumeNonNull():150 -> k
+    3:3:com.android.tools.r8.ir.code.Assume asAssumeNonNull():150:150 -> k
+    1:1:java.lang.String toString():293:293 -> toString
+    2:2:boolean isAssumeNonNull():145:145 -> toString
+    2:2:java.lang.String toString():293 -> toString
+    3:5:java.lang.String toString():293:295 -> toString
+    6:6:boolean isAssumeNone():119:119 -> toString
+    6:6:java.lang.String toString():296 -> toString
+    7:7:boolean isAssumeNonNull():145:145 -> toString
+    7:7:java.lang.String toString():296 -> toString
+    8:8:boolean isAssumeDynamicType():132:132 -> toString
+    8:8:java.lang.String toString():299 -> toString
+    9:9:java.lang.String toString():300:300 -> toString
+    10:10:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> toString
+    10:10:java.lang.String toString():300 -> toString
+    11:17:java.lang.String toString():300:306 -> toString
+    18:18:java.lang.String toString():297:297 -> toString
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():194:194 -> w0
+    1:1:int maxInValueRegister():209:209 -> w2
+    1:1:int maxOutValueRegister():214:214 -> x2
+    int opcode() -> y2
+    1:1:boolean isAssumeNone():119:119 -> z0
+    1:1:java.lang.String getInstructionName():95 -> z0
+    2:2:boolean isAssumeDynamicType():132:132 -> z0
+    2:2:java.lang.String getInstructionName():98 -> z0
+    3:3:boolean isAssumeNonNull():145:145 -> z0
+    3:3:java.lang.String getInstructionName():101 -> z0
+    4:4:java.lang.String getInstructionName():104:104 -> z0
 com.android.tools.r8.ir.code.Assume$1 -> com.android.tools.r8.D.b.k:
 com.android.tools.r8.ir.code.Assume$Assumption -> com.android.tools.r8.D.b.l:
-    1:1:void <init>():319:319 -> <init>
+    1:1:void <init>():309:309 -> <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.D.b.m:
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement dynamicLowerBoundType -> b
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicUpperBoundType -> a
+    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement lowerBoundType -> b
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement type -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():359:359 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.ir.code.Assume$1):359:359 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):365:367 -> <init>
+    1:1:void <clinit>():349:349 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.ir.code.Assume$1):349:349 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):354:356 -> <init>
     boolean isAssumeDynamicType() -> a
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement access$100(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):359:359 -> 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):385:385 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement access$100(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):349:349 -> 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):374:374 -> a
     boolean isAssumeNonNull() -> b
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement access$200(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):359:359 -> b
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement access$200(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):349:349 -> b
     boolean isAssumeNone() -> c
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():375:375 -> d
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType():371:371 -> e
-    1:5:boolean equals(java.lang.Object):394:398 -> equals
-    1:1:int hashCode():404:404 -> hashCode
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getLowerBoundType():364:364 -> d
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getType():360:360 -> e
+    1:5:boolean equals(java.lang.Object):383:387 -> equals
+    1:1:int hashCode():392:392 -> hashCode
 com.android.tools.r8.ir.code.Assume$NoAssumption -> com.android.tools.r8.D.b.n:
     com.android.tools.r8.ir.code.Assume$NoAssumption instance -> a
     boolean $assertionsDisabled -> b
-    1:2:void <clinit>():338:339 -> <clinit>
-    1:1:void <init>():341:341 -> <init>
+    1:2:void <clinit>():328:329 -> <clinit>
+    1:1:void <init>():331:331 -> <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):354:354 -> 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):344:344 -> a
     boolean isAssumeNonNull() -> b
     boolean isAssumeNone() -> c
-    1:1:com.android.tools.r8.ir.code.Assume$NoAssumption get():344:344 -> d
+    1:1:com.android.tools.r8.ir.code.Assume$NoAssumption get():334:334 -> d
 com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.D.b.o:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption instance -> a
     boolean $assertionsDisabled -> b
-    1:3:void <clinit>():408:410 -> <clinit>
-    1:1:void <init>():412:412 -> <init>
+    1:3:void <clinit>():396:398 -> <clinit>
+    1:1:void <init>():400:400 -> <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):425:425 -> 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):413:413 -> a
     boolean isAssumeNonNull() -> b
     boolean isAssumeNone() -> c
-    1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():415:415 -> d
+    1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():403:403 -> d
 com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.D.b.v:
     int color -> n
     int estimatedPredecessorsCount -> l
@@ -23077,156 +23080,153 @@
     18:18:java.util.List getPhis():531:531 -> a
     18:18:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):275 -> a
     19:27:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):275:283 -> a
-    28:28:void com.android.tools.r8.ir.code.Phi.removeTrivialPhi():228:228 -> a
+    28:28:void com.android.tools.r8.ir.code.Phi.removeTrivialPhi():227:227 -> a
     28:28:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):284 -> a
     29:46:void swapSuccessorsByIndex(int,int):313:330 -> a
     47:54:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):445:452 -> a
-    55:58:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456:459 -> a
-    59:60:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):41:42 -> a
-    59:60:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):459 -> a
-    61:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):459:464 -> a
-    67:67:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    67:67:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464 -> a
-    68:86:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464:482 -> a
-    87:87:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    87:87:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484 -> a
-    88:104:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484:500 -> a
-    105:105:java.util.LinkedList getInstructions():570:570 -> a
-    105:105:boolean consistentBlockInstructions(boolean,boolean):65 -> a
-    106:112:boolean consistentBlockInstructions(boolean,boolean):65:71 -> a
-    113:113:java.util.List getPredecessors():234:234 -> a
-    113:113:boolean consistentBlockInstructions(boolean,boolean):72 -> a
-    114:116:boolean consistentBlockInstructions(boolean,boolean):72:74 -> a
-    117:121:boolean consistentBlockInstructions(boolean,boolean):73:77 -> a
-    122:122:java.util.LinkedList getInstructions():570:570 -> a
-    122:122:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98 -> a
-    123:124:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:99 -> a
-    125:125:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    125:125:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):99 -> a
-    126:126:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:100 -> a
-    127:127:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):574:574 -> a
-    128:129:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):643:644 -> a
-    130:132:void clearMark(int):656:658 -> a
-    133:133:void addPhi(com.android.tools.r8.ir.code.Phi):688:688 -> a
-    134:134:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:702 -> a
-    135:135:boolean isFilled():535:535 -> a
-    135:135:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702 -> a
-    136:139:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:705 -> a
-    140:140:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:709 -> a
-    141:141:boolean isFilled():535:535 -> a
-    141:141:void close(com.android.tools.r8.ir.conversion.IRBuilder):709 -> a
-    142:146:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:713 -> a
-    147:147:boolean com.android.tools.r8.ir.code.JumpInstruction.isJumpInstruction():0:0 -> a
-    147:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):713 -> a
-    148:148:void close(com.android.tools.r8.ir.conversion.IRBuilder):714:714 -> a
-    149:150:boolean verifyNoValuesAfterThrowingInstruction():1580:1581 -> a
-    149:150:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
-    151:151:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> a
-    151:151:boolean verifyNoValuesAfterThrowingInstruction():1581 -> a
-    151:151:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
-    152:157:boolean verifyNoValuesAfterThrowingInstruction():1582:1587 -> a
-    152:157:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
-    158:158:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    158:158:boolean verifyNoValuesAfterThrowingInstruction():1587 -> a
-    158:158:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
-    159:159:boolean verifyNoValuesAfterThrowingInstruction():1587:1587 -> a
-    159:159:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
-    160:160:void close(com.android.tools.r8.ir.conversion.IRBuilder):715:715 -> a
-    161:172:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1079:1090 -> a
-    161:172:void close(com.android.tools.r8.ir.conversion.IRBuilder):716 -> a
-    173:173:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):796:796 -> a
-    174:178:boolean isCatchHandlerForSingleGuard():822:826 -> a
-    174:178:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):797 -> a
-    179:183:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):799:803 -> a
-    184:184:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):814:814 -> a
-    185:194:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):843:852 -> a
-    195:204:void linkCatchSuccessors(java.util.List,java.util.List):891:900 -> a
-    205:217:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):904:916 -> a
-    218:221:int numberOfNormalSuccessors() -> a
-    218:221:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):917 -> a
-    222:235:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):922:935 -> a
-    236:246:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):946:956 -> a
-    247:248:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1006:1007 -> a
-    247:248:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1019 -> a
-    249:251:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1021:1023 -> a
-    252:270:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1044:1062 -> a
-    271:275:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1069:1073 -> a
-    276:279:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1072:1075 -> a
-    280:281:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1095:1096 -> a
-    282:286:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1124:1128 -> a
-    287:294:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1141:1148 -> a
-    295:298:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1258:1261 -> a
-    299:331:void print(com.android.tools.r8.utils.CfgPrinter):1266:1298 -> a
-    332:333:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1302:1303 -> a
-    334:346:void removeInstructions(java.util.List):1324:1336 -> a
-    347:347:void setInstructions(java.util.LinkedList):1316:1316 -> a
-    347:347:void removeInstructions(java.util.List):1337 -> a
-    348:349: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):1361:1362 -> a
-    350:354:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1375:1379 -> a
-    355:361: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[]):1410:1416 -> a
-    362:362: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):1432:1432 -> a
-    363:363:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    363:363: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):1432 -> a
-    364:372: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):1433:1441 -> a
-    373:373:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    373:373: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):1442 -> a
-    374:374:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    374:374: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):1443 -> a
-    375:376: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):1444:1445 -> a
-    377:378:boolean canThrow():1557:1558 -> a
-    379:379:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606:1606 -> a
-    380:380:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
-    380:380:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606 -> a
-    381:381:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
-    382:382:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1614:1614 -> a
-    383:383:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1625:1625 -> a
-    384:389:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1643:1648 -> a
-    390:390:java.util.List getSuccessors():188:188 -> a
-    390:390:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1649 -> a
-    391:396:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1649:1654 -> a
-    397:402:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1675:1680 -> a
-    397:402:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1658 -> a
-    403:407:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1662:1666 -> a
-    408:424: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):1691:1707 -> a
-    425:434:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1735 -> a
-    425:434: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):1707 -> a
-    435:435:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    435:435:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1736 -> a
-    435:435: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):1707 -> a
-    436:438:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1736:1738 -> a
-    436:438: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):1707 -> a
-    439:439:java.util.LinkedList getInstructions():570:570 -> a
-    439:439:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1739 -> a
-    439:439: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):1707 -> a
-    440:457:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1739:1756 -> a
-    440:457:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
-    458:458:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    458:458:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1757 -> a
-    458:458: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):1707 -> a
-    459:462:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1758:1761 -> a
-    459:462: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):1707 -> a
-    463:463:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    463:463:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1762 -> a
-    463:463: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):1707 -> a
-    464:469:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1763:1768 -> a
-    464:469: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):1707 -> a
-    470:470:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1746 -> a
-    470:470: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):1707 -> a
-    471:471:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    471:471:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746 -> a
-    471:471: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):1707 -> a
-    472:506:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1780 -> a
-    472:506: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):1707 -> a
-    507:507:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):131:131 -> a
-    507:507:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1782 -> a
+    55:63:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456:464 -> a
+    64:64:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
+    64:64:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464 -> a
+    65:83:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464:482 -> a
+    84:84:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
+    84:84:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484 -> a
+    85:101:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484:500 -> a
+    102:102:java.util.LinkedList getInstructions():570:570 -> a
+    102:102:boolean consistentBlockInstructions(boolean,boolean):65 -> a
+    103:109:boolean consistentBlockInstructions(boolean,boolean):65:71 -> a
+    110:110:java.util.List getPredecessors():234:234 -> a
+    110:110:boolean consistentBlockInstructions(boolean,boolean):72 -> a
+    111:113:boolean consistentBlockInstructions(boolean,boolean):72:74 -> a
+    114:118:boolean consistentBlockInstructions(boolean,boolean):73:77 -> a
+    119:119:java.util.LinkedList getInstructions():570:570 -> a
+    119:119:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98 -> a
+    120:121:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:99 -> a
+    122:122:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    122:122:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):99 -> a
+    123:123:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:100 -> a
+    124:124:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):574:574 -> a
+    125:126:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):643:644 -> a
+    127:129:void clearMark(int):656:658 -> a
+    130:130:void addPhi(com.android.tools.r8.ir.code.Phi):688:688 -> a
+    131:131:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:702 -> a
+    132:132:boolean isFilled():535:535 -> a
+    132:132:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702 -> a
+    133:136:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:705 -> a
+    137:137:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:709 -> a
+    138:138:boolean isFilled():535:535 -> a
+    138:138:void close(com.android.tools.r8.ir.conversion.IRBuilder):709 -> a
+    139:143:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:713 -> a
+    144:144:boolean com.android.tools.r8.ir.code.JumpInstruction.isJumpInstruction():0:0 -> a
+    144:144:void close(com.android.tools.r8.ir.conversion.IRBuilder):713 -> a
+    145:145:void close(com.android.tools.r8.ir.conversion.IRBuilder):714:714 -> a
+    146:147:boolean verifyNoValuesAfterThrowingInstruction():1580:1581 -> a
+    146:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    148:148:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> a
+    148:148:boolean verifyNoValuesAfterThrowingInstruction():1581 -> a
+    148:148:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    149:154:boolean verifyNoValuesAfterThrowingInstruction():1582:1587 -> a
+    149:154:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    155:155:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    155:155:boolean verifyNoValuesAfterThrowingInstruction():1587 -> a
+    155:155:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    156:156:boolean verifyNoValuesAfterThrowingInstruction():1587:1587 -> a
+    156:156:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    157:157:void close(com.android.tools.r8.ir.conversion.IRBuilder):715:715 -> a
+    158:169:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1079:1090 -> a
+    158:169:void close(com.android.tools.r8.ir.conversion.IRBuilder):716 -> a
+    170:170:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):796:796 -> a
+    171:175:boolean isCatchHandlerForSingleGuard():822:826 -> a
+    171:175:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):797 -> a
+    176:180:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):799:803 -> a
+    181:181:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):814:814 -> a
+    182:191:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):843:852 -> a
+    192:201:void linkCatchSuccessors(java.util.List,java.util.List):891:900 -> a
+    202:214:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):904:916 -> a
+    215:218:int numberOfNormalSuccessors():218:221 -> a
+    215:218:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):917 -> a
+    219:232:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):922:935 -> a
+    233:243:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):946:956 -> a
+    244:245:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1006:1007 -> a
+    244:245:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1019 -> a
+    246:248:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1021:1023 -> a
+    249:267:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1044:1062 -> a
+    268:272:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1069:1073 -> a
+    273:276:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1072:1075 -> a
+    277:278:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1095:1096 -> a
+    279:283:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1124:1128 -> a
+    284:291:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1141:1148 -> a
+    292:295:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1258:1261 -> a
+    296:328:void print(com.android.tools.r8.utils.CfgPrinter):1266:1298 -> a
+    329:330:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1302:1303 -> a
+    331:343:void removeInstructions(java.util.List):1324:1336 -> a
+    344:344:void setInstructions(java.util.LinkedList):1316:1316 -> a
+    344:344:void removeInstructions(java.util.List):1337 -> a
+    345:346: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):1361:1362 -> a
+    347:351:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1375:1379 -> a
+    352:358: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[]):1410:1416 -> a
+    359:359: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):1432:1432 -> a
+    360:360:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    360:360: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):1432 -> a
+    361:369: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):1433:1441 -> a
+    370:370:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    370:370: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):1442 -> a
+    371:371:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    371:371: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):1443 -> a
+    372:373: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):1444:1445 -> a
+    374:375:boolean canThrow():1557:1558 -> a
+    376:376:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606:1606 -> a
+    377:377:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
+    377:377:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606 -> a
+    378:378:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
+    379:379:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1614:1614 -> a
+    380:380:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1625:1625 -> a
+    381:386:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1643:1648 -> a
+    387:387:java.util.List getSuccessors():188:188 -> a
+    387:387:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1649 -> a
+    388:393:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1649:1654 -> a
+    394:399:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1675:1680 -> a
+    394:399:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1658 -> a
+    400:404:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1662:1666 -> a
+    405:421:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1691:1707 -> a
+    422:431:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1735 -> a
+    422:431: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):1707 -> a
+    432:432:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    432:432:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1736 -> a
+    432:432: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):1707 -> a
+    433:435:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1736:1738 -> a
+    433:435: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):1707 -> a
+    436:436:java.util.LinkedList getInstructions():570:570 -> a
+    436:436:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1739 -> a
+    436:436: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):1707 -> a
+    437:454:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1739:1756 -> a
+    437:454: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):1707 -> a
+    455:455:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    455:455:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1757 -> a
+    455:455: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):1707 -> a
+    456:459:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1758:1761 -> a
+    456:459:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1707 -> a
+    460:460:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    460:460:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1762 -> a
+    460:460: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):1707 -> a
+    461:466:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1763:1768 -> a
+    461:466: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):1707 -> a
+    467:467:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1746 -> a
+    467:467: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):1707 -> a
+    468:468:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    468:468:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746 -> a
+    468:468: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):1707 -> a
+    469:503:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1780 -> a
+    469:503: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):1707 -> a
+    504:504:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    504:504:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1782 -> a
+    504:504: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):1707 -> a
+    505:505:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    505:505:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783 -> a
+    505:505: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):1707 -> a
+    506:506:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783:1783 -> a
+    506:506: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):1707 -> a
+    507:507:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1726 -> a
     507:507: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):1707 -> a
-    508:508:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    508:508:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783 -> a
-    508:508: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):1707 -> a
-    509:509:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783:1783 -> a
-    509:509: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):1707 -> a
-    510:510:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1726 -> a
-    510:510: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):1707 -> a
     1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):244:244 -> b
     2:30:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):335:363 -> b
     31:31:java.util.LinkedList getInstructions():570:570 -> b
@@ -23397,7 +23397,7 @@
     5:5:int doHash(java.lang.Object):1904:1904 -> a
     6:6:int doHash(com.android.tools.r8.ir.code.Phi):1919:1919 -> a
     6:6:int doHash(java.lang.Object):1904 -> a
-    7:7:int com.android.tools.r8.ir.code.Value.hashCode():763:763 -> a
+    7:7:int com.android.tools.r8.ir.code.Value.hashCode():764:764 -> a
     7:7:int doHash(com.android.tools.r8.ir.code.Phi):1920 -> a
     7:7:int doHash(java.lang.Object):1904 -> a
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.D.b.u:
@@ -23405,7 +23405,7 @@
     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():335:335 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> 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.D.b.w:
@@ -23426,187 +23426,187 @@
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.code.Position position -> d
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):36:36 -> <init>
-    2:9:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):32:39 -> <init>
-    10:10:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):42:42 -> <init>
-    11:24:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):32:45 -> <init>
-    25:26:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):50:51 -> <init>
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):37:37 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):33:40 -> <init>
+    10:10:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):43:43 -> <init>
+    11:24:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):33:46 -> <init>
+    25:26:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):51:52 -> <init>
     boolean lambda$inlineInvoke$2(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
     boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):88:88 -> a
-    2:2:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):183:183 -> a
+    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):89:89 -> a
+    2:2:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):184:184 -> a
     3:3:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    3:3:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):186 -> a
-    4:7:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):186:189 -> a
+    3:3:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):187 -> a
+    4:7:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):187:190 -> a
     8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    8:8:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):189 -> a
-    9:10:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):189:190 -> a
+    8:8:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):190 -> a
+    9:10:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):190:191 -> a
     11:11:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    11:11:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):190 -> a
-    12:13:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):190:191 -> a
+    11:11:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):191 -> a
+    12:13:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):191:192 -> a
     14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):191 -> a
+    14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):192 -> a
     15:15:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    15:15:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):191 -> a
-    16:24:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):191:199 -> a
-    25:25:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):184:184 -> a
-    26:29:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):204:207 -> a
+    15:15:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):192 -> a
+    16:24:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):192:200 -> a
+    25:25:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):185:185 -> a
+    26:29:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):205:208 -> a
     30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    30:30:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):208 -> a
-    31:54:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):227:250 -> a
+    30:30:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):209 -> a
+    31:54:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):228:251 -> a
     55:55:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    55:55:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):250 -> a
-    56:69:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):250:263 -> a
-    70:70:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):228:228 -> a
-    71:80:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):265:274 -> a
-    81:88:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):282:289 -> a
-    89:89:boolean hasNext():56:56 -> a
-    89:89:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):289 -> a
-    90:93:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):289:292 -> a
+    55:55:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251 -> a
+    56:69:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251:264 -> a
+    70:70:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):229:229 -> a
+    71:80:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):266:275 -> a
+    81:88:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):283:290 -> a
+    89:89:boolean hasNext():57:57 -> a
+    89:89:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290 -> a
+    90:93:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290:293 -> a
     94:94:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    94:94:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):292 -> a
-    95:95:boolean hasPrevious():72:72 -> a
-    95:95:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):296 -> a
-    96:100:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):296:300 -> a
+    94:94:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):293 -> a
+    95:95:boolean hasPrevious():73:73 -> a
+    95:95:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297 -> a
+    96:100:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297:301 -> a
     101:102:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    101:102:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):300 -> a
-    103:121:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):301:319 -> a
-    122:127:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):328:333 -> a
-    128:128:java.lang.Object next():27:27 -> a
-    128:128:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):333 -> a
-    129:129:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):335:335 -> a
-    130:162:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):361:393 -> a
-    163:166:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):431:434 -> a
+    101:102:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):301 -> a
+    103:121:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):302:320 -> a
+    122:127:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):329:334 -> a
+    128:128:java.lang.Object next():28:28 -> a
+    128:128:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):334 -> a
+    129:129:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):336:336 -> a
+    130:162:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):362:394 -> a
+    163:166:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):432:435 -> a
     167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    167:167:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):434 -> a
-    168:169:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):434:435 -> a
+    167:167:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435 -> a
+    168:169:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435:436 -> a
     170:170:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    170:170:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435 -> a
-    171:172:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):435:436 -> a
-    173:179: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):447:453 -> a
-    180:180:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
-    180:180:boolean canThrow(com.android.tools.r8.ir.code.IRCode):341 -> a
-    180:180: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):455 -> a
-    181:182:boolean canThrow(com.android.tools.r8.ir.code.IRCode):342:343 -> a
-    181:182: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):455 -> a
-    183:200: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):459:476 -> a
+    170:170:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):436 -> a
+    171:172:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):436:437 -> a
+    173:179: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):448:454 -> a
+    180:180:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    180:180:boolean canThrow(com.android.tools.r8.ir.code.IRCode):342 -> a
+    180:180: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):456 -> a
+    181:182:boolean canThrow(com.android.tools.r8.ir.code.IRCode):343:344 -> a
+    181:182: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):456 -> a
+    183:200: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):460:477 -> a
     201:201:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    201:201: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):476 -> a
-    202:209: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):476:483 -> a
+    201:201: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):477 -> a
+    202:209: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):477:484 -> a
     210:210:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    210:210: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):486 -> a
-    211:214: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):486:489 -> a
+    210:210: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):487 -> a
+    211:214: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):487:490 -> a
     215:215:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    215:215: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):488 -> a
-    216: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):490:490 -> a
-    217:217:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> 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):491 -> a
-    218:231: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):491:504 -> a
+    215:215: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):489 -> a
+    216: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):491:491 -> a
+    217:217:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> 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):492 -> a
+    218:231: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):492:505 -> a
     232:232:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
-    232:232: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):504 -> a
-    233:235: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):505:507 -> a
-    236:236:void add(java.lang.Object):27:27 -> a
-    236:236: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):507 -> a
-    237:242: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:513 -> a
-    243:243:void add(java.lang.Object):27:27 -> a
-    243:243: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):513 -> a
-    244:250: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):517:523 -> a
+    232:232: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):505 -> a
+    233:235: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):506:508 -> a
+    236:236:void add(java.lang.Object):28:28 -> a
+    236:236: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
+    237:242: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):509:514 -> a
+    243:243:void add(java.lang.Object):28:28 -> a
+    243:243: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):514 -> a
+    244:250: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):518:524 -> a
     251:251:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    251:251: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):527 -> a
-    252: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):527:531 -> a
+    251:251: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):528 -> a
+    252: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):528:532 -> a
     257:257:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    257:257: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):532 -> a
-    258:265: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):532:539 -> a
+    257:257: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):533 -> a
+    258:265: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):533:540 -> a
     266:266:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    266:266: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
-    267:280: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:552 -> a
+    266:266: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):540 -> a
+    267:280: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):540:553 -> a
     281:281:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    281:281: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):553 -> a
-    282:283: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):554:555 -> a
+    281:281: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):554 -> a
+    282:283: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):555:556 -> a
     284:284:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    284:284: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):556 -> a
-    285:287: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):556:558 -> a
+    284:284: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):557 -> a
+    285:287: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):557:559 -> a
     288:288:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    288:288: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):558 -> a
-    289:289: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):561:561 -> a
+    288:288: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):559 -> a
+    289:289: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):562:562 -> a
     290:290:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    290:290: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):560 -> a
-    291:291: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):559:559 -> a
+    290:290: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):561 -> a
+    291:291: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):560:560 -> a
     292:292:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
-    292:292: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):565 -> a
-    293:295: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):566:568 -> a
-    296:296:java.lang.Object next():27:27 -> a
-    296:296: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):568 -> a
-    297:298: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):569:570 -> a
-    299:299:boolean hasNext():56:56 -> a
-    299:299: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):570 -> a
-    300:307: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):570:577 -> a
-    308:308:java.lang.Object next():27:27 -> a
-    308:308: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):577 -> a
-    309:323: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):578:592 -> a
-    324:324:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):950:950 -> a
-    324:324: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):592 -> a
-    325:338: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):595:608 -> a
-    339:355: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):408:424 -> a
-    339:355: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):609 -> a
-    356:361: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):616:621 -> a
+    292:292: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):566 -> a
+    293:295: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):567:569 -> a
+    296:296:java.lang.Object next():28:28 -> a
+    296:296: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):569 -> a
+    297:298: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):570:571 -> a
+    299:299:boolean hasNext():57:57 -> a
+    299:299: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):571 -> a
+    300:307: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):571:578 -> a
+    308:308:java.lang.Object next():28:28 -> a
+    308:308: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):578 -> a
+    309:323: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:593 -> a
+    324:324:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):946:946 -> a
+    324:324: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):593 -> a
+    325:338: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):596:609 -> a
+    339:355: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):409:425 -> a
+    339:355: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):610 -> a
+    356:361: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):617:622 -> a
     362:362:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    362:362: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):621 -> a
-    363:373: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):621:631 -> a
-    374:378: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):630:634 -> a
-    379:382:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):640:643 -> a
-    383:383:java.lang.Object previous():27:27 -> a
-    383:383:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):643 -> a
-    384:404:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):646:666 -> a
-    405:405:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):131:131 -> a
-    405:405:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):671 -> a
-    406:406:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672:672 -> a
+    362:362: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):622 -> a
+    363:373: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):622:632 -> a
+    374:378: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):631:635 -> a
+    379:382:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):641:644 -> a
+    383:383:java.lang.Object previous():28:28 -> a
+    383:383:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):644 -> a
+    384:404:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):647:667 -> a
+    405:405:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672 -> a
+    406:406:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:673 -> a
     407:407:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    407:407:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672 -> a
-    408:418:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672:682 -> a
-    419:419:java.lang.Object previous():27:27 -> a
-    419:419:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):682 -> a
-    420:426:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):683:689 -> a
-    427:427:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
-    427:427:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):213 -> a
-    428:429:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):215:216 -> a
+    407:407:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673 -> a
+    408:418:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:683 -> a
+    419:419:java.lang.Object previous():28:28 -> a
+    419:419:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):683 -> a
+    420:426:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):684:690 -> a
+    427:427:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    427:427:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):214 -> a
+    428:429:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):216:217 -> a
     430:430:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    430:430:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):217 -> a
-    1:1:void add(java.lang.Object):27:27 -> add
-    1:7:void add(com.android.tools.r8.ir.code.Instruction):101:107 -> b
-    1:7:void removeOrReplaceByDebugLocalRead():171:177 -> d
-    8:8:void removeOrReplaceByDebugLocalRead():172:172 -> d
-    1:5:void removeInstructionIgnoreOutValue():162:166 -> f
-    6:6:void removeInstructionIgnoreOutValue():163:163 -> f
-    1:1:boolean hasNext():56:56 -> hasNext
-    1:1:boolean hasPrevious():72:72 -> hasPrevious
-    1:1:java.lang.Object next():27:27 -> next
-    2:2:com.android.tools.r8.ir.code.Instruction next():61:61 -> next
-    1:1:int nextIndex():67:67 -> nextIndex
-    1:1:java.lang.Object previous():27:27 -> previous
-    2:2:com.android.tools.r8.ir.code.Instruction previous():77:77 -> previous
-    1:1:int previousIndex():83:83 -> previousIndex
-    1:4:void remove():137:140 -> remove
+    430:430:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):218 -> a
+    1:1:void add(java.lang.Object):28:28 -> add
+    1:7:void add(com.android.tools.r8.ir.code.Instruction):102:108 -> b
+    1:7:void removeOrReplaceByDebugLocalRead():172:178 -> d
+    8:8:void removeOrReplaceByDebugLocalRead():173:173 -> d
+    1:5:void removeInstructionIgnoreOutValue():163:167 -> f
+    6:6:void removeInstructionIgnoreOutValue():164:164 -> f
+    1:1:boolean hasNext():57:57 -> hasNext
+    1:1:boolean hasPrevious():73:73 -> hasPrevious
+    1:1:java.lang.Object next():28:28 -> next
+    2:2:com.android.tools.r8.ir.code.Instruction next():62:62 -> next
+    1:1:int nextIndex():68:68 -> nextIndex
+    1:1:java.lang.Object previous():28:28 -> previous
+    2:2:com.android.tools.r8.ir.code.Instruction previous():78:78 -> previous
+    1:1:int previousIndex():84:84 -> previousIndex
+    1:4:void remove():138:141 -> remove
     5:5:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> remove
-    5:5:void remove():140 -> remove
-    6:8:void remove():140:142 -> remove
+    5:5:void remove():141 -> remove
+    6:8:void remove():141:143 -> remove
     9:9:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> remove
-    9:9:void remove():142 -> remove
-    10:11:void remove():142:143 -> remove
+    9:9:void remove():143 -> remove
+    10:11:void remove():143:144 -> remove
     12:12:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> remove
-    12:12:void remove():143 -> remove
-    13:22:void remove():143:152 -> remove
+    12:12:void remove():144 -> remove
+    13:22:void remove():144:153 -> remove
     23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> remove
-    23:23:void remove():152 -> remove
-    24:25:void remove():152:153 -> remove
+    23:23:void remove():153 -> remove
+    24:25:void remove():153:154 -> remove
     26:26:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> remove
-    26:26:void remove():153 -> remove
-    27:31:void remove():153:157 -> remove
-    32:32:void remove():138:138 -> remove
-    1:1:void set(java.lang.Object):27:27 -> set
-    2:5:void set(com.android.tools.r8.ir.code.Instruction):120:123 -> set
-    2:5:void set(java.lang.Object):27 -> set
+    26:26:void remove():154 -> remove
+    27:31:void remove():154:158 -> remove
+    32:32:void remove():139:139 -> remove
+    1:1:void set(java.lang.Object):28:28 -> set
+    2:5:void set(com.android.tools.r8.ir.code.Instruction):121:124 -> set
+    2:5:void set(java.lang.Object):28 -> set
 com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.D.b.y:
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> a
@@ -23625,9 +23625,9 @@
     1:1:java.lang.Object previous():9 -> previous
     1:1:int previousIndex():54:54 -> previousIndex
     1:6:void remove():77:82 -> remove
-    7:7:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():56:56 -> remove
+    7:7:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():57:57 -> remove
     7:7:void remove():82 -> remove
-    8:8:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> remove
+    8:8:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> remove
     8:8:void remove():83 -> remove
     9:13:void remove():84:88 -> remove
     14:14:void remove():78:78 -> remove
@@ -23637,15 +23637,15 @@
 com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.D.b.z:
     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:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> D2
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> F2
-    1:2:int maxInOutValueRegisterSize():82:83 -> G2
-    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> H2
+    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> C2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> E2
+    1:2:int maxInOutValueRegisterSize():82:83 -> F2
+    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> G2
     boolean hasInvariantOutType() -> I0
     boolean isBinop() -> Z0
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1261:1261 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1256:1256 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
     10:10:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58:58 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():75:75 -> a
@@ -23661,8 +23661,8 @@
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> g
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     com.android.tools.r8.ir.code.Binop asBinop() -> l
-    1:1:int maxInValueRegister():90:90 -> x2
-    1:1:int maxOutValueRegister():95:95 -> y2
+    1:1:int maxInValueRegister():90:90 -> w2
+    1:1:int maxOutValueRegister():95:95 -> x2
 com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.D.b.A:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> e
@@ -23729,10 +23729,10 @@
     com.android.tools.r8.graph.DexType type -> h
     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):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> D2
-    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> E2
-    1:1:com.android.tools.r8.ir.code.Value object():49 -> E2
-    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> E2
+    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> C2
+    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> D2
+    1:1:com.android.tools.r8.ir.code.Value object():49 -> D2
+    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41:41 -> a
@@ -23759,15 +23759,15 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     1:1:java.lang.String toString():108:108 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.D.b.G:
     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>
-    boolean isCommutative() -> E2
+    boolean isCommutative() -> D2
     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:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:86 -> a
@@ -23792,9 +23792,9 @@
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     1:17:java.lang.String toString():104:120 -> toString
     18:40:java.lang.String toString():109:131 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.D.b.F:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
@@ -23808,7 +23808,7 @@
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):29:30 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> D2
+    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> C2
     boolean instructionInstanceCanThrow() -> M0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
@@ -23844,12 +23844,12 @@
     54:54:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):182:182 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> b
     boolean isConstClass() -> c1
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     1:1:java.lang.String toString():83:83 -> toString
-    1:1:int maxInValueRegister():72:72 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():72:72 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.D.b.I:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
@@ -23865,7 +23865,7 @@
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> h
     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:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> D2
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> C2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):49:49 -> a
@@ -23885,18 +23885,18 @@
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():275:275 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):85 -> a
     boolean isConstMethodHandle() -> e1
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     1:1:java.lang.String toString():95:95 -> toString
-    1:1:int maxInValueRegister():78:78 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():78:78 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.D.b.K:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
     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:com.android.tools.r8.graph.DexProto getValue():57:57 -> D2
+    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> C2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):49:49 -> a
@@ -23916,50 +23916,50 @@
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():279:279 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131 -> a
     boolean isConstMethodType() -> f1
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     1:1:java.lang.String toString():89:89 -> toString
-    1:1:int maxInValueRegister():78:78 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():78:78 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.D.b.L:
     boolean $assertionsDisabled -> i
     long value -> h
     1:1:void <clinit>():32:32 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Value,long):37:42 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> D2
-    1:1:double getDoubleValue():92:92 -> E2
+    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> C2
+    1:1:double getDoubleValue():92:92 -> D2
+    2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> D2
+    2:2:double getDoubleValue():92 -> D2
+    3:4:double getDoubleValue():92:93 -> D2
+    1:1:float getFloatValue():87:87 -> E2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> E2
-    2:2:double getDoubleValue():92 -> E2
-    3:4:double getDoubleValue():92:93 -> E2
-    1:1:float getFloatValue():87:87 -> F2
+    2:2:float getFloatValue():87 -> E2
+    3:4:float getFloatValue():87:88 -> E2
+    1:1:int getIntValue():76:76 -> F2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> F2
-    2:2:float getFloatValue():87 -> F2
-    3:4:float getFloatValue():87:88 -> F2
-    1:1:int getIntValue():76:76 -> G2
+    2:2:int getIntValue():76 -> F2
+    3:3:int getIntValue():76:76 -> F2
+    4:4:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> F2
+    4:4:int getIntValue():77 -> F2
+    5:5:int getIntValue():77:77 -> F2
+    6:8:int getIntValue():76:78 -> F2
+    1:1:long getLongValue():82:82 -> G2
     2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> G2
-    2:2:int getIntValue():76 -> G2
-    3:3:int getIntValue():76:76 -> G2
-    4:4:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> G2
-    4:4:int getIntValue():77 -> G2
-    5:5:int getIntValue():77:77 -> G2
-    6:8:int getIntValue():76:78 -> G2
-    1:1:long getLongValue():82:82 -> H2
-    2:2:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> H2
-    2:2:long getLongValue():82 -> H2
-    3:4:long getLongValue():82:83 -> H2
-    1:1:long getRawValue():97:97 -> I2
-    1:1:boolean is16Bit():273:273 -> J2
-    1:1:boolean is8Bit():265:265 -> K2
+    2:2:long getLongValue():82 -> G2
+    3:4:long getLongValue():82:83 -> G2
+    1:1:long getRawValue():97:97 -> H2
+    1:1:boolean is16Bit():273:273 -> I2
+    1:1:boolean is8Bit():265:265 -> J2
+    1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> K2
+    1:1:boolean isIntegerOne():109 -> K2
+    2:2:boolean isIntegerOne():109:109 -> K2
     1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> L2
-    1:1:boolean isIntegerOne():109 -> L2
-    2:2:boolean isIntegerOne():109:109 -> L2
-    1:1:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Instruction.outType():163:163 -> M2
-    1:1:boolean isIntegerZero():105 -> M2
-    2:2:boolean isIntegerZero():105:105 -> M2
-    1:1:boolean isZero():101:101 -> N2
-    1:1:boolean negativeIs16Bit():277:277 -> O2
-    1:1:boolean negativeIs8Bit():269:269 -> P2
+    1:1:boolean isIntegerZero():105 -> L2
+    2:2:boolean isIntegerZero():105:105 -> L2
+    1:1:boolean isZero():101:101 -> M2
+    1:1:boolean negativeIs16Bit():277:277 -> N2
+    1:1:boolean negativeIs8Bit():269:269 -> O2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:2:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):56:57 -> a
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
@@ -24042,23 +24042,23 @@
     5:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):319 -> b
     6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):319:319 -> b
     7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):317:317 -> b
+    boolean isOutConstant() -> f2
     boolean isConstNumber() -> g1
-    boolean isOutConstant() -> g2
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     1:2:java.lang.String toString():245:246 -> toString
     3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
     3:3:java.lang.String toString():246 -> toString
     4:6:java.lang.String toString():246:248 -> toString
-    1:1:int maxInValueRegister():234:234 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():234:234 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.D.b.M:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> i
     1:1:void <clinit>():20:20 -> <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):26:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> D2
+    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> C2
     1:11:boolean instructionInstanceCanThrow():110:120 -> M0
     1:1:boolean instructionTypeCanThrow():90:90 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24082,7 +24082,7 @@
     13:14:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:64 -> a
     15:15:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> a
     16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     17:17:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129 -> a
     18:18:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
     19:19:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):134:134 -> a
@@ -24090,33 +24090,29 @@
     21:21:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):144:144 -> a
     22:22:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):149:149 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     boolean isConstString() -> h1
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     1:1:java.lang.String toString():85:85 -> toString
-    1:1:int maxInValueRegister():74:74 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():74:74 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.D.b.N:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
-    1:2:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:43 -> a
+    1:1:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):41:41 -> a
+    2:2:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    2:2:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42 -> a
     3:3:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:42 -> a
     4:4:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    4:4:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44 -> a
-    5:5:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44:44 -> a
-    6:6:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    6:6:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44 -> a
-    7:7:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):44:44 -> a
-    8:8:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    8:8:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):45 -> a
-    9:13:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):45:49 -> a
-    14:22:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):48:56 -> a
-    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    23:23:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20 -> a
-    24:36:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):21:33 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    37:37:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20 -> a
+    4:4:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43 -> a
+    5:9:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43:47 -> a
+    10:18:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):46:54 -> a
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    19:19:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20 -> a
+    20:31:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):21:32 -> a
+    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    32:32:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20 -> a
 com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.D.b.O:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -24131,9 +24127,9 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean isDebugLocalRead() -> l1
-    1:1:int maxInValueRegister():59:59 -> x2
-    1:1:int maxOutValueRegister():64:64 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():59:59 -> w2
+    1:1:int maxOutValueRegister():64:64 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.D.b.P:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isAllowedAfterThrowingInstruction() -> P0
@@ -24154,7 +24150,7 @@
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
     6:6:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71 -> a
     7:7:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):71:71 -> a
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     boolean isDebugLocalWrite() -> n1
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
 com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.D.b.S:
@@ -24163,8 +24159,8 @@
     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>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> D2
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> E2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> C2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> D2
     boolean hasInvariantOutType() -> I0
     boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24185,9 +24181,9 @@
     boolean isDebugLocalsChange() -> o1
     1:6:java.lang.String toString():92:97 -> toString
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
-    1:1:int maxInValueRegister():77:77 -> x2
-    1:1:int maxOutValueRegister():82:82 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():77:77 -> w2
+    1:1:int maxOutValueRegister():82:82 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.D.b.T:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
@@ -24205,9 +24201,9 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean isDebugPosition() -> p1
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    1:1:int maxInValueRegister():55:55 -> x2
-    1:1:int maxOutValueRegister():60:60 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():55:55 -> w2
+    1:1:int maxOutValueRegister():60:60 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.D.b.U:
     1:1:void <init>():7:7 -> <init>
     java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction) -> a
@@ -24229,8 +24225,8 @@
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> i
     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>
-    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> D2
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> E2
+    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> C2
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> D2
     boolean instructionInstanceCanThrow() -> M0
     1:1:boolean instructionTypeCanThrow():113:113 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24261,17 +24257,17 @@
     21:21:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):146:146 -> a
     22:22:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):151:151 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     boolean isDexItemBasedConstString() -> q1
     1:1:java.lang.String toString():108:108 -> toString
+    1:1:int maxInValueRegister():97:97 -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
-    1:1:int maxInValueRegister():97:97 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Div -> com.android.tools.r8.D.b.W:
     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 isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> H2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -24292,7 +24288,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
     boolean isDiv() -> r1
     com.android.tools.r8.ir.code.Div asDiv() -> y
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.D.b.a0:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
@@ -24351,19 +24347,19 @@
     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>
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> C2
+    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> C2
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55 -> C2
+    3:3:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> C2
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> D2
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> D2
-    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> D2
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> D2
     2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> D2
-    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55 -> D2
-    3:3:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> D2
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> E2
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51 -> E2
-    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> E2
-    2:2:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> E2
-    2:2:com.android.tools.r8.ir.code.StackValue outTop():59 -> E2
-    3:3:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> E2
-    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> F2
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():59 -> D2
+    3:3:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> D2
+    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> E2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24375,10 +24371,10 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
     boolean isDup() -> s1
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():92:92 -> y2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():92:92 -> x2
+    int opcode() -> y2
     com.android.tools.r8.ir.code.Dup asDup() -> z
-    int opcode() -> z2
 com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.D.b.b0:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -24395,41 +24391,34 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
     boolean isDup2() -> t1
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():106:106 -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():106:106 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.D.b.d0:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
-    1:1:void <clinit>():25:25 -> <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):30:30 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):34:36 -> <init>
+    1:1:void <clinit>():22:22 -> <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):27:27 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):31:33 -> <init>
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
-    1:1:com.android.tools.r8.graph.DexField getField():46:46 -> D2
-    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():42:42 -> E2
-    com.android.tools.r8.ir.code.Value value() -> F2
+    1:1:com.android.tools.r8.graph.DexField getField():43:43 -> C2
+    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> D2
+    com.android.tools.r8.ir.code.Value value() -> E2
     boolean hasInvariantOutType() -> I0
-    1:24:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):62:85 -> a
+    1:24:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):59:82 -> a
     25:25:boolean com.android.tools.r8.graph.DexEncodedField.isStaticMember():123:123 -> a
-    25:25:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):89 -> a
-    26:43:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):90:107 -> a
+    25:25:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):86 -> a
+    26:43:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):87:104 -> a
     44:44:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    44:44:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):107 -> a
-    45:65:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):113:133 -> a
-    66:66:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):108:108 -> a
-    67:67:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):95:95 -> a
-    68:68:boolean lambda$instructionInstanceCanThrow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):129:129 -> a
-    69:74:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):176:181 -> a
-    75:75:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    75:75:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):181 -> a
-    76:93:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):182:199 -> a
-    94:94:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):198:198 -> a
-    95:95:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    95:95:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):181 -> a
-    1:6:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):144:149 -> d
-    7:7:com.android.tools.r8.graph.DexField getField():46:46 -> d
-    7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):150 -> d
-    8:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):152:167 -> d
+    44:44:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104 -> a
+    45:65:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):110:130 -> a
+    66:66:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):105:105 -> a
+    67:67:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):92:92 -> a
+    68:68:boolean lambda$instructionInstanceCanThrow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):126:126 -> a
+    1:6:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):141:146 -> d
+    7:7:com.android.tools.r8.graph.DexField getField():43:43 -> d
+    7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147 -> d
+    8:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):149:164 -> d
     boolean isFieldInstruction() -> v1
 com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.D.b.e0:
     com.android.tools.r8.ir.code.FieldMemberType DOUBLE -> i
@@ -24465,21 +24454,21 @@
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int):16:18 -> <init>
-    boolean isConstant() -> E
-    boolean isFixedRegisterValue() -> G
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1082:1082 -> W
-    1:1:com.android.tools.r8.ir.code.ValueType outType():23 -> W
-    2:23:com.android.tools.r8.ir.code.ValueType outType():24:45 -> W
-    24:25:com.android.tools.r8.ir.code.ValueType outType():42:43 -> W
+    boolean isConstant() -> D
+    boolean isFixedRegisterValue() -> F
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1199:1199 -> V
+    1:1:com.android.tools.r8.ir.code.ValueType outType():23 -> V
+    2:23:com.android.tools.r8.ir.code.ValueType outType():24:45 -> V
+    24:25:com.android.tools.r8.ir.code.ValueType outType():42:43 -> V
+    1:1:int getRegister():49:49 -> b0
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> c
-    1:1:int getRegister():49:49 -> c0
     1:1:java.lang.String toString():69:69 -> toString
 com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.D.b.g0:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.code.Goto asGoto() -> B
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> E2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> D2
     boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24488,7 +24477,7 @@
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> a
     5:5:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:104 -> a
     6:6:void com.android.tools.r8.ir.code.BasicBlockIterator.<init>(com.android.tools.r8.ir.code.IRCode):17:17 -> a
-    6:6:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():946 -> a
+    6:6:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():942 -> a
     6:6:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):105 -> a
     7:7:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> a
     7:7:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):106 -> a
@@ -24501,14 +24490,14 @@
     10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():9 -> a
     10:10:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):109 -> a
     11:11:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):109:109 -> a
-    12:12:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():946:946 -> a
+    12:12:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator():942:942 -> a
     12:12:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):105 -> a
     13:13:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
     1:4:java.lang.String toString():71:74 -> toString
+    1:1:int maxInValueRegister():59:59 -> w2
     boolean isGoto() -> x1
-    1:1:int maxInValueRegister():59:59 -> x2
-    1:1:int maxOutValueRegister():65:65 -> y2
-    int opcode() -> z2
+    1:1:int maxOutValueRegister():65:65 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.D.b.j0:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> a
@@ -24521,297 +24510,294 @@
     com.android.tools.r8.utils.InternalOptions options -> i
     com.android.tools.r8.origin.Origin origin -> j
     java.util.LinkedList blocks -> b
-    1:1:void <clinit>():50:50 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):124:124 -> <init>
-    2:32:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):104:134 -> <init>
-    1:20:void traceBlocks():401:420 -> A
-    21:33:void traceBlocks():419:431 -> A
-    34:34:boolean noColorsInUse():1149:1149 -> A
-    34:34:void traceBlocks():431 -> A
-    35:35:void traceBlocks():431:431 -> A
-    1:12:boolean verifyNoImpreciseOrBottomTypes():853:864 -> B
-    1:8:boolean verifyNoNullabilityBottomTypes():868:875 -> C
-    1:14:boolean verifySplitCriticalEdges():374:387 -> D
-    1:6:boolean computeAllThrowingInstructionsHavePositions():1072:1077 -> E
-    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():879:890 -> F
-    1:17:boolean controlFlowMayDependOnEnvironment(com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis):267:283 -> a
-    18:18:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):335:335 -> a
-    19:23:void ensureBlockNumbering():435:439 -> a
-    19:23:void print(com.android.tools.r8.utils.CfgPrinter):541 -> a
-    24:25:void print(com.android.tools.r8.utils.CfgPrinter):542:543 -> a
-    26:36:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):558:568 -> a
-    37:37:boolean lambda$verifyTypes$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.BasicBlock):593:593 -> a
-    38:38:void lambda$consistentBlockNumbering$2(java.lang.Integer,java.lang.Long):748:748 -> a
-    39:45:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):855:861 -> a
-    46:46:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):860:860 -> a
-    47:50:boolean lambda$wrapSSAVerifierWithStackValueHandling$8(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):897:900 -> a
-    51:51:java.lang.Iterable instructions(java.util.function.Predicate):924:924 -> a
-    52:53:java.util.List collectArguments(boolean):980:981 -> a
-    52:53:java.util.List collectArguments():976 -> a
-    54:54:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
-    54:54:java.util.List collectArguments(boolean):981 -> a
-    54:54:java.util.List collectArguments():976 -> a
-    55:58:java.util.List collectArguments(boolean):982:985 -> a
-    55:58:java.util.List collectArguments():976 -> a
-    59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    59:59:java.util.List collectArguments(boolean):985 -> a
-    59:59:java.util.List collectArguments():976 -> a
-    60:65:java.util.List collectArguments(boolean):987:992 -> a
-    60:65:java.util.List collectArguments():976 -> a
-    66:66:java.util.List collectArguments(boolean):991:991 -> a
-    66:66:java.util.List collectArguments():976 -> a
-    67:67:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
-    67:67:java.util.List collectArguments(boolean):981 -> a
-    67:67:java.util.List collectArguments():976 -> a
-    68:68:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):1008:1008 -> a
-    69:70:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1030:1031 -> a
-    71:71:void setAllThrowingInstructionsHavePositions(boolean):1068:1068 -> a
-    72:75:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1097:1100 -> a
-    76:76:boolean isMarkingColorInUse(int):1136:1136 -> a
-    77:77:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1153:1153 -> a
-    78:86:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1178:1186 -> a
-    78:86:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1154 -> a
-    87:92:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1155:1160 -> a
-    93:93:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    93:93:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1160 -> a
-    94:100:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1161:1167 -> a
-    101:101:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    101:101:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1167 -> a
-    102:102:void markTransitiveSuccessors(java.util.Deque,int):1225:1225 -> a
-    103:103:boolean isMarkingColorInUse(int):1136:1136 -> a
-    103:103:void markTransitiveSuccessors(java.util.Deque,int):1225 -> a
-    104:105:boolean anyBlocksMarkedWithColor(int):1140:1141 -> a
-    104:105:void markTransitiveSuccessors(java.util.Deque,int):1225 -> a
-    106:115:void markTransitiveSuccessors(java.util.Deque,int):1225:1234 -> a
-    116:116:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1246:1246 -> a
-    117:117:boolean isMarkingColorInUse(int):1136:1136 -> a
-    117:117:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1246 -> a
-    118:129:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1246:1257 -> a
-    130:130:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> a
-    130:130:java.util.Iterator lambda$getInstructionsReachableFrom$10(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1165 -> a
-    1:53:java.util.Map computeLiveAtEntrySets():149:201 -> b
-    54:57:java.util.Map computeLiveAtEntrySets():200:203 -> b
-    58:58:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasPrevious():72:72 -> b
-    58:58:java.util.Map computeLiveAtEntrySets():203 -> b
-    59:59:java.util.Map computeLiveAtEntrySets():204:204 -> b
-    60:60:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    60:60:java.util.Map computeLiveAtEntrySets():205 -> b
-    61:74:java.util.Map computeLiveAtEntrySets():207:220 -> b
-    75:75:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
-    75:75:java.util.Map computeLiveAtEntrySets():224 -> b
-    76:111:java.util.Map computeLiveAtEntrySets():224:259 -> b
-    112:112:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():83:83 -> b
-    112:112:java.util.Map computeLiveAtEntrySets():259 -> b
-    113:115:java.util.Map computeLiveAtEntrySets():259:261 -> b
-    116:117:boolean verifyTypes(com.android.tools.r8.graph.AppView):589:590 -> b
-    118:121:boolean validAssumeDynamicTypeInstructions(com.android.tools.r8.graph.AppView):598:601 -> b
-    118:121:boolean verifyTypes(com.android.tools.r8.graph.AppView):590 -> b
-    122:124:boolean verifyTypes(com.android.tools.r8.graph.AppView):591:593 -> b
-    125:127:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):870:872 -> b
-    128:128:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):870:870 -> b
-    129:129:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():928:928 -> b
-    129:129:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):924 -> b
-    130:130:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):924:924 -> b
-    131:131:java.util.ListIterator listIterator(int):950:950 -> b
-    132:132:boolean lambda$findFirstNonNonePosition$11(com.android.tools.r8.ir.code.Instruction):1265:1265 -> b
-    1:6:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):881:886 -> c
-    7:13:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):881:887 -> c
-    14:14:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):882:882 -> c
-    15:18:boolean verifySSATypeLattice(java.util.function.Predicate):906:909 -> c
-    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> c
-    19:19:boolean verifySSATypeLattice(java.util.function.Predicate):909 -> c
-    20:24:boolean verifySSATypeLattice(java.util.function.Predicate):909:913 -> c
-    25:31:java.util.List computeNormalExitBlocks():936:942 -> c
-    32:32:void returnMarkingColor(int):1130:1130 -> c
-    33:33:boolean isMarkingColorInUse(int):1136:1136 -> c
-    33:33:void returnMarkingColor(int):1130 -> c
-    34:34:void returnMarkingColor(int):1130:1130 -> c
-    35:36:void clearMarks(int):456:457 -> c
-    35:36:void returnMarkingColor(int):1131 -> c
-    37:37:void returnMarkingColor(int):1132:1132 -> c
-    1:4:boolean consistentBlockNumbering():743:746 -> d
-    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Instruction):885:885 -> d
-    6:6:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):894:894 -> d
-    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1054:1054 -> e
-    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> e
-    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1054 -> e
-    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():1055:1055 -> e
-    1:1:boolean doAllThrowingInstructionsHavePositions():1064:1064 -> f
-    1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():142:142 -> g
-    1:1:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1265:1265 -> h
+    1:1:void <clinit>():48:48 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):122:122 -> <init>
+    2:32:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):102:132 -> <init>
+    1:20:void traceBlocks():397:416 -> A
+    21:33:void traceBlocks():415:427 -> A
+    34:34:boolean noColorsInUse():1145:1145 -> A
+    34:34:void traceBlocks():427 -> A
+    35:35:void traceBlocks():427:427 -> A
+    1:12:boolean verifyNoImpreciseOrBottomTypes():849:860 -> B
+    1:8:boolean verifyNoNullabilityBottomTypes():864:871 -> C
+    1:14:boolean verifySplitCriticalEdges():370:383 -> D
+    1:6:boolean computeAllThrowingInstructionsHavePositions():1068:1073 -> E
+    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():875:886 -> F
+    1:17:boolean controlFlowMayDependOnEnvironment(com.android.tools.r8.graph.AppView):263:279 -> a
+    18:18:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):331:331 -> a
+    19:23:void ensureBlockNumbering():431:435 -> a
+    19:23:void print(com.android.tools.r8.utils.CfgPrinter):537 -> a
+    24:25:void print(com.android.tools.r8.utils.CfgPrinter):538:539 -> a
+    26:26:boolean lambda$verifyTypes$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.BasicBlock):589:589 -> a
+    27:27:void lambda$consistentBlockNumbering$2(java.lang.Integer,java.lang.Long):744:744 -> a
+    28:34:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):851:857 -> a
+    35:35:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):856:856 -> a
+    36:39:boolean lambda$wrapSSAVerifierWithStackValueHandling$8(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):893:896 -> a
+    40:40:java.lang.Iterable instructions(java.util.function.Predicate):920:920 -> a
+    41:42:java.util.List collectArguments(boolean):976:977 -> a
+    41:42:java.util.List collectArguments():972 -> a
+    43:43:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    43:43:java.util.List collectArguments(boolean):977 -> a
+    43:43:java.util.List collectArguments():972 -> a
+    44:47:java.util.List collectArguments(boolean):978:981 -> a
+    44:47:java.util.List collectArguments():972 -> a
+    48:48:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    48:48:java.util.List collectArguments(boolean):981 -> a
+    48:48:java.util.List collectArguments():972 -> a
+    49:54:java.util.List collectArguments(boolean):983:988 -> a
+    49:54:java.util.List collectArguments():972 -> a
+    55:55:java.util.List collectArguments(boolean):987:987 -> a
+    55:55:java.util.List collectArguments():972 -> a
+    56:56:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    56:56:java.util.List collectArguments(boolean):977 -> a
+    56:56:java.util.List collectArguments():972 -> a
+    57:57:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):1004:1004 -> a
+    58:59:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1026:1027 -> a
+    60:60:void setAllThrowingInstructionsHavePositions(boolean):1064:1064 -> a
+    61:64:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1093:1096 -> a
+    65:65:boolean isMarkingColorInUse(int):1132:1132 -> a
+    66:66:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1149:1149 -> a
+    67:75:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1174:1182 -> a
+    67:75:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1150 -> a
+    76:81:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1151:1156 -> a
+    82:82:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    82:82:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1156 -> a
+    83:89:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1157:1163 -> a
+    90:90:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    90:90:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1163 -> a
+    91:91:void markTransitiveSuccessors(java.util.Deque,int):1221:1221 -> a
+    92:92:boolean isMarkingColorInUse(int):1132:1132 -> a
+    92:92:void markTransitiveSuccessors(java.util.Deque,int):1221 -> a
+    93:94:boolean anyBlocksMarkedWithColor(int):1136:1137 -> a
+    93:94:void markTransitiveSuccessors(java.util.Deque,int):1221 -> a
+    95:104:void markTransitiveSuccessors(java.util.Deque,int):1221:1230 -> a
+    105:105:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242:1242 -> a
+    106:106:boolean isMarkingColorInUse(int):1132:1132 -> a
+    106:106:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242 -> a
+    107:118:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242:1253 -> a
+    119:119:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> a
+    119:119:java.util.Iterator lambda$getInstructionsReachableFrom$10(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1161 -> a
+    1:52:java.util.Map computeLiveAtEntrySets():147:198 -> b
+    53:56:java.util.Map computeLiveAtEntrySets():197:200 -> b
+    57:57:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasPrevious():73:73 -> b
+    57:57:java.util.Map computeLiveAtEntrySets():200 -> b
+    58:58:java.util.Map computeLiveAtEntrySets():201:201 -> b
+    59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
+    59:59:java.util.Map computeLiveAtEntrySets():202 -> b
+    60:73:java.util.Map computeLiveAtEntrySets():204:217 -> b
+    74:74:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
+    74:74:java.util.Map computeLiveAtEntrySets():221 -> b
+    75:110:java.util.Map computeLiveAtEntrySets():221:256 -> b
+    111:111:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():81:81 -> b
+    111:111:java.util.Map computeLiveAtEntrySets():256 -> b
+    112:114:java.util.Map computeLiveAtEntrySets():256:258 -> b
+    115:125:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):554:564 -> b
+    126:128:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):866:868 -> b
+    129:129:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):866:866 -> b
+    130:130:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():924:924 -> b
+    130:130:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):920 -> b
+    131:131:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):920:920 -> b
+    132:132:java.util.ListIterator listIterator(int):946:946 -> b
+    133:133:boolean lambda$findFirstNonNonePosition$11(com.android.tools.r8.ir.code.Instruction):1261:1261 -> b
+    1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):585:586 -> c
+    3:6:boolean validAssumeDynamicTypeInstructions(com.android.tools.r8.graph.AppView):594:597 -> c
+    3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):586 -> c
+    7:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):587:589 -> c
+    10:15:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):877:882 -> c
+    16:22:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):877:883 -> c
+    23:23:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):878:878 -> c
+    24:27:boolean verifySSATypeLattice(java.util.function.Predicate):902:905 -> c
+    28:28:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> c
+    28:28:boolean verifySSATypeLattice(java.util.function.Predicate):905 -> c
+    29:33:boolean verifySSATypeLattice(java.util.function.Predicate):905:909 -> c
+    34:40:java.util.List computeNormalExitBlocks():932:938 -> c
+    41:41:void returnMarkingColor(int):1126:1126 -> c
+    42:42:boolean isMarkingColorInUse(int):1132:1132 -> c
+    42:42:void returnMarkingColor(int):1126 -> c
+    43:43:void returnMarkingColor(int):1126:1126 -> c
+    44:45:void clearMarks(int):452:453 -> c
+    44:45:void returnMarkingColor(int):1127 -> c
+    46:46:void returnMarkingColor(int):1128:1128 -> c
+    1:4:boolean consistentBlockNumbering():739:742 -> d
+    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Instruction):881:881 -> d
+    6:6:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):890:890 -> d
+    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1050:1050 -> e
+    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> e
+    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1050 -> e
+    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():1051:1051 -> e
+    1:1:boolean doAllThrowingInstructionsHavePositions():1060:1060 -> f
+    1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():140:140 -> g
+    1:1:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261:1261 -> h
     2:2:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> h
-    2:2:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1265 -> h
-    3:16:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1265:1278 -> h
+    2:2:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261 -> h
+    3:16:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261:1274 -> h
     17:17:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> h
-    17:17:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1265 -> h
-    1:1:int getHighestBlockNumber():1044:1044 -> i
-    1:1:int getNextInstructionNumber():972:972 -> j
-    1:4:com.android.tools.r8.ir.code.Value getThis():997:1000 -> k
+    17:17:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261 -> h
+    1:1:int getHighestBlockNumber():1040:1040 -> i
+    1:1:int getNextInstructionNumber():968:968 -> j
+    1:4:com.android.tools.r8.ir.code.Value getThis():993:996 -> k
     5:5:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> k
-    5:5:com.android.tools.r8.ir.code.Value getThis():1000 -> k
-    6:8:com.android.tools.r8.ir.code.Value getThis():1000:1002 -> k
+    5:5:com.android.tools.r8.ir.code.Value getThis():996 -> k
+    6:8:com.android.tools.r8.ir.code.Value getThis():996:998 -> k
     9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> k
-    9:9:com.android.tools.r8.ir.code.Value getThis():1002 -> k
-    10:10:com.android.tools.r8.ir.code.Value getThis():1003:1003 -> k
+    9:9:com.android.tools.r8.ir.code.Value getThis():998 -> k
+    10:10:com.android.tools.r8.ir.code.Value getThis():999:999 -> k
     11:11:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> k
-    11:11:com.android.tools.r8.ir.code.Value getThis():1000 -> k
-    1:3:java.util.Set getUnreachableBlocks():1191:1193 -> l
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1221:1221 -> l
-    4:4:java.util.Set getUnreachableBlocks():1193 -> l
-    5:10:java.util.Set getUnreachableBlocks():1194:1199 -> l
-    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():928:928 -> m
-    1:1:java.lang.Iterable instructions():920:920 -> n
-    1:1:boolean isConsistentGraph():576:576 -> o
-    2:2:boolean noColorsInUse():1149:1149 -> o
-    2:2:boolean isConsistentGraph():576 -> o
-    3:5:boolean isConsistentGraph():576:578 -> o
-    6:21:boolean consistentPredecessorSuccessors():714:729 -> o
-    6:21:boolean isConsistentGraph():578 -> o
-    22:22:boolean isConsistentGraph():579:579 -> o
-    23:24:boolean consistentCatchHandlers():736:737 -> o
-    23:24:boolean isConsistentGraph():579 -> o
-    25:25:boolean isConsistentGraph():580:580 -> o
-    26:29:boolean consistentBlockInstructions():755:758 -> o
-    26:29:boolean isConsistentGraph():580 -> o
-    30:30:boolean consistentBlockInstructions():756:756 -> o
-    30:30:boolean isConsistentGraph():580 -> o
-    31:31:boolean isConsistentGraph():581:581 -> o
-    32:88:boolean consistentMetadata():765:821 -> o
-    32:88:boolean isConsistentGraph():581 -> o
-    89:89:boolean isConsistentGraph():582:582 -> o
-    1:2:boolean isConsistentSSA():548:549 -> p
-    3:19:boolean consistentDefUseChains():638:654 -> p
-    3:19:boolean isConsistentSSA():549 -> p
+    11:11:com.android.tools.r8.ir.code.Value getThis():996 -> k
+    1:3:java.util.Set getUnreachableBlocks():1187:1189 -> l
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1217:1217 -> l
+    4:4:java.util.Set getUnreachableBlocks():1189 -> l
+    5:10:java.util.Set getUnreachableBlocks():1190:1195 -> l
+    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():924:924 -> m
+    1:1:java.lang.Iterable instructions():916:916 -> n
+    1:1:boolean isConsistentGraph():572:572 -> o
+    2:2:boolean noColorsInUse():1145:1145 -> o
+    2:2:boolean isConsistentGraph():572 -> o
+    3:5:boolean isConsistentGraph():572:574 -> o
+    6:21:boolean consistentPredecessorSuccessors():710:725 -> o
+    6:21:boolean isConsistentGraph():574 -> o
+    22:22:boolean isConsistentGraph():575:575 -> o
+    23:24:boolean consistentCatchHandlers():732:733 -> o
+    23:24:boolean isConsistentGraph():575 -> o
+    25:25:boolean isConsistentGraph():576:576 -> o
+    26:29:boolean consistentBlockInstructions():751:754 -> o
+    26:29:boolean isConsistentGraph():576 -> o
+    30:30:boolean consistentBlockInstructions():752:752 -> o
+    30:30:boolean isConsistentGraph():576 -> o
+    31:31:boolean isConsistentGraph():577:577 -> o
+    32:88:boolean consistentMetadata():761:817 -> o
+    32:88:boolean isConsistentGraph():577 -> o
+    89:89:boolean isConsistentGraph():578:578 -> o
+    1:2:boolean isConsistentSSA():544:545 -> p
+    3:19:boolean consistentDefUseChains():634:650 -> p
+    3:19:boolean isConsistentSSA():545 -> p
     20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> p
-    20:20:boolean consistentDefUseChains():655 -> p
-    20:20:boolean isConsistentSSA():549 -> p
-    21:22:boolean consistentDefUseChains():657:658 -> p
-    21:22:boolean isConsistentSSA():549 -> p
+    20:20:boolean consistentDefUseChains():651 -> p
+    20:20:boolean isConsistentSSA():545 -> p
+    21:22:boolean consistentDefUseChains():653:654 -> p
+    21:22:boolean isConsistentSSA():545 -> p
     23:23:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> p
-    23:23:boolean consistentDefUseChains():660 -> p
-    23:23:boolean isConsistentSSA():549 -> p
-    24:36:boolean consistentDefUseChains():660:672 -> p
-    24:36:boolean isConsistentSSA():549 -> p
-    37:37:boolean verifyValue(com.android.tools.r8.ir.code.Value):680:680 -> p
-    37:37:boolean consistentDefUseChains():672 -> p
-    37:37:boolean isConsistentSSA():549 -> p
-    38:38:boolean verifyPhi(com.android.tools.r8.ir.code.Phi):685:685 -> p
-    38:38:boolean verifyValue(com.android.tools.r8.ir.code.Value):680 -> p
-    38:38:boolean consistentDefUseChains():672 -> p
-    38:38:boolean isConsistentSSA():549 -> p
-    39:39:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):690:690 -> p
-    39:39:boolean verifyValue(com.android.tools.r8.ir.code.Value):680 -> p
-    39:39:boolean consistentDefUseChains():672 -> p
-    39:39:boolean isConsistentSSA():549 -> p
+    23:23:boolean consistentDefUseChains():656 -> p
+    23:23:boolean isConsistentSSA():545 -> p
+    24:36:boolean consistentDefUseChains():656:668 -> p
+    24:36:boolean isConsistentSSA():545 -> p
+    37:37:boolean verifyValue(com.android.tools.r8.ir.code.Value):676:676 -> p
+    37:37:boolean consistentDefUseChains():668 -> p
+    37:37:boolean isConsistentSSA():545 -> p
+    38:38:boolean verifyPhi(com.android.tools.r8.ir.code.Phi):681:681 -> p
+    38:38:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    38:38:boolean consistentDefUseChains():668 -> p
+    38:38:boolean isConsistentSSA():545 -> p
+    39:39:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):686:686 -> p
+    39:39:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    39:39:boolean consistentDefUseChains():668 -> p
+    39:39:boolean isConsistentSSA():545 -> p
     40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> p
-    40:40:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):690 -> p
-    40:40:boolean verifyValue(com.android.tools.r8.ir.code.Value):680 -> p
-    40:40:boolean consistentDefUseChains():672 -> p
-    40:40:boolean isConsistentSSA():549 -> p
-    41:43:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):691:693 -> p
-    41:43:boolean verifyValue(com.android.tools.r8.ir.code.Value):680 -> p
-    41:43:boolean consistentDefUseChains():672 -> p
-    41:43:boolean isConsistentSSA():549 -> p
-    44:44:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):691:691 -> p
-    44:44:boolean verifyValue(com.android.tools.r8.ir.code.Value):680 -> p
-    44:44:boolean consistentDefUseChains():672 -> p
-    44:44:boolean isConsistentSSA():549 -> p
-    45:45:boolean consistentDefUseChains():673:673 -> p
-    45:45:boolean isConsistentSSA():549 -> p
-    46:47:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):698:699 -> p
-    46:47:boolean consistentDefUseChains():673 -> p
-    46:47:boolean isConsistentSSA():549 -> p
+    40:40:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):686 -> p
+    40:40:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    40:40:boolean consistentDefUseChains():668 -> p
+    40:40:boolean isConsistentSSA():545 -> p
+    41:43:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):687:689 -> p
+    41:43:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    41:43:boolean consistentDefUseChains():668 -> p
+    41:43:boolean isConsistentSSA():545 -> p
+    44:44:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):687:687 -> p
+    44:44:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    44:44:boolean consistentDefUseChains():668 -> p
+    44:44:boolean isConsistentSSA():545 -> p
+    45:45:boolean consistentDefUseChains():669:669 -> p
+    45:45:boolean isConsistentSSA():545 -> p
+    46:47:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):694:695 -> p
+    46:47:boolean consistentDefUseChains():669 -> p
+    46:47:boolean isConsistentSSA():545 -> p
     48:48:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> p
-    48:48:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):699 -> p
-    48:48:boolean consistentDefUseChains():673 -> p
-    48:48:boolean isConsistentSSA():549 -> p
-    49:57:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):699:707 -> p
-    49:57:boolean consistentDefUseChains():673 -> p
-    49:57:boolean isConsistentSSA():549 -> p
-    58:58:boolean isConsistentSSA():550:550 -> p
-    59:75:boolean validThrowingInstructions():829:845 -> p
-    59:75:boolean isConsistentSSA():550 -> p
-    76:76:boolean isConsistentSSA():551:551 -> p
-    77:88:boolean noCriticalEdges():609:620 -> p
-    77:88:boolean isConsistentSSA():551 -> p
-    89:91:boolean isConsistentSSA():551:553 -> p
-    1:1:java.util.ListIterator listIterator():946:946 -> q
-    1:1:com.android.tools.r8.ir.code.IRMetadata metadata():138:138 -> r
-    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():954:956 -> s
-    1:7:int numberRemainingInstructions():962:968 -> t
-    1:7:java.lang.String toString():446:452 -> toString
-    1:1:void prepareBlocksForCatchHandlers():304:304 -> u
-    2:2:java.util.ListIterator listIterator():946:946 -> u
-    2:2:void prepareBlocksForCatchHandlers():305 -> u
+    48:48:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):695 -> p
+    48:48:boolean consistentDefUseChains():669 -> p
+    48:48:boolean isConsistentSSA():545 -> p
+    49:57:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):695:703 -> p
+    49:57:boolean consistentDefUseChains():669 -> p
+    49:57:boolean isConsistentSSA():545 -> p
+    58:58:boolean isConsistentSSA():546:546 -> p
+    59:75:boolean validThrowingInstructions():825:841 -> p
+    59:75:boolean isConsistentSSA():546 -> p
+    76:76:boolean isConsistentSSA():547:547 -> p
+    77:88:boolean noCriticalEdges():605:616 -> p
+    77:88:boolean isConsistentSSA():547 -> p
+    89:91:boolean isConsistentSSA():547:549 -> p
+    1:1:java.util.ListIterator listIterator():942:942 -> q
+    1:1:com.android.tools.r8.ir.code.IRMetadata metadata():136:136 -> r
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():950:952 -> s
+    1:7:int numberRemainingInstructions():958:964 -> t
+    1:7:java.lang.String toString():442:448 -> toString
+    1:1:void prepareBlocksForCatchHandlers():300:300 -> u
+    2:2:java.util.ListIterator listIterator():942:942 -> u
+    2:2:void prepareBlocksForCatchHandlers():301 -> u
     3:3:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> u
-    3:3:void prepareBlocksForCatchHandlers():306 -> u
-    4:7:void prepareBlocksForCatchHandlers():307:310 -> u
-    8:8:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():56:56 -> u
-    8:8:void prepareBlocksForCatchHandlers():310 -> u
-    9:9:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> u
-    9:9:void prepareBlocksForCatchHandlers():311 -> u
-    10:11:void prepareBlocksForCatchHandlers():312:313 -> u
-    12:12:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> u
-    12:12:void prepareBlocksForCatchHandlers():315 -> u
-    13:23:void prepareBlocksForCatchHandlers():316:326 -> u
-    24:24:java.lang.Object com.android.tools.r8.utils.ListUtils.first(java.util.List):16:16 -> u
-    24:24:void prepareBlocksForCatchHandlers():326 -> u
-    25:27:void prepareBlocksForCatchHandlers():326:328 -> u
-    28:29:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> u
-    28:29:void prepareBlocksForCatchHandlers():328 -> u
-    30:31:void prepareBlocksForCatchHandlers():329:330 -> u
-    32:32:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> u
-    32:32:void prepareBlocksForCatchHandlers():330 -> u
-    33:37:void prepareBlocksForCatchHandlers():331:335 -> u
-    1:1:void removeAllTrivialPhis():1085:1085 -> v
-    1:3:java.util.Set removeUnreachableBlocks():1204:1206 -> w
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1221:1221 -> w
-    4:4:java.util.Set removeUnreachableBlocks():1206 -> w
+    3:3:void prepareBlocksForCatchHandlers():302 -> u
+    4:7:void prepareBlocksForCatchHandlers():303:306 -> u
+    8:8:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():57:57 -> u
+    8:8:void prepareBlocksForCatchHandlers():306 -> u
+    9:9:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> u
+    9:9:void prepareBlocksForCatchHandlers():307 -> u
+    10:11:void prepareBlocksForCatchHandlers():308:309 -> u
+    12:12:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> u
+    12:12:void prepareBlocksForCatchHandlers():311 -> u
+    13:25:void prepareBlocksForCatchHandlers():312:324 -> u
+    26:27:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> u
+    26:27:void prepareBlocksForCatchHandlers():324 -> u
+    28:29:void prepareBlocksForCatchHandlers():325:326 -> u
+    30:30:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> u
+    30:30:void prepareBlocksForCatchHandlers():326 -> u
+    31:35:void prepareBlocksForCatchHandlers():327:331 -> u
+    1:1:void removeAllTrivialPhis():1081:1081 -> v
+    1:3:java.util.Set removeUnreachableBlocks():1200:1202 -> w
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1217:1217 -> w
+    4:4:java.util.Set removeUnreachableBlocks():1202 -> w
     5:5:void com.android.tools.r8.ir.code.BasicBlockIterator.<init>(com.android.tools.r8.ir.code.IRCode):17:17 -> w
-    5:5:java.util.ListIterator listIterator():946 -> w
-    5:5:java.util.Set removeUnreachableBlocks():1207 -> w
+    5:5:java.util.ListIterator listIterator():942 -> w
+    5:5:java.util.Set removeUnreachableBlocks():1203 -> w
     6:6:boolean com.android.tools.r8.ir.code.BasicBlockIterator.hasNext():27:27 -> w
-    6:6:java.util.Set removeUnreachableBlocks():1208 -> w
+    6:6:java.util.Set removeUnreachableBlocks():1204 -> w
     7:7:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.next():32:32 -> w
     7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():9 -> w
-    7:7:java.util.Set removeUnreachableBlocks():1209 -> w
-    8:9:java.util.Set removeUnreachableBlocks():1210:1211 -> w
+    7:7:java.util.Set removeUnreachableBlocks():1205 -> w
+    8:9:java.util.Set removeUnreachableBlocks():1206:1207 -> w
     10:11:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():81:82 -> w
-    10:11:java.util.Set removeUnreachableBlocks():1212 -> w
-    12:12:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():56:56 -> w
+    10:11:java.util.Set removeUnreachableBlocks():1208 -> w
+    12:12:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():57:57 -> w
     12:12:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():82 -> w
-    12:12:java.util.Set removeUnreachableBlocks():1212 -> w
-    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> w
+    12:12:java.util.Set removeUnreachableBlocks():1208 -> w
+    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> w
     13:13:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():83 -> w
-    13:13:java.util.Set removeUnreachableBlocks():1212 -> w
+    13:13:java.util.Set removeUnreachableBlocks():1208 -> w
     14:17:void com.android.tools.r8.ir.code.BasicBlockIterator.remove():84:87 -> w
-    14:17:java.util.Set removeUnreachableBlocks():1212 -> w
-    18:19:java.util.Set removeUnreachableBlocks():1215:1216 -> w
-    1:1:int reserveMarkingColor():1106:1106 -> x
-    2:2:boolean anyMarkingColorAvailable():1120:1120 -> x
-    2:2:int reserveMarkingColor():1106 -> x
-    3:11:int reserveMarkingColor():1106:1114 -> x
-    12:13:boolean verifyNoBlocksMarked(int):472:473 -> x
-    12:13:int reserveMarkingColor():1114 -> x
-    1:24:void splitCriticalEdges():339:362 -> y
-    25:34:void splitCriticalEdges():361:370 -> y
-    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList depthFirstSorting():497:520 -> z
-    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():490 -> z
-    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():491:491 -> z
-    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):526:537 -> z
-    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():492 -> z
+    14:17:java.util.Set removeUnreachableBlocks():1208 -> w
+    18:19:java.util.Set removeUnreachableBlocks():1211:1212 -> w
+    1:1:int reserveMarkingColor():1102:1102 -> x
+    2:2:boolean anyMarkingColorAvailable():1116:1116 -> x
+    2:2:int reserveMarkingColor():1102 -> x
+    3:11:int reserveMarkingColor():1102:1110 -> x
+    12:13:boolean verifyNoBlocksMarked(int):468:469 -> x
+    12:13:int reserveMarkingColor():1110 -> x
+    1:24:void splitCriticalEdges():335:358 -> y
+    25:34:void splitCriticalEdges():357:366 -> y
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList depthFirstSorting():493:516 -> z
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():486 -> z
+    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():487:487 -> z
+    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):522:533 -> z
+    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():488 -> z
 com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.D.b.h0:
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):91:92 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):89:90 -> <init>
 com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.D.b.i0:
     java.util.Deque liveStackValues -> c
     java.util.Set liveValues -> a
     java.util.Set liveLocalValues -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():54:54 -> <clinit>
-    1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):64:68 -> <init>
-    1:2:boolean equals(java.lang.Object):78:79 -> equals
-    1:1:int hashCode():73:73 -> hashCode
+    1:1:void <clinit>():52:52 -> <clinit>
+    1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):62:66 -> <init>
+    1:2:boolean equals(java.lang.Object):76:77 -> equals
+    1:1:int hashCode():71:71 -> hashCode
 com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.D.b.k0:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
@@ -24935,17 +24921,17 @@
     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>
     com.android.tools.r8.ir.code.If asIf() -> C
-    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> D2
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> E2
-    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> F2
-    1:2:void invert():110:111 -> G2
-    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> G2
-    3:4:void invert():112 -> G2
-    5:5:void invert():113:113 -> G2
-    1:1:boolean isZeroTest():93:93 -> H2
-    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> I2
-    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> J2
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> K2
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> C2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> D2
+    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> E2
+    1:2:void invert():110:111 -> F2
+    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> F2
+    3:4:void invert():112 -> F2
+    5:5:void invert():113:113 -> F2
+    1:1:boolean isZeroTest():93:93 -> G2
+    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> H2
+    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> I2
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> J2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,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
@@ -24976,10 +24962,10 @@
     31:31: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
-    1:1:int maxInValueRegister():174:174 -> x2
+    1:1:int maxInValueRegister():174:174 -> w2
+    1:1:int maxOutValueRegister():179:179 -> x2
     boolean isIf() -> y1
-    1:1:int maxOutValueRegister():179:179 -> y2
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.D.b.n0:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
@@ -25014,18 +25000,18 @@
     5:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:96 -> a
     1:2:void addInValue(com.android.tools.r8.ir.code.Value):43:44 -> b
     1:1:java.lang.String toString():102:102 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.D.b.r0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():207:207 -> B0
-    boolean throwsOnNullInput() -> C2
+    boolean throwsOnNullInput() -> B2
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> F2
-    1:2:com.android.tools.r8.ir.code.Value object():60:61 -> G2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> E2
+    1:2:com.android.tools.r8.ir.code.Value object():60:61 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:boolean outTypeKnownToBeBoolean(java.util.Set):47:47 -> a
     2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52:52 -> a
@@ -25056,17 +25042,17 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):119:119 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():169:169 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
     boolean isInstanceGet() -> z1
-    int opcode() -> z2
 com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.D.b.s0:
     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>
     boolean isInstanceOf() -> A1
-    1:1:com.android.tools.r8.graph.DexType type():39:39 -> D2
+    1:1:com.android.tools.r8.graph.DexType type():39:39 -> C2
+    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> D2
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> E
-    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> E2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -25080,19 +25066,19 @@
     8:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:106 -> a
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.D.b.t0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():220:220 -> B0
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():219:219 -> B0
     boolean isInstancePut() -> B1
-    boolean throwsOnNullInput() -> C2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> E2
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> F
-    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> F2
-    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> G2
+    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
     2:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:92 -> a
@@ -25102,26 +25088,26 @@
     53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
     54:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
     55:72:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:94 -> a
-    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:130 -> a
-    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):137:147 -> a
+    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):128:129 -> a
+    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):136:146 -> a
     86:86:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):141 -> a
-    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):157:161 -> 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):178:178 -> a
-    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):198:198 -> a
-    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):203:205 -> a
-    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):203:203 -> a
-    98:98:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):210:210 -> a
-    99:99: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):230:230 -> a
-    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104:114 -> b
+    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):140 -> a
+    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):156:160 -> 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):177:177 -> a
+    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):197:197 -> a
+    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):202:204 -> a
+    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):202:202 -> a
+    98:98:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):209:209 -> a
+    99:99: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):229:229 -> a
+    1:10:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104:113 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:java.lang.String toString():193:193 -> toString
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():171:171 -> y2
-    int opcode() -> z2
+    1:1:java.lang.String toString():192:192 -> toString
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():170:170 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.D.b.u0:
     java.util.List inValues -> b
-    java.util.LinkedHashSet debugValues -> e
+    java.util.Set debugValues -> e
     boolean $assertionsDisabled -> g
     int number -> d
     com.android.tools.r8.ir.code.Value outValue -> a
@@ -25137,15 +25123,14 @@
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():595:595 -> A0
     boolean isInstanceOf() -> A1
-    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> A2
+    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> A2
     com.android.tools.r8.ir.code.Goto asGoto() -> B
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1365:1365 -> B0
     boolean isInstancePut() -> B1
-    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> B2
+    boolean throwsOnNullInput() -> B2
     com.android.tools.r8.ir.code.If asIf() -> C
     1:1:int getNumber():342:342 -> C0
     boolean isIntSwitch() -> C1
-    boolean throwsOnNullInput() -> C2
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
     boolean isIntroducingAnAlias() -> D1
@@ -25168,55 +25153,55 @@
     boolean isInvokeMethod() -> I1
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
     1:1:boolean hasOutValue():116:116 -> J0
-    1:1:boolean isInvokeMethodWithDynamicDispatch():1124:1124 -> J1
+    boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
     1:1:boolean hasPosition():75:75 -> K0
-    boolean isInvokeMethodWithReceiver() -> K1
+    boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
     1:1:java.util.List inValues():93:93 -> L0
-    boolean isInvokeMultiNewArray() -> L1
+    boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
     1:1:boolean instructionInstanceCanThrow():524:524 -> M0
-    boolean isInvokeNewArray() -> M1
+    boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     boolean instructionTypeCanThrow() -> N0
-    boolean isInvokePolymorphic() -> N1
+    boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     boolean isAdd() -> O0
-    boolean isInvokeStatic() -> O1
+    boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
     boolean isAllowedAfterThrowingInstruction() -> P0
-    boolean isInvokeSuper() -> P1
+    boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
     boolean isAnd() -> Q0
-    boolean isInvokeVirtual() -> Q1
+    boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
     boolean isArgument() -> R0
-    boolean isJumpInstruction() -> R1
+    boolean isLoad() -> R1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
     boolean isArithmeticBinop() -> S0
-    boolean isLoad() -> S1
+    boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
     boolean isArrayGet() -> T0
-    boolean isLogicalBinop() -> T1
+    boolean isMonitor() -> T1
     com.android.tools.r8.ir.code.Load asLoad() -> U
     boolean isArrayLength() -> U0
-    boolean isMonitor() -> U1
+    boolean isMonitorEnter() -> U1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     boolean isArrayPut() -> V0
-    boolean isMonitorEnter() -> V1
+    boolean isMove() -> V1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     boolean isAssume() -> W0
-    boolean isMove() -> W1
+    boolean isMoveException() -> W1
     com.android.tools.r8.ir.code.Move asMove() -> X
     boolean isAssumeDynamicType() -> X0
-    boolean isMoveException() -> X1
+    boolean isMul() -> X1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     boolean isAssumeNonNull() -> Y0
-    boolean isMul() -> Y1
+    boolean isNeg() -> Y1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     boolean isBinop() -> Z0
-    boolean isNeg() -> Z1
+    boolean isNewArrayEmpty() -> 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
@@ -25238,10 +25223,10 @@
     33:33:java.lang.String com.android.tools.r8.utils.CfgPrinter.makeUnusedValue():20:20 -> a
     33:33:void print(com.android.tools.r8.utils.CfgPrinter):318 -> a
     34:37:void print(com.android.tools.r8.utils.CfgPrinter):320:323 -> a
-    38:38:int com.android.tools.r8.ir.code.Value.getNumber():292:292 -> a
+    38:38:int com.android.tools.r8.ir.code.Value.getNumber():291:291 -> a
     38:38:void print(com.android.tools.r8.utils.CfgPrinter):323 -> a
     39:47:void print(com.android.tools.r8.utils.CfgPrinter):323:331 -> a
-    48:48:int com.android.tools.r8.ir.code.Value.getNumber():292:292 -> a
+    48:48:int com.android.tools.r8.ir.code.Value.getNumber():291:291 -> a
     48:48:void print(com.android.tools.r8.utils.CfgPrinter):331 -> a
     49:49:void print(com.android.tools.r8.utils.CfgPrinter):331:331 -> a
     50:51:void setNumber(int):346:347 -> a
@@ -25249,37 +25234,41 @@
     62:63:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction):356:357 -> a
     62:63:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
     64:64:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):460:460 -> a
-    65:68:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):103:106 -> a
+    65:68:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):105:108 -> a
     65:68:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):460 -> a
     69:70:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):463:464 -> a
     71:71:int getNumber():342:342 -> a
     71:71:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):468 -> a
-    72:104: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):412:444 -> a
-    72:104:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> a
-    105:114:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):471:480 -> a
-    115:115:int getNumber():342:342 -> a
-    115:115:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
-    116:151: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):367:402 -> a
-    116:151:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
-    152:168: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):391:407 -> a
-    152:168:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
-    169:170:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):487:488 -> a
-    171:171:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495:495 -> a
-    172:172:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():797:797 -> a
-    172:172:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
-    173:173:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():797:797 -> a
-    173:173:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
-    174:180:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):499:505 -> a
-    181:181:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
-    182:182:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):546:546 -> a
-    183:184:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1301:1302 -> a
-    185:188:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1308:1311 -> a
-    189:191:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1316:1318 -> a
-    192:198:boolean verifyValidPositionInfo(boolean):1385:1391 -> a
-    199:199:boolean verifyValidPositionInfo(boolean):1387:1387 -> a
+    72:72:int getNumber():342:342 -> a
+    72:72:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):468 -> a
+    73:105: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):412:444 -> a
+    73:105:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):467 -> a
+    106:115:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):471:480 -> a
+    116:116:int getNumber():342:342 -> a
+    116:116:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
+    117:117:int getNumber():342:342 -> a
+    117:117:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
+    118:153: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):367:402 -> a
+    118:153:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
+    154:170: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):391:407 -> a
+    154:170:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
+    171:172:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):487:488 -> a
+    173:173:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495:495 -> a
+    174:174:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
+    174:174:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
+    175:175:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
+    175:175:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
+    176:182:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):499:505 -> a
+    183:183:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
+    184:184:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):546:546 -> a
+    185:186:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):1301:1302 -> a
+    187:190:com.android.tools.r8.ir.analysis.constant.LatticeElement evaluate(com.android.tools.r8.ir.code.IRCode,java.util.function.Function):1308:1311 -> a
+    191:193:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):1316:1318 -> a
+    194:200:boolean verifyValidPositionInfo(boolean):1385:1391 -> a
+    201:201:boolean verifyValidPositionInfo(boolean):1387:1387 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
     boolean isCheckCast() -> a1
-    boolean isNewArrayEmpty() -> a2
+    boolean isNewArrayFilledData() -> a2
     com.android.tools.r8.ir.code.Add asAdd() -> b
     1:4:void addInValue(com.android.tools.r8.ir.code.Value):98:101 -> b
     5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):171:174 -> b
@@ -25289,111 +25278,111 @@
     18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1323:1334 -> b
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
     boolean isCmp() -> b1
-    boolean isNewArrayFilledData() -> b2
+    boolean isNewInstance() -> b2
     com.android.tools.r8.ir.code.And asAnd() -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
     1:7:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):152:158 -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
     boolean isConstClass() -> c1
-    boolean isNewInstance() -> c2
+    boolean isNot() -> c2
     com.android.tools.r8.ir.code.Argument asArgument() -> d
     1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):218:226 -> d
     10:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):554:558 -> d
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
     boolean isConstInstruction() -> d1
-    boolean isNot() -> d2
+    boolean isNumberConversion() -> d2
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> e
     1:4:void setOutValue(com.android.tools.r8.ir.code.Value):124:127 -> e
     com.android.tools.r8.ir.code.Not asNot() -> e0
     boolean isConstMethodHandle() -> e1
-    boolean isNumberConversion() -> e2
+    boolean isOr() -> e2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
     1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):132:136 -> f
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
     boolean isConstMethodType() -> f1
-    boolean isOr() -> f2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
     com.android.tools.r8.ir.code.Or asOr() -> g0
     boolean isConstNumber() -> g1
-    boolean isOutConstant() -> g2
+    boolean isPop() -> g2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
     com.android.tools.r8.ir.code.Rem asRem() -> h0
     boolean isConstString() -> h1
-    boolean isPop() -> h2
+    boolean isRem() -> h2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
     com.android.tools.r8.ir.code.Return asReturn() -> i0
     1:4:boolean isCreatingArray():1280:1283 -> i1
-    boolean isRem() -> i2
+    boolean isReturn() -> i2
     com.android.tools.r8.ir.code.Assume asAssumeDynamicType() -> j
     com.android.tools.r8.ir.code.Shl asShl() -> j0
     1:1:boolean isCreatingInstanceOrArray():1287:1287 -> j1
-    boolean isReturn() -> j2
+    boolean isShl() -> j2
     com.android.tools.r8.ir.code.Assume asAssumeNonNull() -> k
     com.android.tools.r8.ir.code.Shr asShr() -> k0
     1:5:boolean isDebugInstruction():1084:1088 -> k1
-    boolean isShl() -> k2
+    boolean isShr() -> k2
     com.android.tools.r8.ir.code.Binop asBinop() -> l
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
     boolean isDebugLocalRead() -> l1
-    boolean isShr() -> l2
+    boolean isStaticGet() -> l2
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
     boolean isDebugLocalUninitialized() -> m1
-    boolean isStaticGet() -> m2
+    boolean isStaticPut() -> m2
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     com.android.tools.r8.ir.code.Store asStore() -> n0
     boolean isDebugLocalWrite() -> n1
-    boolean isStaticPut() -> n2
+    boolean isStore() -> n2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
     boolean isDebugLocalsChange() -> o1
-    boolean isStore() -> o2
+    boolean isStringSwitch() -> o2
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> p
     com.android.tools.r8.ir.code.Sub asSub() -> p0
     boolean isDebugPosition() -> p1
-    boolean isStringSwitch() -> p2
+    boolean isSub() -> p2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
     boolean isDexItemBasedConstString() -> q1
-    boolean isSub() -> q2
+    boolean isSwap() -> q2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
     boolean isDiv() -> r1
-    boolean isSwap() -> r2
+    boolean isSwitch() -> r2
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
     boolean isDup() -> s1
-    boolean isSwitch() -> s2
+    boolean isThrow() -> s2
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     com.android.tools.r8.ir.code.Xor asXor() -> t0
     boolean isDup2() -> t1
-    boolean isThrow() -> t2
+    boolean isUnop() -> t2
     1:14:java.lang.String toString():298:311 -> toString
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
     1:2:void clearBlock():273:274 -> u0
     1:1:boolean isFieldGet():856:856 -> u1
-    boolean isUnop() -> u2
+    boolean isUshr() -> u2
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
     1:5:void clearDebugValues():245:249 -> v0
     boolean isFieldInstruction() -> v1
-    boolean isUshr() -> v2
+    boolean isXor() -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
     1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1275:1275 -> w0
     1:1:boolean isFieldPut():860:860 -> w1
-    boolean isXor() -> w2
+    int maxInValueRegister() -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
     1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():257:258 -> x0
     boolean isGoto() -> x1
-    int maxInValueRegister() -> x2
+    int maxOutValueRegister() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
     1:1:java.util.Set getDebugValues():599:599 -> y0
     boolean isIf() -> y1
-    int maxOutValueRegister() -> y2
+    int opcode() -> y2
     com.android.tools.r8.ir.code.Dup asDup() -> z
     1:1:java.lang.String getInstructionName():293:293 -> z0
     boolean isInstanceGet() -> z1
-    int opcode() -> z2
+    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> z2
 com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.D.b.v0:
     1:3:java.lang.Object com.android.tools.r8.ir.code.NextUntilIterator.nextUntil(java.util.function.Predicate):18:20 -> a
     1:3:java.lang.Object com.android.tools.r8.ir.code.NextUntilIterator.nextUntil(java.util.function.Predicate):0 -> a
@@ -25414,13 +25403,13 @@
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):32:34 -> <init>
     boolean isIntSwitch() -> C1
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> G
-    1:7:boolean valid():55:61 -> H2
-    1:1:int getFirstKey():177:177 -> J2
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> K2
-    3:3:int getKey(int):206:206 -> K2
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> K2
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> K2
-    1:1:int[] getKeys():210:210 -> L2
+    1:7:boolean valid():55:61 -> G2
+    1:1:int getFirstKey():177:177 -> I2
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> J2
+    3:3:int getKey(int):206:206 -> J2
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> J2
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> J2
+    1:1:int[] getKeys():210:210 -> K2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> a
     1:1:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):48:48 -> a
@@ -25470,34 +25459,34 @@
     5:5:int getKey(int):206:206 -> toString
     5:5:java.lang.String toString():268 -> toString
     6:11:java.lang.String toString():268:273 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.D.b.A0:
     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.util.List arguments():103:103 -> D2
+    1:1:java.util.List arguments():103:103 -> C2
+    com.android.tools.r8.graph.DexType getReturnType() -> D2
     boolean isInvoke() -> E1
-    com.android.tools.r8.graph.DexType getReturnType() -> E2
-    com.android.tools.r8.ir.code.Invoke$Type getType() -> F2
-    java.lang.String getTypeString() -> G2
+    com.android.tools.r8.ir.code.Invoke$Type getType() -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:int requiredArgumentRegisters():108:108 -> G2
+    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> G2
+    2:2:int requiredArgumentRegisters():109 -> G2
     com.android.tools.r8.ir.code.Invoke asInvoke() -> H
-    1:1:int requiredArgumentRegisters():108:108 -> H2
-    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> H2
-    2:2:int requiredArgumentRegisters():109 -> H2
-    1:1:java.util.List arguments():103:103 -> I2
-    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> I2
-    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> I2
-    3:3:java.util.List arguments():103:103 -> I2
-    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> I2
-    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> I2
-    6:6:java.util.List arguments():103:103 -> I2
-    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> I2
-    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> I2
-    8:8:java.util.List arguments():103:103 -> I2
-    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> I2
-    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> I2
+    1:1:java.util.List arguments():103:103 -> H2
+    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> H2
+    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> H2
+    3:3:java.util.List arguments():103:103 -> H2
+    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> H2
+    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> H2
+    6:6:java.util.List arguments():103:103 -> H2
+    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> H2
+    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> H2
+    8:8:java.util.List arguments():103:103 -> H2
+    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> H2
+    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> H2
     boolean instructionTypeCanThrow() -> N0
     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
@@ -25519,13 +25508,13 @@
     44:44:java.util.List arguments():103:103 -> a
     44:44:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):130 -> a
     45:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):130:139 -> a
-    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> a
+    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):140 -> a
     56:58:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):141:143 -> a
-    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> a
+    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     59:59:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):143 -> a
     60:60:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):143:143 -> a
-    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> a
+    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     61:61:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):144 -> a
     62:63:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):145:146 -> a
     64:77:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):165:178 -> a
@@ -25543,7 +25532,7 @@
     1:1:java.util.List arguments():103:103 -> b
     1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):153 -> b
     2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):153:154 -> b
-    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> b
+    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> b
     4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):154 -> b
     5:5:java.util.List arguments():103:103 -> b
     5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):155 -> b
@@ -25551,7 +25540,7 @@
     7:7:java.util.List arguments():103:103 -> b
     7:7:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):156 -> b
     8:9:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):156:157 -> b
-    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> b
+    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> b
     10:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):158 -> b
     1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):240:240 -> c
     2:2:java.util.List arguments():103:103 -> c
@@ -25560,10 +25549,10 @@
     11:11:java.util.List arguments():103:103 -> c
     11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255 -> c
     12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255:256 -> c
-    1:1:java.util.List arguments():103:103 -> x2
-    1:1:int maxInValueRegister():213 -> x2
-    2:4:int maxInValueRegister():213:215 -> x2
-    int maxOutValueRegister() -> y2
+    1:1:java.util.List arguments():103:103 -> w2
+    1:1:int maxInValueRegister():213 -> w2
+    2:4:int maxInValueRegister():213:215 -> w2
+    int maxOutValueRegister() -> x2
     1:1:java.lang.String getInstructionName():269:269 -> z0
 com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.D.b.z0:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
@@ -25581,21 +25570,23 @@
     1:1:void <init>(java.lang.String,int):26:26 -> <init>
     1:1:com.android.tools.r8.ir.code.Invoke$Type[] values():26:26 -> a
     2:18:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):38:54 -> a
-    19:29:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):42:52 -> a
-    30:40:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):40:50 -> a
-    41:44:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):44:47 -> a
+    19:19:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):52:52 -> a
+    20:20:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):50:50 -> a
+    21:24:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):44:47 -> a
+    25:25:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):42:42 -> a
+    26:26:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):40:40 -> a
 com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.D.b.B0:
     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>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> E2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> E2
     boolean isInvokeCustom() -> F1
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> F2
-    java.lang.String getTypeString() -> G2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> H2
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> I
     boolean hasInvariantOutType() -> I0
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> I2
     1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):66:94 -> a
     30:42:boolean verifyLambdaInterfaces(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,java.util.Set,com.android.tools.r8.graph.DexType):47:59 -> a
     30:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):94 -> a
@@ -25633,104 +25624,99 @@
     2:2:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     2:2:java.lang.String toString():120 -> toString
     3:3:java.lang.String toString():120:120 -> toString
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.D.b.C0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:45 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():65:65 -> F2
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):44:47 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeDirect() -> G1
-    java.lang.String getTypeString() -> G2
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
-    1:1:boolean isInterface():55:55 -> K2
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:94 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):111:111 -> 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):150:150 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):155:155 -> 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):165:165 -> a
+    1:1:boolean isInterface():57:57 -> J2
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:96 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):113:113 -> 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):159:159 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):164:164 -> 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):174:174 -> a
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeDirect):184:184 -> a
-    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):60 -> a
-    25:61:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):234:270 -> a
-    62:62:boolean com.android.tools.r8.ir.code.Value.isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):987:987 -> a
-    62:62:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):270 -> a
-    63:63:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):275:275 -> a
-    64:64:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    64:64:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):275 -> a
-    65:65:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):275:275 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    66:66:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):275 -> a
-    67:67:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):269:269 -> a
-    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):171:181 -> b
+    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):62 -> a
+    25:66:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):236:277 -> a
+    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    67:67:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):277 -> a
+    68:68:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):277:277 -> a
+    69:69:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    69:69:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):277 -> a
+    70:70:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):271:271 -> a
+    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):180:190 -> b
     12:12:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> b
-    12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):181 -> b
-    13:52:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):187:226 -> b
-    1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):285:298 -> d
-    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):126:141 -> e
-    int opcode() -> z2
+    12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):190 -> b
+    13:42:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):196:225 -> b
+    1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):287:300 -> d
+    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128:143 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):152:153 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.D.b.D0:
     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>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():41:41 -> F2
-    java.lang.String getTypeString() -> G2
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeInterface() -> H1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:70 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> 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):105:105 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):110:110 -> 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):120:120 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> 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):124:124 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):129:129 -> 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):139:139 -> a
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeInterface):189:189 -> a
-    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36 -> a
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):90:97 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:93 -> e
-    int opcode() -> z2
+    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39 -> a
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> e
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:96 -> e
+    1:10:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):109:118 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.D.b.E0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):33:34 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():39:39 -> E2
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:30 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():35:35 -> D2
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():39:39 -> H2
     boolean hasInvariantOutType() -> I0
     boolean isInvokeMethod() -> I1
-    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():43:43 -> I2
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,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
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):48:48 -> a
-    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():43:43 -> a
-    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):48 -> a
-    3:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):128:133 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44:44 -> a
+    2:2:com.android.tools.r8.graph.DexMethod getInvokedMethod():39:39 -> a
+    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44 -> a
+    3:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):79:84 -> a
     9:9:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):138 -> a
-    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):138:138 -> a
+    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89 -> a
+    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89:89 -> a
     11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):139 -> a
-    12:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):139:140 -> a
+    11:11:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90 -> a
+    12:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90:91 -> a
     14:14:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):140 -> a
-    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):140:140 -> a
+    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):91 -> a
+    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):91:91 -> a
     16:16:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):132 -> a
-    17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):151:159 -> a
-    26:26:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):170:170 -> a
+    16:16:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):83 -> a
+    17:25:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):102:110 -> a
+    26:26:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):121:121 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):180:180 -> d
+    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
-    1:21:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):76:96 -> f
-    22:22:com.android.tools.r8.graph.DexMethod getInvokedMethod():43:43 -> f
-    22:22:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101 -> f
-    23:26:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101:104 -> f
-    27:35:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):103:111 -> f
-    1:1:java.lang.String toString():53:53 -> toString
+    java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
+    1:1:java.lang.String toString():49:49 -> toString
 com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.D.b.F0:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):25:25 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():66:66 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:2:com.android.tools.r8.ir.code.Value getReceiver():39:40 -> J2
-    boolean isInvokeMethodWithReceiver() -> K1
+    boolean throwsOnNullInput() -> B2
+    1:2:com.android.tools.r8.ir.code.Value getReceiver():39:40 -> I2
+    boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
     1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,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):50:50 -> a
     2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):56:56 -> a
@@ -25741,16 +25727,16 @@
     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>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> E2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> E2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> F2
-    java.lang.String getTypeString() -> G2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> D2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> H2
     boolean hasInvariantOutType() -> I0
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> I2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> J2
-    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> J2
-    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> J2
-    boolean isInvokeMultiNewArray() -> L1
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> I2
+    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> I2
+    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> I2
+    boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> a
     2:2: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
@@ -25776,20 +25762,20 @@
     2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):176 -> b
     3:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):176:181 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.D.b.H0:
     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>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> E2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> E2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> F2
-    java.lang.String getTypeString() -> G2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> D2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> H2
     boolean hasInvariantOutType() -> I0
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> I2
-    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> J2
-    boolean isInvokeNewArray() -> M1
+    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> I2
+    boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:89 -> a
     20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> a
@@ -25813,17 +25799,17 @@
     3:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:194 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():65:65 -> toString
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.D.b.I0:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
     1:1:void <clinit>():28:28 -> <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):33:34 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():49:49 -> E2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():54:54 -> F2
-    java.lang.String getTypeString() -> G2
-    1:1:com.android.tools.r8.graph.DexProto getProto():63:63 -> J2
-    boolean isInvokePolymorphic() -> N1
+    1:1:com.android.tools.r8.graph.DexType getReturnType():49:49 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():54:54 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexProto getProto():63:63 -> I2
+    boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
     1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:75 -> a
     8:8:com.android.tools.r8.graph.DexProto getProto():63:63 -> a
@@ -25844,80 +25830,83 @@
     42:42:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.D.b.J0:
     boolean itf -> k
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):35:36 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):40:41 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> F2
-    java.lang.String getTypeString() -> G2
-    boolean isInvokeStatic() -> O1
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:39 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):43:44 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():59:59 -> E2
+    java.lang.String getTypeString() -> F2
+    boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:85 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):90:90 -> 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):129:129 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,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
-    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):145:145 -> a
-    24:24: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
-    25:25:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):202:202 -> a
-    26:26:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
-    26:26:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):51 -> a
-    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):213:213 -> a
-    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):161:198 -> b
-    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):105:120 -> e
-    int opcode() -> z2
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:88 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):93:93 -> 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):139:139 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,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):149:149 -> a
+    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):155:155 -> a
+    24:24: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):165:165 -> a
+    25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):54 -> a
+    26:26:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):212:212 -> a
+    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):223:223 -> a
+    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):171:208 -> b
+    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):108:123 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):132:133 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.D.b.K0:
     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>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():43:43 -> F2
-    java.lang.String getTypeString() -> G2
-    boolean isInvokeSuper() -> P1
+    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>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> E2
+    java.lang.String getTypeString() -> F2
+    boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
-    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:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):110:110 -> 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):120:120 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
+    20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
+    21:21:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):121:121 -> 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):131:131 -> a
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeSuper):214:214 -> a
-    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38 -> a
-    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:101 -> e
-    int opcode() -> z2
+    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):100:104 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):114:115 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.D.b.L0:
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> F2
-    java.lang.String getTypeString() -> G2
-    boolean isInvokeVirtual() -> Q1
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> E2
+    java.lang.String getTypeString() -> F2
+    boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> 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:108 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):113:113 -> 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):123:123 -> a
-    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):180:180 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> 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):127:127 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):132:132 -> 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):142:142 -> a
+    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):199:199 -> a
     25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):219:219 -> a
-    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39 -> a
-    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):129:139 -> b
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42 -> a
+    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):148:158 -> b
     12:12:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> b
-    12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):139 -> b
-    13:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):145:169 -> b
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:96 -> e
-    int opcode() -> z2
+    12:12:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):158 -> b
+    13:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):164:188 -> b
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:103 -> e
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):99:99 -> e
+    1:10:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):112:121 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.D.b.M0:
     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() -> D2
+    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> C2
     boolean hasInvariantOutType() -> I0
-    boolean isJumpInstruction() -> R1
+    boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
@@ -25955,9 +25944,9 @@
     2:2:void set(java.lang.Object):14 -> set
 com.android.tools.r8.ir.code.Load -> com.android.tools.r8.D.b.O0:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> C2
     boolean hasInvariantOutType() -> I0
-    boolean isLoad() -> S1
+    boolean isLoad() -> R1
     com.android.tools.r8.ir.code.Load asLoad() -> U
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -25969,15 +25958,15 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():207:207 -> 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):67 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():61:61 -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():61:61 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.D.b.P0:
     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() -> I2
-    boolean isLogicalBinop() -> T1
+    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> H2
+    boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     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
@@ -26024,14 +26013,14 @@
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type,com.android.tools.r8.ir.code.Value):31:32 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():156:156 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:1:boolean isEnter():50:50 -> D2
-    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> E2
+    boolean throwsOnNullInput() -> B2
+    1:1:boolean isEnter():50:50 -> C2
+    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isMonitor() -> U1
-    1:1:boolean isEnter():50:50 -> V1
-    1:1:boolean isMonitorEnter():103 -> V1
+    boolean isMonitor() -> T1
+    1:1:boolean isEnter():50:50 -> U1
+    1:1:boolean isMonitorEnter():103 -> U1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:71 -> a
@@ -26042,10 +26031,10 @@
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> 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):114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():87:87 -> y2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():87:87 -> x2
+    int opcode() -> y2
     1:7:java.lang.String getInstructionName():119:125 -> z0
-    int opcode() -> z2
 com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.D.b.R0:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> c
@@ -26057,11 +26046,11 @@
     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>
+    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> C2
     1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():86:87 -> D0
-    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> D2
-    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> E2
+    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> D2
     boolean hasInvariantOutType() -> I0
-    boolean isMove() -> W1
+    boolean isMove() -> V1
     com.android.tools.r8.ir.code.Move asMove() -> X
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):46:46 -> a
@@ -26072,28 +26061,24 @@
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:118 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():215:215 -> 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):103 -> a
-    1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):128:129 -> b
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    3:3:boolean verifyTypes(com.android.tools.r8.graph.AppView):129 -> b
-    4:4:boolean verifyTypes(com.android.tools.r8.graph.AppView):129:129 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:boolean isOutConstant():81:81 -> g2
+    1:1:boolean isOutConstant():81:81 -> f2
     1:1:java.lang.String toString():76:76 -> toString
     2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
     2:2:java.lang.String toString():76 -> toString
     3:3:java.lang.String toString():76:76 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.D.b.U0:
     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:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> D2
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> C2
     boolean hasInvariantOutType() -> I0
-    boolean isMoveException() -> X1
+    boolean isMoveException() -> W1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
@@ -26101,7 +26086,7 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
     2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:46 -> a
     4:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:65 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1398:1398 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1393:1393 -> a
     8:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):65 -> a
     9:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> a
     10:11:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):83:84 -> a
@@ -26113,14 +26098,14 @@
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():219:219 -> 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):90 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():51:51 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():51:51 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.D.b.V0:
     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>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> I2
-    boolean isMul() -> Y1
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> H2
+    boolean isMul() -> X1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -26138,13 +26123,13 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.D.b.W0:
     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>
-    boolean isNeg() -> Z1
+    boolean isNeg() -> Y1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     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
@@ -26157,16 +26142,17 @@
     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
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.D.b.X0:
     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>
-    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> D2
+    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> C2
     boolean hasInvariantOutType() -> I0
     1:4:boolean instructionInstanceCanThrow():77:80 -> M0
     boolean instructionTypeCanThrow() -> N0
+    boolean isNewArrayEmpty() -> Z1
     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
@@ -26181,16 +26167,15 @@
     19:19:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):138:138 -> a
     20:20:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     20:20:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):138 -> a
-    boolean isNewArrayEmpty() -> a2
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():41:41 -> toString
     2:2:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> toString
     2:2:java.lang.String toString():41 -> toString
     3:3:java.lang.String toString():41:41 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.D.b.Y0:
     long size -> i
     short[] data -> j
@@ -26198,7 +26183,7 @@
     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>
-    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -26213,57 +26198,57 @@
     22:22:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):153:153 -> a
     23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayFilledData():227:227 -> a
     23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):105 -> a
+    boolean isNewArrayFilledData() -> a2
     1:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):134:141 -> b
-    boolean isNewArrayFilledData() -> b2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():83:83 -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():83:83 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.D.b.Z0:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType clazz -> h
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):34:34 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):31:36 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():50:50 -> D2
-    1:1:boolean isSpillingAllowed():199:199 -> E2
-    1:1:void markNoSpilling():195:195 -> F2
+    1:1:void <clinit>():25:25 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):31:31 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):28:33 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value dest():47:47 -> C2
+    1:1:boolean isSpillingAllowed():184:184 -> D2
+    1:1:void markNoSpilling():180:180 -> E2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46:46 -> a
-    2:2:com.android.tools.r8.ir.code.Value dest():50:50 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
-    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:56 -> a
-    5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> a
-    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):99:99 -> a
-    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):109:109 -> a
-    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):114:114 -> a
-    9:9:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):119:119 -> a
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):124:124 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
+    2:2:com.android.tools.r8.ir.code.Value dest():47:47 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52 -> a
+    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:53 -> a
+    5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):63:63 -> 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):96:96 -> a
+    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):106:106 -> a
+    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
+    9:9:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):116:116 -> a
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):121:121 -> a
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):124 -> a
-    12:12: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):134:134 -> a
-    13:13:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):170:170 -> a
-    14:14:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):191:191 -> a
+    11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):121 -> a
+    12:12: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):131:131 -> a
+    13:13:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):167:167 -> a
+    14:14:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):176:176 -> a
     1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> b
-    1:1:boolean verifyTypes(com.android.tools.r8.graph.AppView):220 -> b
-    2:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):220:223 -> b
-    6:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):222:224 -> b
+    1:1:boolean verifyTypes(com.android.tools.r8.graph.AppView):205 -> b
+    2:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):205:208 -> b
+    6:8:boolean verifyTypes(com.android.tools.r8.graph.AppView):207:209 -> b
     9:9:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
-    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):224 -> b
-    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):224:224 -> b
-    11:51:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:180 -> b
-    52:52:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):145:145 -> b
-    53:53:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):210:210 -> b
-    1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):204:214 -> c
-    boolean isNewInstance() -> c2
+    9:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):209 -> b
+    10:10:boolean verifyTypes(com.android.tools.r8.graph.AppView):209:209 -> b
+    11:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):137:164 -> b
+    39:39:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):142:142 -> b
+    40:40:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):195:195 -> b
+    boolean isNewInstance() -> b2
+    1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:199 -> c
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
-    1:1:java.lang.String toString():61:61 -> toString
-    1:1:int maxInValueRegister():71:71 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:java.lang.String toString():58:58 -> toString
+    1:1:int maxInValueRegister():68:68 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Not -> com.android.tools.r8.D.b.a1:
     com.android.tools.r8.ir.code.NumericType type -> h
     boolean $assertionsDisabled -> i
@@ -26279,9 +26264,9 @@
     38:38:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> 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
-    boolean isNot() -> d2
+    boolean isNot() -> c2
     com.android.tools.r8.ir.code.Not asNot() -> e0
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.D.b.b1:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
@@ -26310,9 +26295,9 @@
     219:219:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):157:157 -> a
     220:220:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):162:162 -> a
     221:221:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
-    boolean isNumberConversion() -> e2
+    boolean isNumberConversion() -> d2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.D.b.c1:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
@@ -26341,8 +26326,8 @@
     60:60:boolean isWide():62:62 -> a
 com.android.tools.r8.ir.code.Or -> com.android.tools.r8.D.b.d1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26354,9 +26339,9 @@
     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
-    boolean isOr() -> f2
+    boolean isOr() -> e2
     com.android.tools.r8.ir.code.Or asOr() -> g0
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.D.b.f1:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
@@ -26364,93 +26349,93 @@
     boolean isStackPhi -> u
     boolean $assertionsDisabled -> w
     com.android.tools.r8.ir.code.BasicBlock block -> r
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):54:54 -> <init>
-    2:21:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):38:57 -> <init>
-    boolean isConstant() -> E
-    boolean isPhi() -> J
-    1:2:boolean isValueOnStack():346:347 -> M
-    1:1:void markNonDebugLocalRead():152:152 -> Q
-    1:1:boolean needsRegister():369:369 -> R
-    1:4: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):77:80 -> a
-    5:27:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):102:124 -> a
-    28:29:void appendOperand(com.android.tools.r8.ir.code.Value):163:164 -> a
-    28:29:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):125 -> a
-    30:30:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):127:127 -> a
-    31:31:void throwUndefinedValueError():156:156 -> a
-    31:31:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):104 -> a
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):53:53 -> <init>
+    2:21:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):37:56 -> <init>
+    boolean isConstant() -> D
+    boolean isPhi() -> I
+    1:2:boolean isValueOnStack():345:346 -> L
+    1:1:void markNonDebugLocalRead():151:151 -> P
+    1:1:boolean needsRegister():368:368 -> Q
+    1:4: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):76:79 -> a
+    5:27:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):101:123 -> a
+    28:29:void appendOperand(com.android.tools.r8.ir.code.Value):162:163 -> a
+    28:29:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):124 -> a
+    30:30:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):126:126 -> a
+    31:31:void throwUndefinedValueError():155:155 -> a
+    31:31:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):103 -> a
     32:32:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    32:32:void throwUndefinedValueError():156 -> a
-    32:32:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):104 -> a
+    32:32:void throwUndefinedValueError():155 -> a
+    32:32:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):103 -> a
     33:33:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     33:33:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    33:33:void throwUndefinedValueError():156 -> a
-    33:33:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):104 -> a
-    34:34:void throwUndefinedValueError():156:156 -> a
-    34:34:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):104 -> a
-    35:39:void addOperands(java.util.List,boolean):138:142 -> a
-    40:41:void appendOperand(com.android.tools.r8.ir.code.Value):163:164 -> a
-    40:41:void addOperands(java.util.List,boolean):143 -> a
-    42:42:void removeTrivialPhi():228:228 -> a
-    42:42:void addOperands(java.util.List,boolean):146 -> a
-    43:43:void throwUndefinedValueError():156:156 -> a
-    43:43:void addOperands(java.util.List,boolean):140 -> a
+    33:33:void throwUndefinedValueError():155 -> a
+    33:33:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):103 -> a
+    34:34:void throwUndefinedValueError():155:155 -> a
+    34:34:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):103 -> a
+    35:39:void addOperands(java.util.List,boolean):137:141 -> a
+    40:41:void appendOperand(com.android.tools.r8.ir.code.Value):162:163 -> a
+    40:41:void addOperands(java.util.List,boolean):142 -> a
+    42:42:void removeTrivialPhi():227:227 -> a
+    42:42:void addOperands(java.util.List,boolean):145 -> a
+    43:43:void throwUndefinedValueError():155:155 -> a
+    43:43:void addOperands(java.util.List,boolean):139 -> a
     44:44:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    44:44:void throwUndefinedValueError():156 -> a
-    44:44:void addOperands(java.util.List,boolean):140 -> a
+    44:44:void throwUndefinedValueError():155 -> a
+    44:44:void addOperands(java.util.List,boolean):139 -> 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 com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    45:45:void throwUndefinedValueError():156 -> a
-    45:45:void addOperands(java.util.List,boolean):140 -> a
-    46:46:void throwUndefinedValueError():156:156 -> a
-    46:46:void addOperands(java.util.List,boolean):140 -> a
-    47:50:void replaceOperandAt(int,com.android.tools.r8.ir.code.Value):196:199 -> a
-    51:54:void replaceOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):203:206 -> a
-    55:94:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):233:272 -> a
-    95:95:void addDefinitionsUser(java.util.Map):328:328 -> a
-    95:95:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):272 -> a
-    96:105:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):279:288 -> a
-    106:113:void print(com.android.tools.r8.utils.CfgPrinter):316:323 -> a
-    114:114:void addDefinitionsUser(java.util.Map):328:328 -> a
-    115:118:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):358:361 -> a
-    119:119:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):377:377 -> a
-    120:120:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():797:797 -> a
-    120:120:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):377 -> a
-    121:129:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):377:385 -> a
-    1:3:void abortOnInvalidDebugInfo(com.android.tools.r8.ir.code.ValueTypeConstraint):84:86 -> b
-    4:4:com.android.tools.r8.ir.code.Value getOperand(int):168:168 -> b
-    5:16:void removeOperandsByIndex(java.util.List):181:192 -> b
-    17:17:void removeDefinitionsUser(java.util.Map):332:332 -> b
-    18:18:void setIsStackPhi(boolean):351:351 -> b
-    19:20:boolean verifyIsStackPhi(java.util.Set):355:356 -> b
-    1:2:void removeOperand(int):176:177 -> c
-    1:1:void clearDefinitionsUsers():336:336 -> c0
+    45:45:void throwUndefinedValueError():155 -> a
+    45:45:void addOperands(java.util.List,boolean):139 -> a
+    46:46:void throwUndefinedValueError():155:155 -> a
+    46:46:void addOperands(java.util.List,boolean):139 -> a
+    47:47:com.android.tools.r8.ir.code.Value getOperand(int):167:167 -> a
+    48:59:void removeOperandsByIndex(java.util.List):180:191 -> a
+    60:63:void replaceOperandAt(int,com.android.tools.r8.ir.code.Value):195:198 -> a
+    64:67:void replaceOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):202:205 -> a
+    68:107:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):232:271 -> a
+    108:108:void addDefinitionsUser(java.util.Map):327:327 -> a
+    108:108:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):271 -> a
+    109:118:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):278:287 -> a
+    119:126:void print(com.android.tools.r8.utils.CfgPrinter):315:322 -> a
+    127:127:void addDefinitionsUser(java.util.Map):327:327 -> a
+    128:131:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):357:360 -> a
+    132:132:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376:376 -> a
+    133:133:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
+    133:133:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376 -> a
+    134:142:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376:384 -> a
+    1:3:void abortOnInvalidDebugInfo(com.android.tools.r8.ir.code.ValueTypeConstraint):83:85 -> b
+    4:5:void removeOperand(int):175:176 -> b
+    6:6:void removeDefinitionsUser(java.util.Map):331:331 -> b
+    7:7:void setIsStackPhi(boolean):350:350 -> b
+    8:9:boolean verifyIsStackPhi(java.util.Set):354:355 -> b
+    1:1:void clearDefinitionsUsers():335:335 -> b0
+    1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():70:70 -> c0
     com.android.tools.r8.ir.code.Phi asPhi() -> d
-    1:1:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):373:373 -> d
-    1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():71:71 -> d0
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390:390 -> e
-    2:2:java.util.List getOperands():172:172 -> e
-    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):391 -> e
-    3:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):391:392 -> e
-    1:1:java.util.List getOperands():172:172 -> e0
-    1:1:boolean isTrivialPhi():213:213 -> f0
-    1:9:java.lang.String printPhi():303:311 -> g0
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1082:1082 -> g0
-    10:10:java.lang.String printPhi():311 -> g0
-    11:12:java.lang.String printPhi():311:312 -> g0
-    1:1:void removeDeadPhi():293:293 -> h0
-    2:2:java.util.List getOperands():172:172 -> h0
-    2:2:void removeDeadPhi():295 -> h0
-    3:4:void removeDeadPhi():295:296 -> h0
-    5:5:com.android.tools.r8.ir.code.BasicBlock getBlock():71:71 -> h0
-    5:5:void removeDeadPhi():299 -> h0
-    6:6:void removeDeadPhi():299:299 -> h0
-    1:1:void removeTrivialPhi():228:228 -> i0
+    1:1:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):372:372 -> d
+    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):389:389 -> d
+    3:3:java.util.List getOperands():171:171 -> d
+    3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390 -> d
+    4:5:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390:391 -> d
+    1:1:java.util.List getOperands():171:171 -> d0
+    1:1:boolean isTrivialPhi():212:212 -> e0
+    1:9:java.lang.String printPhi():302:310 -> f0
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1199:1199 -> f0
+    10:10:java.lang.String printPhi():310 -> f0
+    11:12:java.lang.String printPhi():310:311 -> f0
+    1:1:void removeDeadPhi():292:292 -> g0
+    2:2:java.util.List getOperands():171:171 -> g0
+    2:2:void removeDeadPhi():294 -> g0
+    3:4:void removeDeadPhi():294:295 -> g0
+    5:5:com.android.tools.r8.ir.code.BasicBlock getBlock():70:70 -> g0
+    5:5:void removeDeadPhi():298 -> g0
+    6:6:void removeDeadPhi():298:298 -> g0
+    1:1:void removeTrivialPhi():227:227 -> h0
 com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.D.b.e1:
     com.android.tools.r8.ir.code.Phi$RegisterReadType NORMAL -> a
     com.android.tools.r8.ir.code.Phi$RegisterReadType DEBUG -> b
-    1:2:void <clinit>():33:34 -> <clinit>
-    1:1:void <init>(java.lang.String,int):32:32 -> <init>
+    1:2:void <clinit>():32:33 -> <clinit>
+    1:1:void <init>(java.lang.String,int):31:31 -> <init>
 com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.D.b.g1:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue):19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -26467,10 +26452,10 @@
     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:5:void addInValue(com.android.tools.r8.ir.code.Value):34:38 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isPop() -> h2
-    1:1:int maxInValueRegister():59:59 -> x2
-    1:1:int maxOutValueRegister():64:64 -> y2
-    int opcode() -> z2
+    boolean isPop() -> g2
+    1:1:int maxInValueRegister():59:59 -> w2
+    1:1:int maxOutValueRegister():64:64 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Position -> com.android.tools.r8.D.b.h1:
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     com.android.tools.r8.graph.DexString file -> b
@@ -26497,8 +26482,8 @@
     1:19:java.lang.String toString():151 -> toString
 com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.D.b.i1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> H2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -26518,16 +26503,16 @@
     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() -> h0
-    boolean isRem() -> i2
-    int opcode() -> z2
+    boolean isRem() -> h2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Return -> com.android.tools.r8.D.b.j1:
     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>
-    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> E2
-    1:1:boolean isReturnVoid():42:42 -> F2
-    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> G2
+    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> D2
+    1:1:boolean isReturnVoid():42:42 -> E2
+    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> F2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
     2:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:87 -> a
@@ -26540,14 +26525,14 @@
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):114 -> a
     1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):56:70 -> b
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    boolean isReturn() -> j2
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():97:97 -> y2
-    int opcode() -> z2
+    boolean isReturn() -> i2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():97:97 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.D.b.k1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26560,12 +26545,12 @@
     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() -> j0
-    boolean isShl() -> k2
-    int opcode() -> z2
+    boolean isShl() -> j2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.D.b.l1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26578,8 +26563,8 @@
     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() -> k0
-    boolean isShr() -> l2
-    int opcode() -> z2
+    boolean isShr() -> k2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.D.b.m1:
     int decodedValue() -> a
 com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.D.b.n1:
@@ -26588,37 +26573,37 @@
     boolean $assertionsDisabled -> t
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:void <init>(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int):17:20 -> <init>
-    boolean isValueOnStack() -> M
-    boolean needsRegister() -> R
+    boolean isValueOnStack() -> L
+    boolean needsRegister() -> Q
     1:3:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):24:26 -> a
     4:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     4:4:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):26 -> a
     5:5:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):26:26 -> a
-    6:6:void setNeedsRegister(boolean):54:54 -> a
-    1:1:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> b
-    2:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1082:1082 -> b
-    2:2:com.android.tools.r8.ir.code.StackValue duplicate(int):39 -> b
-    3:3:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> b
-    1:1:int getHeight():31:31 -> c0
-    1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> d0
+    6:6:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> a
+    7:7:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.code.Value.getTypeLattice():1199:1199 -> a
+    7:7:com.android.tools.r8.ir.code.StackValue duplicate(int):39 -> a
+    8:8:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> a
+    9:9:void setNeedsRegister(boolean):54:54 -> a
+    1:1:int getHeight():31:31 -> b0
+    1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> c0
     1:1:java.lang.String toString():59:59 -> toString
 com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.D.b.o1:
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():14:14 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.StackValue[]):19:21 -> <init>
-    boolean isValueOnStack() -> M
-    boolean needsRegister() -> R
+    boolean isValueOnStack() -> L
+    boolean needsRegister() -> Q
     1:1:void setNeedsRegister(boolean):35:35 -> a
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> c0
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> b0
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():59:59 -> t
     1:10:java.lang.String toString():40:49 -> toString
 com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.D.b.p1:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> F2
-    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> G2
+    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> E2
+    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
     2:2:com.android.tools.r8.ir.code.Value dest():49:49 -> a
@@ -26650,51 +26635,63 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:120 -> b
     1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):213:217 -> c
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
-    boolean isStaticGet() -> m2
+    boolean isStaticGet() -> l2
     1:1:java.lang.String toString():160:160 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.D.b.q1:
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
-    1:2:com.android.tools.r8.ir.code.Value value():50:51 -> F2
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):39:39 -> <init>
+    1:2:com.android.tools.r8.ir.code.Value value():54:55 -> E2
     boolean instructionTypeCanThrow() -> N0
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
-    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
-    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:66 -> a
-    31:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:81 -> a
-    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
-    52:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
-    53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
-    54:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:86 -> a
-    72:72:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):118:118 -> a
-    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):139:140 -> a
-    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):158:168 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
+    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:88 -> a
+    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:70 -> a
+    31:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:85 -> a
+    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
+    52:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:79 -> a
+    53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
+    54:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:90 -> a
+    72:72:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):122:122 -> a
+    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):177:178 -> a
+    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):196:206 -> a
     86:86:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):162 -> a
-    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):178:182 -> 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):188:188 -> a
-    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):208:208 -> a
-    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):213:215 -> a
-    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):213:213 -> a
-    98:98: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):225:225 -> a
-    99:99:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):238:238 -> a
-    1:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:118 -> b
-    23:30:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:124 -> b
-    1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):231:235 -> c
+    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):200 -> a
+    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):216:220 -> 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):226:226 -> a
+    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):246:246 -> a
+    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):251:253 -> a
+    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):251:251 -> a
+    98:98: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):263:263 -> a
+    99:99:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):276:276 -> a
+    1:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101:122 -> b
+    23:29:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):121:127 -> b
+    30:34:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):141:145 -> b
+    30:34:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    35:35:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):145 -> b
+    35:35:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    36:53:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):146:163 -> b
+    36:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    54:54:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):162:162 -> b
+    54:54:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    55:55:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):145 -> b
+    55:55:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):269:273 -> c
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
-    boolean isStaticPut() -> n2
-    1:1:java.lang.String toString():193:193 -> toString
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():152:152 -> y2
-    int opcode() -> z2
+    boolean isStaticPut() -> m2
+    1:1:java.lang.String toString():231:231 -> toString
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():190:190 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Store -> com.android.tools.r8.D.b.r1:
     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:com.android.tools.r8.ir.code.Value src():37:37 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> C2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52:52 -> a
@@ -26712,16 +26709,16 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):108:109 -> c
     com.android.tools.r8.ir.code.Store asStore() -> n0
-    boolean isStore() -> o2
-    1:1:int maxInValueRegister():57:57 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    boolean isStore() -> n2
+    1:1:int maxInValueRegister():57:57 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.D.b.s1:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():15:15 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString[],int[],int):21:23 -> <init>
-    1:4:boolean valid():44:47 -> H2
+    1:4:boolean valid():44:47 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void forEachCase(java.util.function.BiConsumer):37:37 -> a
     2:2:com.android.tools.r8.graph.DexString getKey(int):62:62 -> a
@@ -26732,21 +26729,21 @@
     6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> a
     7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):96:96 -> a
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
-    boolean isStringSwitch() -> p2
+    boolean isStringSwitch() -> o2
     1:4:java.lang.String toString():67:70 -> toString
     5:5:com.android.tools.r8.graph.DexString getKey(int):62:62 -> toString
     5:5:java.lang.String toString():71 -> toString
     6:11:java.lang.String toString():71:76 -> toString
-    1:1:int maxInValueRegister():101:101 -> x2
-    1:1:int maxOutValueRegister():106:106 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():101:101 -> w2
+    1:1:int maxOutValueRegister():106:106 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.D.b.t1:
     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 isCommutative() -> E2
-    1:8:int maxInOutValueRegisterSize():131:138 -> G2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> I2
+    boolean isCommutative() -> D2
+    1:8:int maxInOutValueRegisterSize():131:138 -> F2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
@@ -26771,8 +26768,8 @@
     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() -> p0
-    boolean isSub() -> q2
-    int opcode() -> z2
+    boolean isSub() -> p2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.D.b.u1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -26788,29 +26785,29 @@
     4:4: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 instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
-    boolean isSwap() -> r2
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():87:87 -> y2
-    int opcode() -> z2
+    boolean isSwap() -> q2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():87:87 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.D.b.v1:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int):15:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> D2
-    1:1:int getFallthroughBlockIndex():55:55 -> E2
-    1:1:int numberOfKeys():68:68 -> F2
-    1:1:int[] targetBlockIndices():40:40 -> G2
-    1:1:int numberOfKeys():68:68 -> H2
-    1:1:boolean valid():25 -> H2
-    2:2:boolean valid():26:26 -> H2
-    3:3:int getTargetBlockIndex(int):36:36 -> H2
-    3:3:boolean valid():26 -> H2
-    4:4:int getFallthroughBlockIndex():55:55 -> H2
-    4:4:boolean valid():26 -> H2
-    5:5:boolean valid():26:26 -> H2
-    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> I2
+    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> C2
+    1:1:int getFallthroughBlockIndex():55:55 -> D2
+    1:1:int numberOfKeys():68:68 -> E2
+    1:1:int[] targetBlockIndices():40:40 -> F2
+    1:1:int numberOfKeys():68:68 -> G2
+    1:1:boolean valid():25 -> G2
+    2:2:boolean valid():26:26 -> G2
+    3:3:int getTargetBlockIndex(int):36:36 -> G2
+    3:3:boolean valid():26 -> G2
+    4:4:int getFallthroughBlockIndex():55:55 -> G2
+    4:4:boolean valid():26 -> G2
+    5:5:boolean valid():26:26 -> G2
+    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> H2
     1:1:int getTargetBlockIndex(int):36:36 -> b
     2:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):64:64 -> b
     1:1:void setFallthroughBlockIndex(int):59:59 -> c
@@ -26819,12 +26816,12 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32 -> d
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32:32 -> d
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
-    boolean isSwitch() -> s2
+    boolean isSwitch() -> r2
 com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.D.b.w1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> E2
+    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> D2
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
@@ -26835,34 +26832,34 @@
     10:10:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
     10:10:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):99 -> a
     11:11:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104:104 -> a
-    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     12:12:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
     13:16:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):105:108 -> a
-    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     17:17:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
     18:18:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():267:267 -> 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):76 -> a
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
-    boolean isThrow() -> t2
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():49:49 -> y2
-    int opcode() -> z2
+    boolean isThrow() -> s2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():49:49 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.D.b.x1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> D2
+    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> C2
     boolean hasInvariantOutType() -> I0
     1:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> 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):51 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isUnop() -> u2
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
+    boolean isUnop() -> t2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
 com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.D.b.y1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -26875,8 +26872,8 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
-    boolean isUshr() -> v2
-    int opcode() -> z2
+    boolean isUshr() -> u2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Value -> com.android.tools.r8.D.b.B1:
     int needsRegister -> j
     boolean isThis -> k
@@ -26895,199 +26892,212 @@
     com.android.tools.r8.ir.code.Value$DebugData debugData -> n
     com.android.tools.r8.utils.LongInterval valueRange -> m
     java.util.LinkedList users -> c
-    1:165:void <clinit>():41:205 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):224:224 -> <init>
-    2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):209:227 -> <init>
-    1:1:boolean isArgument():886:886 -> A
-    1:1:boolean isConstClass():826:826 -> B
-    1:1:boolean isConstNumber():806:806 -> C
-    1:1:boolean isConstString():810:810 -> D
-    1:1:boolean isConstant():830:830 -> E
-    1:1:boolean isDexItemBasedConstString():814:814 -> F
-    boolean isFixedRegisterValue() -> G
-    1:1:boolean isLinked():393:393 -> H
-    1:3:boolean isNeverNull():874:876 -> I
-    boolean isPhi() -> J
-    1:1:boolean isThis():946:946 -> K
-    1:1:boolean isUsed():498:498 -> L
-    boolean isValueOnStack() -> M
-    1:3:boolean isZero():1039:1041 -> N
-    1:3:void markAsArgument():880:882 -> O
-    1:3:void markAsThis():935:937 -> P
-    1:1:void markNonDebugLocalRead():138:138 -> Q
-    1:3:boolean needsRegister():713:715 -> R
-    1:1:int numberOfAllNonDebugUsers():486:486 -> S
-    1:1:int numberOfAllUsers():494 -> S
-    2:2:int numberOfAllUsers():494:494 -> S
-    1:1:int numberOfDebugUsers():490:490 -> T
-    1:5:int numberOfPhiUsers():478:482 -> U
-    1:5:int numberOfUsers():470:474 -> V
-    1:1:com.android.tools.r8.ir.code.ValueType outType():797:797 -> W
-    1:1:int requiredRegisters():296:296 -> X
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():429:430 -> Y
-    1:4:java.util.Set uniquePhiUsers():459:462 -> Z
+    1:165:void <clinit>():40:204 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):223:223 -> <init>
+    2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):208:226 -> <init>
+    1:1:boolean isConstClass():827:827 -> A
+    1:1:boolean isConstNumber():807:807 -> B
+    1:1:boolean isConstString():811:811 -> C
+    1:1:boolean isConstant():831:831 -> D
+    1:1:boolean isDexItemBasedConstString():815:815 -> E
+    boolean isFixedRegisterValue() -> F
+    1:1:boolean isLinked():392:392 -> G
+    1:3:boolean isNeverNull():991:993 -> H
+    boolean isPhi() -> I
+    1:1:boolean isThis():1063:1063 -> J
+    1:1:boolean isUsed():493:493 -> K
+    boolean isValueOnStack() -> L
+    1:3:boolean isZero():1156:1158 -> M
+    1:3:void markAsArgument():997:999 -> N
+    1:3:void markAsThis():1052:1054 -> O
+    1:1:void markNonDebugLocalRead():137:137 -> P
+    1:3:boolean needsRegister():719:721 -> Q
+    1:1:int numberOfAllNonDebugUsers():481:481 -> R
+    1:1:int numberOfAllUsers():489 -> R
+    2:2:int numberOfAllUsers():489:489 -> R
+    1:1:int numberOfDebugUsers():485:485 -> S
+    1:5:int numberOfPhiUsers():473:477 -> T
+    1:5:int numberOfUsers():465:469 -> U
+    1:1:com.android.tools.r8.ir.code.ValueType outType():798:798 -> V
+    1:1:int requiredRegisters():295:295 -> W
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():428:429 -> X
+    1:4:java.util.Set uniquePhiUsers():454:457 -> Y
+    1:4:java.util.Set uniqueUsers():421:424 -> Z
     boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi) -> a
-    1:13: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):45:57 -> a
-    14:14:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1050:1050 -> a
-    14: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):58 -> 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):47:47 -> a
+    1:13: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):44:56 -> a
+    14:14:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    14: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):57 -> 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):46:46 -> a
     16:18:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> 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):47 -> a
-    19:79:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):63:123 -> a
-    80:81:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):118:119 -> a
-    82:83:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):113:114 -> a
-    84:85:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):108:109 -> a
-    86:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):100:104 -> a
-    91:92:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):95:96 -> a
-    93:94:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):90:91 -> a
-    95:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):69:85 -> a
-    112:116:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):82:86 -> a
-    117:117:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):129:129 -> a
-    118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):133:133 -> a
-    118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):129 -> a
-    119:119:com.android.tools.r8.ir.code.Value getAliasedValue():258:258 -> a
-    119:119:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1119 -> a
-    120:138:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1120:1138 -> 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):46 -> a
+    19:79:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):62:122 -> a
+    80:81:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):117:118 -> a
+    82:83:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):112:113 -> a
+    84:85:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):107:108 -> a
+    86:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):99:103 -> a
+    91:92:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):94:95 -> a
+    93:94:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):89:90 -> a
+    95:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):68:84 -> a
+    112:116:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):81:85 -> a
+    117:117:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128:128 -> a
+    118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):132:132 -> a
+    118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128 -> a
+    119:119:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    119:119:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1235 -> a
+    120:138:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1236:1254 -> a
     139:139:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    139:139:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1138 -> a
+    139:139:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1254 -> a
     140:140:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    140:140:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1138 -> a
-    141:141:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1139:1139 -> a
-    142:162:com.android.tools.r8.ir.code.Value getAliasedValue(java.util.function.Predicate):262:282 -> a
-    163:165:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):308:310 -> a
-    166:169:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):319:322 -> a
-    170:171:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362:363 -> a
-    172:173:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367:368 -> a
-    172:173:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363 -> a
-    174:182:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():173:181 -> a
-    174:182:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):368 -> a
-    174:182:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363 -> a
-    183:183:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():179:179 -> a
-    183:183:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):368 -> a
-    183:183:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363 -> a
-    184:184:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():176:176 -> a
-    184:184:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):368 -> a
-    184:184:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363 -> a
-    185:185:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363:363 -> a
-    186:187:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):413:414 -> a
-    188:192:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set,java.util.Set):442:446 -> a
-    193:193:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    193:193:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set,java.util.Set):447 -> a
-    194:194:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set,java.util.Set):447:447 -> a
-    195:195:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    195:195:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set,java.util.Set):448 -> a
-    196:196:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set,java.util.Set):448:448 -> a
-    197:198:void addPhiUser(com.android.tools.r8.ir.code.Phi):553:554 -> a
-    199:200:java.util.Set affectedValues():604:605 -> a
-    201:201:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    201:201:java.util.Set affectedValues():606 -> a
-    202:206:java.util.Set affectedValues():607:611 -> a
-    207:234:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):643:670 -> a
-    235:244:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):677:686 -> a
-    245:258: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):186:199 -> a
-    245:258:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):686 -> a
-    259:259: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):187:187 -> a
-    259:259:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):686 -> a
-    260:260:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):686:686 -> a
-    261:269:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):691:699 -> a
-    270:271:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):704:705 -> a
-    272:273:void setNeedsRegister(boolean):719:720 -> a
-    274:276:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):890:892 -> a
-    277:277:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
-    277:277:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):892 -> a
-    278:280:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):893:895 -> a
-    281:281:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    281:281:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):896 -> a
-    282:282:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):901:901 -> a
-    283:283:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
-    283:283:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):892 -> a
-    284:306:boolean knownToBeBoolean(java.util.Set):909:931 -> a
-    307:307:void setValueRange(com.android.tools.r8.utils.LongInterval):950:950 -> a
-    308:308:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):982:982 -> a
-    309:309:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):987:987 -> a
-    309:309:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):982 -> a
-    310:326:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1004:1020 -> a
-    327:327:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
-    327:327:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1023 -> a
-    328:334:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1025:1031 -> a
-    335:335:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1050:1050 -> a
-    336:338:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1069:1071 -> a
-    339:347:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1069:1077 -> a
-    348:348:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1050:1050 -> a
-    348:348:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1078 -> a
-    1:4:java.util.Set uniqueUsers():422:425 -> a0
+    140:140:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1254 -> a
+    141:141:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1255:1255 -> a
+    142:142:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    142:142:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):835 -> a
+    143:154:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):836:847 -> a
+    155:155:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    155:155:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):848 -> a
+    156:157:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):848:849 -> a
+    158:158:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    158:158:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853 -> a
+    159:162:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853:856 -> a
+    163:163:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    163:163:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):856 -> a
+    164:194:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):857:887 -> a
+    195:195:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    195:195:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):887 -> a
+    196:210:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):894:908 -> a
+    211:211:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    211:211:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):887 -> a
+    212:271:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):912:971 -> a
+    272:272:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> a
+    272:272:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):856 -> a
+    273:293:com.android.tools.r8.ir.code.Value getAliasedValue(java.util.function.Predicate):261:281 -> a
+    294:296:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):307:309 -> a
+    297:300:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):318:321 -> a
+    301:302:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):361:362 -> a
+    303:304:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):366:367 -> a
+    303:304:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    305:313:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():172:180 -> a
+    305:313:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    305:313:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    314:314:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():178:178 -> a
+    314:314:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    314:314:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    315:315:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():175:175 -> a
+    315:315:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    315:315:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    316:316:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362:362 -> a
+    317:318:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):412:413 -> a
+    319:320:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):440:441 -> a
+    321:321:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    321:321:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):442 -> a
+    322:322:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):442:442 -> a
+    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    323:323:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):443 -> a
+    324:324:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):443:443 -> a
+    325:326:void addPhiUser(com.android.tools.r8.ir.code.Phi):559:560 -> a
+    327:328:java.util.Set affectedValues():610:611 -> a
+    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    329:329:java.util.Set affectedValues():612 -> a
+    330:334:java.util.Set affectedValues():613:617 -> a
+    335:362:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):649:676 -> a
+    363:372:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):683:692 -> a
+    373:386: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):185:198 -> a
+    373:386:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692 -> a
+    387:387: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):186:186 -> a
+    387:387:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692 -> a
+    388:388:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692:692 -> a
+    389:397:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):697:705 -> a
+    398:399:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):710:711 -> a
+    400:401:void setNeedsRegister(boolean):725:726 -> a
+    402:404:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1007:1009 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    405:405:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1009 -> a
+    406:408:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1010:1012 -> a
+    409:409:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    409:409:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1013 -> a
+    410:410:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1018:1018 -> a
+    411:411:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator():1594:1594 -> a
+    411:411:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1009 -> a
+    412:434:boolean knownToBeBoolean(java.util.Set):1026:1048 -> a
+    435:435:void setValueRange(com.android.tools.r8.utils.LongInterval):1067:1067 -> a
+    436:436:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1104:1104 -> a
+    437:453:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1121:1137 -> a
+    454:454:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> a
+    454:454:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1140 -> a
+    455:461:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1142:1148 -> a
+    462:462:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    463:465:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1186:1188 -> a
+    466:474:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1186:1194 -> a
+    475:475:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    475:475:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1195 -> a
+    1:2:boolean usedInMonitorOperation():525:526 -> a0
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
-    1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):287:288 -> b
-    3:6:void linkTo(com.android.tools.r8.ir.code.Value):372:375 -> b
-    7:9:java.util.Set aliasedUsers():434:436 -> b
-    10:11:void removePhiUser(com.android.tools.r8.ir.code.Phi):558:559 -> b
-    12:13:void addDebugUser(com.android.tools.r8.ir.code.Instruction):568:569 -> b
-    14:20:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1056:1062 -> b
-    21:21:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1050:1050 -> b
-    21:21:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1063 -> b
-    22:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1089:1108 -> b
-    42:42:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
-    42:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1108 -> b
-    43:43:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> b
-    43:43:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1108 -> b
-    44:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1110:1112 -> b
-    1:2:boolean usedInMonitorOperation():519:520 -> b0
+    1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):286:287 -> b
+    3:6:void linkTo(com.android.tools.r8.ir.code.Value):371:374 -> b
+    7:8:java.util.Set aliasedUsers():433:434 -> b
+    9:10:void removePhiUser(com.android.tools.r8.ir.code.Phi):564:565 -> b
+    11:12:void addDebugUser(com.android.tools.r8.ir.code.Instruction):574:575 -> b
+    13:13:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1099:1099 -> b
+    14:20:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1173:1179 -> b
+    21:21:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> b
+    21:21:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1180 -> b
+    22:40:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1206:1224 -> b
+    41:41:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
+    41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1224 -> b
+    42:42:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable() -> b
+    42:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1224 -> b
+    43:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1226:1228 -> b
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> c
-    1:2:void addUser(com.android.tools.r8.ir.code.Instruction):528:529 -> c
-    3:4:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):563:564 -> c
-    5:17:void replaceUsers(com.android.tools.r8.ir.code.Value):618:630 -> c
-    18:18:com.android.tools.r8.graph.DexEncodedField getEnumField(com.android.tools.r8.graph.AppView):834:834 -> c
-    19:19:com.android.tools.r8.ir.code.Value getAliasedValue():258:258 -> c
-    19:19:com.android.tools.r8.graph.DexEncodedField getEnumField(com.android.tools.r8.graph.AppView):838 -> c
-    20:36:com.android.tools.r8.graph.DexEncodedField getEnumField(com.android.tools.r8.graph.AppView):839:855 -> c
-    1:1:int compareTo(java.lang.Object):41:41 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.ir.code.Value):758:758 -> compareTo
-    2:2:int compareTo(java.lang.Object):41 -> compareTo
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> c
+    1:1:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):514 -> c
+    2:5:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):515:518 -> c
+    6:10:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):497:501 -> c
+    11:11:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> c
+    11:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):501 -> c
+    12:16:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):504:508 -> c
+    17:18:void addUser(com.android.tools.r8.ir.code.Instruction):534:535 -> c
+    19:20:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):569:570 -> c
+    21:33:void replaceUsers(com.android.tools.r8.ir.code.Value):624:636 -> c
     com.android.tools.r8.ir.code.Phi asPhi() -> d
-    1:5:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):502:506 -> d
-    6:6:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> d
-    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):506 -> d
-    7:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):509:513 -> d
-    12:16:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):581:585 -> d
-    17:17:boolean lambda$getDynamicLowerBoundType$4(com.android.tools.r8.ir.code.Value):1134:1134 -> d
-    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):533:534 -> e
-    3:8:void clearUsers():543:548 -> e
-    9:9:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1090:1090 -> e
+    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):587:591 -> d
+    6:6:boolean lambda$getDynamicLowerBoundType$4(com.android.tools.r8.ir.code.Value):1250:1250 -> d
+    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):539:540 -> e
+    3:8:void clearUsers():549:554 -> e
+    9:9:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1207:1207 -> e
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> f
-    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):538:539 -> f
-    3:8:void clearUsersInfo():593:598 -> f
-    1:2:void computeNeedsRegister():724:725 -> g
-    1:1:java.util.Set debugUsers():466:466 -> h
-    1:1:int hashCode():763:763 -> hashCode
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():454:455 -> i
-    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():258:258 -> j
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():801:802 -> k
-    1:7:java.util.List getDebugLocalEnds():339:345 -> l
-    1:7:java.util.List getDebugLocalStarts():326:332 -> m
-    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():239:240 -> n
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():709:709 -> o
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():300:300 -> p
-    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():405:405 -> q
-    1:1:int getNumber():292:292 -> r
-    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():409:409 -> s
-    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():398 -> s
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1082:1082 -> t
-    1:8:java.lang.String toString():768:775 -> toString
+    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):544:545 -> f
+    3:8:void clearUsersInfo():599:604 -> f
+    1:2:void computeNeedsRegister():730:731 -> g
+    1:1:java.util.Set debugUsers():461:461 -> h
+    1:1:int hashCode():764:764 -> hashCode
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():449:450 -> i
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> j
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():802:803 -> k
+    1:7:java.util.List getDebugLocalEnds():338:344 -> l
+    1:7:java.util.List getDebugLocalStarts():325:331 -> m
+    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():238:239 -> n
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():715:715 -> o
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():299:299 -> p
+    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():404:404 -> q
+    1:1:int getNumber():291:291 -> r
+    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():408:408 -> s
+    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():397 -> s
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1199:1199 -> t
+    1:8:java.lang.String toString():769:776 -> toString
     9:9:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Instruction.outValue():120:120 -> toString
-    9:9:java.lang.String toString():776 -> toString
-    10:27:java.lang.String toString():776:793 -> toString
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():966:976 -> u
-    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():258:258 -> v
-    1:1:boolean hasAliasedValue():244 -> v
-    1:1:boolean hasLocalInfo():304:304 -> w
-    1:1:boolean hasUsersInfo():589:589 -> x
-    1:1:boolean hasValueRange():954:954 -> y
-    1:8:boolean internalComputeNeedsRegister():729:736 -> z
+    9:9:java.lang.String toString():777 -> toString
+    10:27:java.lang.String toString():777:794 -> toString
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():1083:1093 -> u
+    1:1:boolean hasLocalInfo():303:303 -> v
+    1:1:boolean hasUsersInfo():595:595 -> w
+    1:1:boolean hasValueRange():1071:1071 -> x
+    1:8:boolean internalComputeNeedsRegister():735:742 -> y
+    1:1:boolean isArgument():1003:1003 -> z
 com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.D.b.z1:
     java.util.Map users -> b
     com.android.tools.r8.graph.DebugLocalInfo local -> a
-    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):148:148 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):146:149 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):147:147 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):145:148 -> <init>
 com.android.tools.r8.ir.code.Value$DebugUse -> com.android.tools.r8.D.b.A1:
     com.android.tools.r8.ir.code.Value$DebugUse START -> b
     com.android.tools.r8.ir.code.Value$DebugUse[] $VALUES -> e
@@ -27095,9 +27105,9 @@
     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:2:void <clinit>():156:157 -> <clinit>
-    3:3:void <clinit>():156:156 -> <clinit>
-    1:1:void <init>(java.lang.String,int):156:156 -> <init>
+    1:2:void <clinit>():155:156 -> <clinit>
+    3:3:void <clinit>():155:155 -> <clinit>
+    1:1:void <init>(java.lang.String,int):155:155 -> <init>
 com.android.tools.r8.ir.code.ValueNumberGenerator -> com.android.tools.r8.D.b.C1:
     int nextValueNumber -> a
     1:2:void <init>():6:7 -> <init>
@@ -27186,8 +27196,8 @@
     long decodedValue() -> a
 com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.D.b.G1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -27200,8 +27210,8 @@
     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.Xor asXor() -> t0
-    boolean isXor() -> w2
-    int opcode() -> z2
+    boolean isXor() -> v2
+    int opcode() -> y2
 com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.D.c.c:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
@@ -27226,58 +27236,71 @@
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1):17:17 -> <init>
 com.android.tools.r8.ir.conversion.CallGraph -> com.android.tools.r8.D.c.e:
-    com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult cycleEliminationResult -> b
     java.util.Set nodes -> a
-    1:3:void <init>(java.util.Set,com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult):163:165 -> <init>
-    1:2:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):181:182 -> a
+    com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult cycleEliminationResult -> b
+    1:3:void <init>(java.util.Set,com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult):150:152 -> <init>
+    1:2:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):176:177 -> a
     3:3:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    3:3:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):183 -> a
+    3:3:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):178 -> a
 com.android.tools.r8.ir.conversion.CallGraph$Node -> com.android.tools.r8.D.c.d:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     java.util.Set callees -> c
     java.util.Set callers -> d
     boolean $assertionsDisabled -> e
     int numberOfCallSites -> b
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):49:49 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.DexEncodedMethod):41:50 -> <init>
-    1:7:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node,boolean):59:65 -> a
-    8:15:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node,boolean):62:69 -> a
-    16:18:void cleanCallersForRemoval():86:88 -> a
-    19:19:boolean hasCallee(com.android.tools.r8.ir.conversion.CallGraph$Node):105:105 -> a
-    1:1:java.util.Set getCalleesWithDeterministicOrder():97:97 -> b
-    2:2:boolean hasCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):109:109 -> b
-    1:2:void removeCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):74:75 -> c
-    3:3:java.util.Set getCallersWithDeterministicOrder():93:93 -> c
-    1:1:int compareTo(java.lang.Object):36:36 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.ir.conversion.CallGraph$Node):122:122 -> compareTo
-    2:2:int compareTo(java.lang.Object):36 -> compareTo
-    1:1:int getNumberOfCallSites():101:101 -> d
-    1:1:boolean isLeaf():117:117 -> e
-    1:30:java.lang.String toString():127:156 -> toString
-com.android.tools.r8.ir.conversion.CallGraphBuilder -> com.android.tools.r8.D.c.f:
-    boolean $assertionsDisabled -> e
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):22:22 -> <init>
-    1:5:void process(java.util.concurrent.ExecutorService):27:31 -> a
-    6:14:void process(java.util.concurrent.ExecutorService):30:38 -> a
-    15:15:java.lang.Object lambda$process$0(com.android.tools.r8.graph.DexProgramClass):33:33 -> a
-    1:1:void processClass(com.android.tools.r8.graph.DexProgramClass):42:42 -> b
-    2:4:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):46:48 -> b
-    5:5:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):47:47 -> b
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase -> com.android.tools.r8.D.c.k:
+    1:1:void <clinit>():37:37 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):50:50 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.DexEncodedMethod):42:51 -> <init>
+    1:7:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node,boolean):60:66 -> a
+    8:15:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node,boolean):63:70 -> a
+    16:18:void cleanForRemoval():80:82 -> a
+    19:19:boolean hasCallee(com.android.tools.r8.ir.conversion.CallGraph$Node):99:99 -> a
+    1:1:java.util.Set getCalleesWithDeterministicOrder():91:91 -> b
+    2:2:boolean hasCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):103:103 -> b
+    1:2:void removeCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):75:76 -> c
+    3:3:java.util.Set getCallersWithDeterministicOrder():87:87 -> c
+    1:1:int compareTo(java.lang.Object):37:37 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.ir.conversion.CallGraph$Node):112:112 -> compareTo
+    2:2:int compareTo(java.lang.Object):37 -> compareTo
+    1:1:int getNumberOfCallSites():95:95 -> d
+    1:1:boolean isLeaf():107:107 -> e
+    1:27:java.lang.String toString():117:143 -> toString
+com.android.tools.r8.ir.conversion.CallGraphBuilder -> com.android.tools.r8.D.c.j:
     java.util.Map nodes -> b
     java.util.Map possibleTargetsCache -> c
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():45:45 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):51:51 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView):47:52 -> <init>
-    void process(java.util.concurrent.ExecutorService) -> a
-    1:1:java.util.Map access$000(com.android.tools.r8.ir.conversion.CallGraphBuilderBase):45:45 -> a
-    2:4:com.android.tools.r8.ir.conversion.CallGraph$Node getOrCreateNode(com.android.tools.r8.graph.DexEncodedMethod):74:76 -> a
-    5:5:com.android.tools.r8.ir.conversion.CallGraph$Node lambda$getOrCreateNode$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):75:75 -> a
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator -> com.android.tools.r8.D.c.i:
+    1:1:void <clinit>():48:48 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):55:55 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):51:56 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.CallGraphBuilder):48:48 -> a
+    2:2:com.android.tools.r8.ir.conversion.CallGraph$Node access$100(com.android.tools.r8.ir.conversion.CallGraphBuilder,com.android.tools.r8.graph.DexEncodedMethod):48:48 -> a
+    3:7:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):60:64 -> a
+    8:18:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):63:73 -> a
+    19:19:boolean verifyAllMethodsWithCodeExists():104:104 -> a
+    19:19:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73 -> a
+    20:20:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    20:20:boolean verifyAllMethodsWithCodeExists():105 -> a
+    20:20:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73 -> a
+    21:22:boolean verifyAllMethodsWithCodeExists():105:106 -> a
+    21:22:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73 -> a
+    23:23:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    23:23:boolean verifyAllMethodsWithCodeExists():105 -> a
+    23:23:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73 -> a
+    24:26:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):75:77 -> a
+    27:27:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet():405:405 -> a
+    27:27:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.lang.Iterable):430 -> a
+    27:27:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):77 -> a
+    28:28:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.lang.Iterable):431:431 -> a
+    28:28:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):77 -> a
+    29:35:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):78:84 -> a
+    36:36:java.lang.Object lambda$build$0(com.android.tools.r8.graph.DexProgramClass):66:66 -> a
+    37:39:com.android.tools.r8.ir.conversion.CallGraph$Node getOrCreateNode(com.android.tools.r8.graph.DexEncodedMethod):98:100 -> a
+    40:40:com.android.tools.r8.ir.conversion.CallGraph$Node lambda$getOrCreateNode$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):99:99 -> a
+    1:1:java.util.Map access$200(com.android.tools.r8.ir.conversion.CallGraphBuilder):48:48 -> b
+    2:2:void processClass(com.android.tools.r8.graph.DexProgramClass):88:88 -> b
+    3:4:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):92:93 -> b
+com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator -> com.android.tools.r8.D.c.h:
     java.util.Deque stack -> c
     boolean $assertionsDisabled -> i
     java.util.Collection nodes -> a
@@ -27287,103 +27310,102 @@
     int maxDepth -> h
     int currentDepth -> g
     java.util.Map removedEdges -> f
-    1:1:void <clinit>():277:277 -> <clinit>
-    1:1:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):336:336 -> <init>
-    2:23:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):322:343 -> <init>
-    1:8:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles():348:355 -> a
-    9:14:void reset():362:367 -> a
-    9:14:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles():357 -> a
-    15:15:boolean edgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):514:514 -> a
-    16:16:void recordEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):518:518 -> a
-    17:19:java.util.Collection reorderNodes(java.util.List):529:531 -> a
-    1:1:java.util.Set lambda$recordEdgeRemoval$0(com.android.tools.r8.ir.conversion.CallGraph$Node):518:518 -> b
-    1:7:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):371:377 -> c
-    8:10:void push(com.android.tools.r8.ir.conversion.CallGraph$Node):474:476 -> c
-    8:10:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):382 -> c
-    11:91:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):386:466 -> c
-    92:110:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):406:424 -> c
-    111:118:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):420:427 -> c
-    119:123:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):487:491 -> c
-    119:123:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):430 -> c
-    124:125:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):432:433 -> c
-    126:134:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):496:504 -> c
-    126:134:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):439 -> c
-    135:147:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):444:456 -> c
-    148:148:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):451:451 -> c
-    149:151:void recoverStack(java.util.LinkedList):522:524 -> c
-    149:151:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):461 -> c
-    152:152:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):508:508 -> c
-    152:152:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):439 -> c
+    1:1:void <clinit>():302:302 -> <clinit>
+    1:1:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):361:361 -> <init>
+    2:23:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):347:368 -> <init>
+    1:8:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():373:380 -> a
+    9:14:void reset():387:392 -> a
+    9:14:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():382 -> a
+    15:15:boolean edgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):539:539 -> a
+    16:16:void recordEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):543:543 -> a
+    17:19:java.util.Collection reorderNodes(java.util.List):554:556 -> a
+    1:1:java.util.Set lambda$recordEdgeRemoval$0(com.android.tools.r8.ir.conversion.CallGraph$Node):543:543 -> b
+    1:7:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):396:402 -> c
+    8:10:void push(com.android.tools.r8.ir.conversion.CallGraph$Node):499:501 -> c
+    8:10:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):407 -> c
+    11:91:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):411:491 -> c
+    92:110:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):431:449 -> c
+    111:118:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):445:452 -> c
+    119:123:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):512:516 -> c
+    119:123:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):455 -> c
+    124:125:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):457:458 -> c
+    126:134:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):521:529 -> c
+    126:134:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    135:147:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):469:481 -> c
+    148:148:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):476:476 -> c
+    149:151:void recoverStack(java.util.LinkedList):547:549 -> c
+    149:151:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):486 -> c
+    152:152:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533:533 -> c
+    152:152:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
     153:153:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
-    153:153:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):508 -> c
-    153:153:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):439 -> c
-    154:154:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):508:508 -> c
-    154:154:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):439 -> c
-    155:158:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):480:483 -> c
-    155:158:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):469 -> c
-    159:159:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):470:470 -> c
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge -> com.android.tools.r8.D.c.g:
+    153:153:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533 -> c
+    153:153:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    154:154:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533:533 -> c
+    154:154:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    155:158:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):505:508 -> c
+    155:158:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):494 -> c
+    159:159:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):495:495 -> c
+com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge -> com.android.tools.r8.D.c.f:
     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):287:289 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$100(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge):282:282 -> a
-    2:2:void remove():293:293 -> a
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$200(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge):282:282 -> b
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult -> com.android.tools.r8.D.c.h:
+    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):312:314 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$300(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):307:307 -> a
+    2:2:void remove():318:318 -> a
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$400(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):307:307 -> b
+com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult -> com.android.tools.r8.D.c.g:
     java.util.Map removedEdges -> a
-    1:2:void <init>(java.util.Map):301:302 -> <init>
-    1:1:void forEachRemovedCaller(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Consumer):306:306 -> a
-    2:3:int numberOfRemovedEdges():311:312 -> a
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase$InvokeExtractor -> com.android.tools.r8.D.c.j:
-    com.android.tools.r8.ir.conversion.CallGraphBuilderBase this$0 -> e
-    boolean $assertionsDisabled -> f
-    java.util.function.Predicate targetTester -> d
+    1:2:void <init>(java.util.Map):326:327 -> <init>
+    1:1:void forEachRemovedCaller(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Consumer):331:331 -> a
+    2:3:int numberOfRemovedEdges():336:337 -> a
+com.android.tools.r8.ir.conversion.CallGraphBuilder$InvokeExtractor -> com.android.tools.r8.D.c.i:
+    com.android.tools.r8.ir.conversion.CallGraphBuilder this$0 -> d
+    boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.conversion.CallGraph$Node caller -> c
-    1:1:void <clinit>():81:81 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilderBase,com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Predicate):86:89 -> <init>
-    1:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexClass):93:95 -> a
-    4:18:void addTarget(com.android.tools.r8.graph.DexEncodedMethod,boolean):108:122 -> a
-    19:41:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):126:148 -> a
-    42:43:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):134:135 -> a
-    44:44:void lambda$processInvoke$0(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):135:135 -> a
-    45:48:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):175:178 -> a
-    49:49:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
-    49:49:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):178 -> a
-    50:50:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):211:211 -> a
-    51:51:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):241:241 -> a
-    52:52:void registerCallSite(com.android.tools.r8.graph.DexCallSite):272:272 -> a
-    1:32:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):156:187 -> b
-    33:33:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):223:223 -> b
-    34:34:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):235:235 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):217:217 -> c
-    2:3:boolean registerNewInstance(com.android.tools.r8.graph.DexType):247:248 -> c
-    4:4:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):255:255 -> c
+    1:1:void <clinit>():112:112 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilder,com.android.tools.r8.ir.conversion.CallGraph$Node):116:118 -> <init>
+    1:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexClass):122:124 -> a
+    4:15:void addTarget(com.android.tools.r8.graph.DexEncodedMethod,boolean):137:148 -> a
+    16:38:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):152:174 -> a
+    39:40:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):160:161 -> a
+    41:41:void lambda$processInvoke$0(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):161:161 -> a
+    42:45:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):200:203 -> a
+    46:46:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
+    46:46:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):203 -> a
+    47:47:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):236:236 -> a
+    48:48:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):266:266 -> a
+    49:49:void registerCallSite(com.android.tools.r8.graph.DexCallSite):297:297 -> a
+    1:32:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):181:212 -> b
+    33:33:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):248:248 -> b
+    34:34:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):260:260 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):242:242 -> c
+    2:3:boolean registerNewInstance(com.android.tools.r8.graph.DexType):272:273 -> c
+    4:4:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):280:280 -> c
     boolean registerTypeReference(com.android.tools.r8.graph.DexType) -> d
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):229:229 -> d
-    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):261:261 -> d
-    1:4:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):100:103 -> e
-    5:8:void processFieldAccess(com.android.tools.r8.graph.DexField):195:198 -> e
-    9:9:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):205:205 -> e
-com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.D.c.n:
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):254:254 -> d
+    2:2:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):286:286 -> d
+    1:4:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):129:132 -> e
+    5:8:void processFieldAccess(com.android.tools.r8.graph.DexField):220:223 -> e
+    9:9:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):230:230 -> e
+com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.D.c.m:
     1:1:void <init>():14:14 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation empty():27:27 -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.DexMethod) -> b
-com.android.tools.r8.ir.conversion.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.D.c.l:
+com.android.tools.r8.ir.conversion.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.D.c.k:
     java.util.Set singleCallSite -> a
     java.util.Set doubleCallSite -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):50:50 -> <init>
     2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):47:70 -> <init>
     1:1:boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod):94:94 -> a
     1:1:boolean hasSingleCallSite(com.android.tools.r8.graph.DexMethod):83:83 -> b
-com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.D.c.m:
+com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.D.c.l:
     com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation EMPTY_INFO -> a
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>():30:30 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod) -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.DexMethod) -> b
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation access$000():30:30 -> b
-com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.D.c.q:
+com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.D.c.p:
     com.android.tools.r8.ir.code.Position currentPosition -> h
     java.util.Map newInstanceLabels -> q
     java.util.List thisInitializers -> p
@@ -27411,25 +27433,25 @@
     21:23:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):133:135 -> a
     24:26:void rewriteNots():222:224 -> a
     24:26:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    27:27:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next() -> a
+    27:27:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     27:27:void rewriteNots():225 -> a
     27:27:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     28:32:void rewriteNots():226:230 -> a
     28:32:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    33:33:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    33:33:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     33:33:void rewriteNots():233 -> a
     33:33:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     34:34:void rewriteNots():234:234 -> a
     34:34:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     35:35:void rewriteNots():234 -> a
     35:35:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     36:38:void rewriteNots():235:237 -> a
     36:38:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    39:39:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    39:39:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     39:39:void rewriteNots():238 -> a
     39:39:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
-    40:40:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    40:40:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     40:40:void rewriteNots():239 -> a
     40:40:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     41:42:void rewriteNots():242:243 -> a
@@ -27439,41 +27461,41 @@
     44:64:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):137:157 -> a
     65:68:void rewriteIincPatterns():358:361 -> a
     65:68:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    69:69:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    69:69:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     69:69:void rewriteIincPatterns():362 -> a
     69:69:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     70:76:void rewriteIincPatterns():363:369 -> a
     70:76:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    77:77:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    77:77:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     77:77:void rewriteIincPatterns():370 -> a
     77:77:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     78:78:void rewriteIincPatterns():370:370 -> a
     78:78:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    79:79:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    79:79:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     79:79:void rewriteIincPatterns():372 -> a
     79:79:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     80:81:void rewriteIincPatterns():372:373 -> a
     80:81:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    82:82:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    82:82:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     82:82:void rewriteIincPatterns():375 -> a
     82:82:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     83:83:void rewriteIincPatterns():375:375 -> a
     83:83:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    84:84:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    84:84:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     84:84:void rewriteIincPatterns():376 -> a
     84:84:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     85:85:void rewriteIincPatterns():376:376 -> a
     85:85:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    86:86:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    86:86:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     86:86:void rewriteIincPatterns():378 -> a
     86:86:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    87:87:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    87:87:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     87:87:void rewriteIincPatterns():379 -> a
     87:87:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    88:88:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    88:88:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     88:88:void rewriteIincPatterns():380 -> a
     88:88:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    89:89:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    89:89:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     89:89:void rewriteIincPatterns():381 -> a
     89:89:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     90:99:void rewriteIincPatterns():386:395 -> a
@@ -27486,30 +27508,30 @@
     102:102:int getLocalRegister(com.android.tools.r8.ir.code.Value):638:638 -> a
     102:102:void rewriteIincPatterns():395 -> a
     102:102:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    103:103:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    103:103:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     103:103:void rewriteIincPatterns():396 -> a
     103:103:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     104:110:void rewriteIincPatterns():399:405 -> a
     104:110:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    111:111:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    111:111:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     111:111:void rewriteIincPatterns():406 -> a
     111:111:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     112:112:void rewriteIincPatterns():407:407 -> a
     112:112:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    113:113:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    113:113:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     113:113:void rewriteIincPatterns():408 -> a
     113:113:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     114:114:void rewriteIincPatterns():409:409 -> a
     114:114:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    115:115:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    115:115:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     115:115:void rewriteIincPatterns():410 -> a
     115:115:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     116:119:void rewriteIincPatterns():411:414 -> a
     116:119:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    120:120:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    120:120:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     120:120:void rewriteIincPatterns():392 -> a
     120:120:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
-    121:121:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    121:121:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     121:121:void rewriteIincPatterns():387 -> a
     121:121:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):160 -> a
     122:123:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):162:163 -> a
@@ -27603,8 +27625,8 @@
     28:33:void updateLocals(com.android.tools.r8.cf.code.CfLabel):509:514 -> b
     34:37:boolean localsChanged():518:521 -> b
     38:38:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):634:634 -> b
-com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.D.c.o:
-com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.D.c.p:
+com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.D.c.n:
+com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.D.c.o:
     int height -> b
     boolean $assertionsDisabled -> c
     int maxHeight -> a
@@ -27612,7 +27634,7 @@
     1:3:void <init>():100:102 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):100:100 -> <init>
     1:3:void push(com.android.tools.r8.ir.code.Value):109:111 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.D.c.t:
+com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.D.c.s:
     int currentInstructionIndex -> o
     com.android.tools.r8.graph.CfCode code -> h
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo currentBlockInfo -> a
@@ -27651,7 +27673,7 @@
     10:10:java.util.List com.android.tools.r8.graph.CfCode.getInstructions():131:131 -> a
     10:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297 -> a
     11:13:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297:299 -> a
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     14:14:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299 -> a
     15:16:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:300 -> a
     17:43:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:325 -> a
@@ -27806,16 +27828,20 @@
     41:41:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> i
     41:41:void setLocalVariableLists():681 -> i
     42:42:void setLocalVariableLists():681:681 -> i
-com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.D.c.r:
+com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.D.c.q:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap locals -> c
     int endOffset -> b
     int startOffset -> a
+    1:1:void <clinit>():136:136 -> <clinit>
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> <clinit>
+    2:2:void <clinit>():136 -> <clinit>
+    3:3:void <clinit>():136:136 -> <clinit>
     1:4:void <init>(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap):142:145 -> <init>
     1:18:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):155:172 -> a
     19:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> a
     19:19:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):173 -> a
     20:20:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):173:173 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.D.c.s:
+com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.D.c.r:
     java.util.List guards -> c
     boolean $assertionsDisabled -> e
     int endOffset -> b
@@ -27831,7 +27857,7 @@
     7:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.<init>():104:104 -> a
     7:7:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):100 -> a
     8:36:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):102:130 -> a
-com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.D.c.E:
+com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.D.c.D:
     com.android.tools.r8.ir.conversion.CfState$Snapshot current -> a
     com.android.tools.r8.ir.code.Position position -> b
     boolean $assertionsDisabled -> c
@@ -27865,8 +27891,8 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():190:190 -> c
     1:2:com.android.tools.r8.ir.conversion.CfState$Slot pop():176:177 -> d
     1:1:java.lang.String toString():225:225 -> toString
-com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.D.c.u:
-com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.D.c.v:
+com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.D.c.t:
+com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.D.c.u:
     com.android.tools.r8.ir.conversion.CfState$SlotType[] locals -> c
     com.android.tools.r8.ir.conversion.CfState$SlotType[] stack -> d
     boolean $assertionsDisabled -> e
@@ -27891,7 +27917,7 @@
     5:5:com.android.tools.r8.ir.conversion.CfState$Slot peek():366:366 -> c
     1:1:int stackHeight():350:350 -> d
     1:15:java.lang.String toString():395:409 -> toString
-com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.D.c.w:
+com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.D.c.v:
     int stackHeight -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():452:452 -> <clinit>
@@ -27900,7 +27926,7 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():475:475 -> c
     1:1:int stackHeight():464:464 -> d
     1:1:java.lang.String toString():480:480 -> toString
-com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.D.c.x:
+com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.D.c.w:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():413:413 -> <clinit>
@@ -27913,7 +27939,7 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():435:435 -> c
     1:1:int stackHeight():425:425 -> d
     1:1:java.lang.String toString():448:448 -> toString
-com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.D.c.y:
+com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.D.c.x:
     com.android.tools.r8.ir.conversion.CfState$SlotType slotType -> d
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> e
@@ -27928,24 +27954,24 @@
     1:2:int stackPosition():252:253 -> b
     1:2:int access$500(com.android.tools.r8.ir.conversion.CfState$Slot):228 -> b
     1:3:java.lang.String toString():258:260 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.D.c.B:
+com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.D.c.A:
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.CfState$1):14:14 -> <init>
     com.android.tools.r8.ir.code.ValueType getImprecise() -> a
     com.android.tools.r8.graph.DexType getPrecise() -> b
-com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.D.c.z:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.D.c.y:
     com.android.tools.r8.ir.code.ValueType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):47:48 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():58:58 -> a
     com.android.tools.r8.graph.DexType getPrecise() -> b
     1:1:java.lang.String toString():63:63 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.D.c.A:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.D.c.z:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):23:24 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():34:34 -> a
     1:1:com.android.tools.r8.graph.DexType getPrecise():29:29 -> b
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.D.c.C:
+com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.D.c.B:
     com.android.tools.r8.ir.conversion.CfState$Snapshot parent -> a
     int updates -> b
     1:1:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,int,com.android.tools.r8.ir.conversion.CfState$1):264:264 -> <init>
@@ -27957,7 +27983,7 @@
     2:2:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):282:282 -> b
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():286:286 -> c
     1:1:int stackHeight():274:274 -> d
-com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.D.c.D:
+com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.D.c.C:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():484:484 -> <clinit>
@@ -27966,7 +27992,7 @@
     2:3:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):506:507 -> a
     1:1:int maxLocal():496:496 -> b
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.D.c.P:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.D.c.O:
     boolean hasBackwardsBranch -> m
     boolean $assertionsDisabled -> o
     int outRegisterCount -> l
@@ -28009,10 +28035,10 @@
     109:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     109:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
     110:123:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):429:442 -> a
-    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     124:124:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):443 -> a
     125:153:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):445:473 -> a
-    154:154:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):479:479 -> a
+    154:154:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> a
     154:154:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):474 -> a
     155:166:void rewriteIfs():490:501 -> a
     155:166:com.android.tools.r8.graph.DexCode build():184 -> a
@@ -28030,7 +28056,7 @@
     214:214:void com.android.tools.r8.code.Instruction.setOffset(int):123:123 -> a
     214:214:com.android.tools.r8.graph.DexCode build():226 -> a
     215:225:com.android.tools.r8.graph.DexCode build():227:237 -> a
-    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1334:1334 -> a
+    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1329:1329 -> a
     226:226:com.android.tools.r8.graph.DexCode build():237 -> a
     227:245:com.android.tools.r8.graph.DexCode build():238:256 -> a
     246:246:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> a
@@ -28122,7 +28148,7 @@
     4:4:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):668:668 -> c
     5:5:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():881:881 -> c
     1:1:boolean isBuildingForComparison():156:156 -> d
-com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.D.c.F:
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.D.c.E:
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1050:1050 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -28130,11 +28156,11 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.D.c.G:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.D.c.F:
     com.android.tools.r8.code.FillArrayData dex -> b
     com.android.tools.r8.ir.code.NewArrayFilledData ir -> a
     1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):1525:1527 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.D.c.H:
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.D.c.G:
     com.android.tools.r8.code.Instruction instruction -> e
     1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):957:958 -> <init>
     1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):978:978 -> a
@@ -28146,7 +28172,7 @@
     1:1:int getSize():963:963 -> d
     1:1:int maxSize():973:973 -> e
     1:1:int minSize():968:968 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.D.c.I:
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.D.c.H:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1083:1083 -> <clinit>
@@ -28174,7 +28200,7 @@
     1:2:int getSize():1097:1098 -> d
     1:1:int maxSize():1109:1109 -> e
     1:1:int minSize():1103:1103 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.D.c.J:
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.D.c.I:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1214:1214 -> <clinit>
@@ -28298,7 +28324,7 @@
     1:1:int getSize():1347:1347 -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.D.c.K:
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.D.c.J:
     com.android.tools.r8.ir.code.Instruction ir -> a
     int offset -> b
     int maxOffset -> c
@@ -28318,7 +28344,7 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.D.c.L:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.D.c.K:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1361:1361 -> <clinit>
@@ -28373,7 +28399,7 @@
     1:2:int getSize():1473:1474 -> d
     1:1:int maxSize():1467:1467 -> e
     1:1:int minSize():1461:1461 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.D.c.M:
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.D.c.L:
     int size -> f
     com.android.tools.r8.code.Instruction[] instructions -> e
     1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):1001:1007 -> <init>
@@ -28386,11 +28412,11 @@
     1:1:int getSize():1037:1037 -> d
     1:1:int maxSize():1032:1032 -> e
     1:1:int minSize():1027:1027 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.D.c.N:
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.D.c.M:
     com.android.tools.r8.ir.code.IntSwitch ir -> a
     com.android.tools.r8.code.Format31t dex -> b
     1:3:void <init>(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):1514:1516 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.D.c.O:
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.D.c.N:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> a
     int start -> b
     int end -> c
@@ -28399,7 +28425,7 @@
     1:1:int compareTo(java.lang.Object):1491:1491 -> compareTo
     2:2:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1505:1505 -> compareTo
     2:2:int compareTo(java.lang.Object):1491 -> compareTo
-com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.D.c.Q:
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.D.c.P:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.Position currentPosition -> i
     com.android.tools.r8.graph.DexMethod originalMethod -> l
@@ -28499,7 +28525,7 @@
     1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):453:453 -> i
     2:2:boolean inTryRange(com.android.tools.r8.graph.DexCode$Try,int):448:448 -> i
     2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):454 -> i
-com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.D.c.Y:
+com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.D.c.X:
     com.android.tools.r8.ir.conversion.SourceCode source -> v
     java.util.Queue ssaWorklist -> f
     int currentInstructionOffset -> j
@@ -28544,849 +28570,849 @@
     5:5:boolean verifyMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense):468:468 -> a
     6:7:void addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):492:493 -> a
     8:26:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):509:527 -> a
-    27:29:void markIndexProcessed(int):2369:2371 -> a
+    27:29:void markIndexProcessed(int):2365:2367 -> a
     27:29:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):532 -> a
-    30:31:void ensureSubroutineProcessedInstructions():2379:2380 -> a
-    30:31:void markIndexProcessed(int):2374 -> a
+    30:31:void ensureSubroutineProcessedInstructions():2375:2376 -> a
+    30:31:void markIndexProcessed(int):2370 -> a
     30:31:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):532 -> a
-    32:32:void markIndexProcessed(int):2375:2375 -> a
+    32:32:void markIndexProcessed(int):2371:2371 -> a
     32:32:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):532 -> a
     33:43:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):533:543 -> a
-    44:44:void ensureNormalSuccessorBlock(int,int):2400:2400 -> a
+    44:44:void ensureNormalSuccessorBlock(int,int):2396:2396 -> a
     44:44:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):544 -> a
     45:47:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):550:552 -> a
     48:48:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):498:498 -> a
     48:48:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):552 -> a
     49:54:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):553:558 -> a
-    55:60:void processWorklist():749:754 -> a
+    55:60:void processWorklist():745:750 -> a
     55:60:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
     61:61:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):498:498 -> a
-    61:61:void processWorklist():754 -> a
+    61:61:void processWorklist():750 -> a
     61:61:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    62:66:void processWorklist():755:759 -> a
+    62:66:void processWorklist():751:755 -> a
     62:66:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    67:72:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):800:805 -> a
-    67:72:void processWorklist():759 -> a
+    67:72:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):796:801 -> a
+    67:72:void processWorklist():755 -> a
     67:72:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
     73:73:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    73:73:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):805 -> a
-    73:73:void processWorklist():759 -> a
+    73:73:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):801 -> a
+    73:73:void processWorklist():755 -> a
     73:73:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    74:92:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):806:824 -> a
-    74:92:void processWorklist():759 -> a
+    74:92:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):802:820 -> a
+    74:92:void processWorklist():755 -> a
     74:92:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    93:98:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):823:828 -> a
-    93:98:void processWorklist():759 -> a
+    93:98:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):819:824 -> a
+    93:98:void processWorklist():755 -> a
     93:98:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    99:106:void processWorklist():760:767 -> a
+    99:106:void processWorklist():756:763 -> a
     99:106:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    107:117:void processWorklist():766:776 -> a
+    107:117:void processWorklist():762:772 -> a
     107:117:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    118:118:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    118:118:void processWorklist():776 -> a
+    118:118:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    118:118:void processWorklist():772 -> a
     118:118:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    119:128:void processWorklist():780:789 -> a
+    119:128:void processWorklist():776:785 -> a
     119:128:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    129:132:void closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2445:2448 -> a
-    129:132:void processWorklist():789 -> a
+    129:132:void closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2441:2444 -> a
+    129:132:void processWorklist():785 -> a
     129:132:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    133:134:void processWorklist():792:793 -> a
+    133:134:void processWorklist():788:789 -> a
     133:134:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    135:135:void processWorklist():749:749 -> a
+    135:135:void processWorklist():745:745 -> a
     135:135:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
     136:141:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):562:567 -> a
-    142:143:boolean verifyFilledPredecessors():688:689 -> a
+    142:143:boolean verifyFilledPredecessors():684:685 -> a
     142:143:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    144:149:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):695:700 -> a
-    144:149:boolean verifyFilledPredecessors():689 -> a
+    144:149:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):691:696 -> a
+    144:149:boolean verifyFilledPredecessors():685 -> a
     144:149:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
     150:150:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():297:297 -> a
-    150:150:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    150:150:boolean verifyFilledPredecessors():689 -> a
+    150:150:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    150:150:boolean verifyFilledPredecessors():685 -> a
     150:150:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    151:158:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):717:724 -> a
-    151:158:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    151:158:boolean verifyFilledPredecessors():689 -> a
+    151:158:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):713:720 -> a
+    151:158:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    151:158:boolean verifyFilledPredecessors():685 -> a
     151:158:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    159:162:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):740:743 -> a
-    159:162:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):724 -> a
-    159:162:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    159:162:boolean verifyFilledPredecessors():689 -> a
+    159:162:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):736:739 -> a
+    159:162:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):720 -> a
+    159:162:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    159:162:boolean verifyFilledPredecessors():685 -> a
     159:162:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    163:163:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):741:741 -> a
-    163:163:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):724 -> a
-    163:163:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    163:163:boolean verifyFilledPredecessors():689 -> a
+    163:163:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):737:737 -> a
+    163:163:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):720 -> a
+    163:163:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    163:163:boolean verifyFilledPredecessors():685 -> a
     163:163:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    164:171:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):728:735 -> a
-    164:171:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    164:171:boolean verifyFilledPredecessors():689 -> a
+    164:171:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):724:731 -> a
+    164:171:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    164:171:boolean verifyFilledPredecessors():685 -> a
     164:171:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    172:178:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700:706 -> a
-    172:178:boolean verifyFilledPredecessors():689 -> a
+    172:178:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696:702 -> a
+    172:178:boolean verifyFilledPredecessors():685 -> a
     172:178:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    179:179:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):703:703 -> a
-    179:179:boolean verifyFilledPredecessors():689 -> a
+    179:179:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):699:699 -> a
+    179:179:boolean verifyFilledPredecessors():685 -> a
     179:179:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    180:186:void insertDebugPositions():657:663 -> a
+    180:186:void insertDebugPositions():653:659 -> a
     180:186:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    187:187:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    187:187:void insertDebugPositions():664 -> a
+    187:187:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    187:187:void insertDebugPositions():660 -> a
     187:187:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    188:200:void insertDebugPositions():665:677 -> a
+    188:200:void insertDebugPositions():661:673 -> a
     188:200:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    201:201:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    201:201:void insertDebugPositions():678 -> a
+    201:201:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    201:201:void insertDebugPositions():674 -> a
     201:201:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    202:202:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    202:202:void insertDebugPositions():679 -> a
+    202:202:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    202:202:void insertDebugPositions():675 -> a
     202:202:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    203:203:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    203:203:void insertDebugPositions():680 -> a
+    203:203:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    203:203:void insertDebugPositions():676 -> a
     203:203:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
     204:205:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):573:574 -> a
     206:206:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     206:206:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
     207:209:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575:577 -> a
-    210:210:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    210:210:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     210:210:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):577 -> a
     211:216:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):578:583 -> a
-    217:217:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    217:217:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     217:217:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):584 -> a
     218:219:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):591:592 -> a
-    220:250:void joinPredecessorsWithIdenticalPhis():2533:2563 -> a
+    220:250:void joinPredecessorsWithIdenticalPhis():2529:2559 -> a
     220:250:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     251:251:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    251:251:void joinPredecessorsWithIdenticalPhis():2563 -> a
+    251:251:void joinPredecessorsWithIdenticalPhis():2559 -> a
     251:251:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    252:252:void joinPredecessorsWithIdenticalPhis():2563:2563 -> a
+    252:252:void joinPredecessorsWithIdenticalPhis():2559:2559 -> a
     252:252:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    253:267:void joinPredecessorsWithIdenticalPhis():2562:2576 -> a
+    253:267:void joinPredecessorsWithIdenticalPhis():2558:2572 -> a
     253:267:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     268:279:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):506:517 -> a
-    268:279:void joinPredecessorsWithIdenticalPhis():2580 -> a
+    268:279:void joinPredecessorsWithIdenticalPhis():2576 -> a
     268:279:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    280:280:void joinPredecessorsWithIdenticalPhis():2581:2581 -> a
+    280:280:void joinPredecessorsWithIdenticalPhis():2577:2577 -> a
     280:280:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    281:281:void joinPredecessorsWithIdenticalPhis():2539:2539 -> a
+    281:281:void joinPredecessorsWithIdenticalPhis():2535:2535 -> a
     281:281:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     282:282:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    282:282:void joinPredecessorsWithIdenticalPhis():2539 -> a
+    282:282:void joinPredecessorsWithIdenticalPhis():2535 -> a
     282:282:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    283:327:void joinPredecessorsWithIdenticalPhis():2539:2583 -> a
+    283:327:void joinPredecessorsWithIdenticalPhis():2535:2579 -> a
     283:327:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     328:335:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):600:607 -> a
-    336:336:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1089:1089 -> a
+    336:336:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1085:1085 -> a
     336:336:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):610 -> a
     337:345:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):611:619 -> a
     346:346:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
     347:347:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619:619 -> a
-    348:365:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):616:633 -> a
-    366:366:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1081:1081 -> a
-    366:366:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):633 -> a
-    367:367:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634:634 -> a
-    368:379:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):124:135 -> a
-    368:379:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    368:379:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    380:380:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793:793 -> a
-    380:380:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):135 -> a
-    380:380:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    380:380:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    381:389:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):144:152 -> a
-    381:389:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    381:389:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    390:390:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793:793 -> a
-    390:390:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):152 -> a
-    390:390:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    390:390:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    391:395:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):165:169 -> a
-    391:395:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    391:395:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    396:396:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110:110 -> a
-    396:396:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    397:397:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo.builder(com.android.tools.r8.graph.DexItemFactory):268:268 -> a
-    397:397:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):175 -> a
-    397:397:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):111 -> a
-    397:397:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    398:400:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):175:177 -> a
-    398:400:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):111 -> a
-    398:400:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    401:402:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):116:117 -> a
-    401:402:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    403:407:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):637:641 -> a
-    408:408:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):646:646 -> a
-    409:409:void resolveAndBuildSwitch(int,int,int):833:833 -> a
-    410:410:void add(com.android.tools.r8.ir.code.Instruction):847:847 -> a
-    411:411:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    411:411:void add(com.android.tools.r8.ir.code.Instruction):848 -> a
-    412:412:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):880:880 -> a
-    413:413:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    413:413:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):882 -> a
-    414:417:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):883:886 -> a
-    418:418:void addBooleanNonThisArgument(int):891:891 -> a
-    419:419:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    419:419:void addBooleanNonThisArgument(int):893 -> a
-    420:423:void addBooleanNonThisArgument(int):894:897 -> a
-    424:425:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):902:903 -> a
-    426:426:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    426:426:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):905 -> a
-    427:427:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):906:906 -> a
-    428:431:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):915:918 -> a
-    432:432:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    432:432:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):920 -> a
-    433:436:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):921:924 -> a
-    437:441:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):962:966 -> a
-    442:442:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():573:573 -> a
-    442:442:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):938 -> a
-    442:442:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):967 -> a
-    443:443:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):938:938 -> a
-    443:443:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):967 -> a
-    444:444:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):968:968 -> a
-    445:451:void addDebugPosition(com.android.tools.r8.ir.code.Position):973:979 -> a
-    452:452:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    452:452:void addDebugPosition(com.android.tools.r8.ir.code.Position):979 -> a
-    453:456:void addDebugPosition(com.android.tools.r8.ir.code.Position):981:984 -> a
-    457:457:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    457:457:void addDebugPosition(com.android.tools.r8.ir.code.Position):984 -> a
-    458:459:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1028:1029 -> a
-    460:480:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):151:171 -> a
-    460:480:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    481:481:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):166:166 -> a
-    481:481:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    482:486:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):160:164 -> a
-    482:486:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    487:487:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):162:162 -> a
-    487:487:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    488:488:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):158:158 -> a
-    488:488:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    489:502:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):156:169 -> a
-    489:502:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    503:506:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1031:1034 -> a
-    507:510:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):650:653 -> a
-    507:510:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1035 -> a
-    511:511:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1037:1037 -> a
-    512:516:void addArrayLength(int,int):1041:1045 -> a
-    517:519:void addCheckCast(int,com.android.tools.r8.graph.DexType):1060:1062 -> a
-    520:520:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    520:520:void addCheckCast(int,com.android.tools.r8.graph.DexType):1062 -> a
-    521:524:void addCheckCast(int,com.android.tools.r8.graph.DexType):1063:1066 -> a
-    525:528:void addConst(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int,long):1079:1082 -> a
-    529:537:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1115:1123 -> a
-    538:538:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    538:538:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1122 -> a
-    539:541:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1124:1126 -> a
-    542:542:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1116:1116 -> a
-    543:551:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1130:1138 -> a
-    552:552:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    552:552:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1137 -> a
-    553:555:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1139:1141 -> a
-    556:556:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1131:1131 -> a
-    557:558:void addConstString(int,com.android.tools.r8.graph.DexString):1151:1152 -> a
-    559:559:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1145:1145 -> a
-    559:559:void addConstString(int,com.android.tools.r8.graph.DexString):1153 -> a
-    560:560:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    560:560:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1145 -> a
-    560:560:void addConstString(int,com.android.tools.r8.graph.DexString):1153 -> a
-    561:562:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1146:1147 -> a
-    561:562:void addConstString(int,com.android.tools.r8.graph.DexString):1153 -> a
-    563:563:void addConstString(int,com.android.tools.r8.graph.DexString):1154:1154 -> a
-    564:566:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1159:1161 -> a
-    567:567:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1145:1145 -> a
-    567:567:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1162 -> a
-    568:568:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    568:568:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1145 -> a
-    568:568:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1162 -> a
-    569:570:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1146:1147 -> a
-    569:570:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1162 -> a
-    571:572:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1163:1164 -> a
-    573:575:com.android.tools.r8.ir.code.Monitor addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1191:1193 -> a
-    576:577:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1202:1203 -> a
-    578:578:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    578:578:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1205 -> a
-    579:581:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1206:1208 -> a
-    582:582:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    582:582:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1208 -> a
-    583:583:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1212:1212 -> a
-    584:590:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1309:1315 -> a
-    591:591:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1323:1323 -> a
-    592:595:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1336:1339 -> a
-    592:595:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1321 -> a
-    596:599:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1336:1339 -> a
-    600:604:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1344:1348 -> a
-    605:605:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    605:605:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1348 -> a
-    606:606:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1348:1348 -> a
-    607:611:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1346:1350 -> a
-    612:612:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    612:612:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1352 -> a
-    613:615:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1356:1358 -> a
-    616:616:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    616:616:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1360 -> a
-    617:626:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1372:1381 -> a
-    627:658:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1375:1406 -> a
-    659:663:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1416:1420 -> a
-    664:667:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1419:1422 -> a
-    668:685:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1449:1466 -> a
-    686:690:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1471:1475 -> a
-    691:694:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1474:1477 -> a
-    695:718:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1488:1511 -> a
-    719:735:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1515:1531 -> a
-    736:760:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1552:1576 -> a
-    761:775:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1580:1594 -> a
-    776:776:boolean lambda$addMoveException$1(com.android.tools.r8.ir.code.BasicBlock):1607:1607 -> a
-    777:779:void addNewArrayFilledData(int,int,long,short[]):1679:1681 -> a
-    780:780:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    780:780:void addNewArrayFilledData(int,int,long,short[]):1683 -> a
-    781:781:void addReturn():1708:1708 -> a
-    782:784:void addReturn(com.android.tools.r8.ir.code.Return):1713:1715 -> a
-    782:784:void addReturn():1708 -> a
-    785:788:void addStaticGet(int,com.android.tools.r8.graph.DexField):1719:1722 -> a
-    789:789:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    789:789:void addStaticGet(int,com.android.tools.r8.graph.DexField):1722 -> a
-    790:790:void addStaticGet(int,com.android.tools.r8.graph.DexField):1722:1722 -> a
-    791:795:void addStaticGet(int,com.android.tools.r8.graph.DexField):1720:1724 -> a
-    796:796:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    796:796:void addStaticGet(int,com.android.tools.r8.graph.DexField):1726 -> a
-    797:840:void addSwitch(int,int[],int,int[]):1758:1801 -> a
+    348:361:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):616:629 -> a
+    362:362:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1076:1076 -> a
+    362:362:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):629 -> a
+    363:363:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630:630 -> a
+    364:375:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):124:135 -> a
+    364:375:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    364:375:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    376:376:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793:793 -> a
+    376:376:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):135 -> a
+    376:376:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    376:376:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    377:385:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):144:152 -> a
+    377:385:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    377:385:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    386:386:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793:793 -> a
+    386:386:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):152 -> a
+    386:386:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    386:386:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    387:391:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):165:169 -> a
+    387:391:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    387:391:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    392:392:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110:110 -> a
+    392:392:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    393:393:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo.builder(com.android.tools.r8.graph.DexItemFactory):268:268 -> a
+    393:393:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):175 -> a
+    393:393:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):111 -> a
+    393:393:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    394:396:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):175:177 -> a
+    394:396:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):111 -> a
+    394:396:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    397:398:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):116:117 -> a
+    397:398:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    399:403:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):633:637 -> a
+    404:404:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):642:642 -> a
+    405:405:void resolveAndBuildSwitch(int,int,int):829:829 -> a
+    406:406:void add(com.android.tools.r8.ir.code.Instruction):843:843 -> a
+    407:407:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    407:407:void add(com.android.tools.r8.ir.code.Instruction):844 -> a
+    408:408:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):876:876 -> a
+    409:409:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    409:409:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):878 -> a
+    410:413:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):879:882 -> a
+    414:414:void addBooleanNonThisArgument(int):887:887 -> a
+    415:415:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    415:415:void addBooleanNonThisArgument(int):889 -> a
+    416:419:void addBooleanNonThisArgument(int):890:893 -> a
+    420:421:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):898:899 -> a
+    422:422:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    422:422:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):901 -> a
+    423:423:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):902:902 -> a
+    424:427:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):911:914 -> a
+    428:428:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    428:428:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):916 -> a
+    429:432:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):917:920 -> a
+    433:437:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):958:962 -> a
+    438:438:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():579:579 -> a
+    438:438:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):934 -> a
+    438:438:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):963 -> a
+    439:439:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):934:934 -> a
+    439:439:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):963 -> a
+    440:440:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):964:964 -> a
+    441:447:void addDebugPosition(com.android.tools.r8.ir.code.Position):969:975 -> a
+    448:448:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    448:448:void addDebugPosition(com.android.tools.r8.ir.code.Position):975 -> a
+    449:452:void addDebugPosition(com.android.tools.r8.ir.code.Position):977:980 -> a
+    453:453:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    453:453:void addDebugPosition(com.android.tools.r8.ir.code.Position):980 -> a
+    454:455:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1024:1025 -> a
+    456:476:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):151:171 -> a
+    456:476:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    477:477:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):166:166 -> a
+    477:477:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    478:482:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):160:164 -> a
+    478:482:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    483:483:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):162:162 -> a
+    483:483:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    484:484:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):158:158 -> a
+    484:484:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    485:498:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):156:169 -> a
+    485:498:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    499:502:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1027:1030 -> a
+    503:506:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):646:649 -> a
+    503:506:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1031 -> a
+    507:507:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1033:1033 -> a
+    508:512:void addArrayLength(int,int):1037:1041 -> a
+    513:515:void addCheckCast(int,com.android.tools.r8.graph.DexType):1056:1058 -> a
+    516:516:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    516:516:void addCheckCast(int,com.android.tools.r8.graph.DexType):1058 -> a
+    517:520:void addCheckCast(int,com.android.tools.r8.graph.DexType):1059:1062 -> a
+    521:524:void addConst(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int,long):1075:1078 -> a
+    525:533:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1111:1119 -> a
+    534:534:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    534:534:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1118 -> a
+    535:537:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1120:1122 -> a
+    538:538:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1112:1112 -> a
+    539:547:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1126:1134 -> a
+    548:548:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    548:548:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1133 -> a
+    549:551:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1135:1137 -> a
+    552:552:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1127:1127 -> a
+    553:554:void addConstString(int,com.android.tools.r8.graph.DexString):1147:1148 -> a
+    555:555:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141:1141 -> a
+    555:555:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
+    556:556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    556:556:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
+    556:556:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
+    557:558:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
+    557:558:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
+    559:559:void addConstString(int,com.android.tools.r8.graph.DexString):1150:1150 -> a
+    560:562:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1155:1157 -> a
+    563:563:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141:1141 -> a
+    563:563:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
+    564:564:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    564:564:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
+    564:564:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
+    565:566:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
+    565:566:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
+    567:568:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1159:1160 -> a
+    569:571:com.android.tools.r8.ir.code.Monitor addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1187:1189 -> a
+    572:573:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1198:1199 -> a
+    574:574:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    574:574:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1201 -> a
+    575:577:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1202:1204 -> a
+    578:578:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    578:578:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1204 -> a
+    579:579:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1208:1208 -> a
+    580:586:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1305:1311 -> a
+    587:587:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1319:1319 -> a
+    588:591:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1332:1335 -> a
+    588:591:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1317 -> a
+    592:595:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1332:1335 -> a
+    596:600:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1340:1344 -> a
+    601:601:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    601:601:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1344 -> a
+    602:602:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1344:1344 -> a
+    603:608:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1342:1347 -> a
+    609:609:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    609:609:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1348 -> a
+    610:613:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1352:1355 -> a
+    614:614:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    614:614:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1356 -> a
+    615:624:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1368:1377 -> a
+    625:656:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1371:1402 -> a
+    657:661:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1412:1416 -> a
+    662:665:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1415:1418 -> a
+    666:683:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1445:1462 -> a
+    684:688:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1467:1471 -> a
+    689:692:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1470:1473 -> a
+    693:716:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1484:1507 -> a
+    717:733:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1511:1527 -> a
+    734:758:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1548:1572 -> a
+    759:773:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1576:1590 -> a
+    774:774:boolean lambda$addMoveException$1(com.android.tools.r8.ir.code.BasicBlock):1603:1603 -> a
+    775:778:void addNewArrayFilledData(int,int,long,short[]):1675:1678 -> a
+    779:779:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    779:779:void addNewArrayFilledData(int,int,long,short[]):1679 -> a
+    780:780:void addReturn():1704:1704 -> a
+    781:783:void addReturn(com.android.tools.r8.ir.code.Return):1709:1711 -> a
+    781:783:void addReturn():1704 -> a
+    784:787:void addStaticGet(int,com.android.tools.r8.graph.DexField):1715:1718 -> a
+    788:788:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    788:788:void addStaticGet(int,com.android.tools.r8.graph.DexField):1718 -> a
+    789:789:void addStaticGet(int,com.android.tools.r8.graph.DexField):1718:1718 -> a
+    790:795:void addStaticGet(int,com.android.tools.r8.graph.DexField):1716:1721 -> a
+    796:796:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    796:796:void addStaticGet(int,com.android.tools.r8.graph.DexField):1722 -> a
+    797:840:void addSwitch(int,int[],int,int[]):1754:1797 -> a
     841:841:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
     841:841:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    841:841:void addSwitch(int,int[],int,int[]):1806 -> a
+    841:841:void addSwitch(int,int[],int,int[]):1802 -> a
     842:842:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
     842:842:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    842:842:void addSwitch(int,int[],int,int[]):1807 -> a
-    843:847:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1814:1818 -> a
-    843:847:void addSwitch(int,int[],int,int[]):1808 -> a
-    848:848:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> a
-    848:848:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1820 -> a
-    848:848:void addSwitch(int,int[],int,int[]):1808 -> a
-    849:872:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1821:1844 -> a
-    849:872:void addSwitch(int,int[],int,int[]):1808 -> a
-    873:873:void addSwitch(int,int[],int,int[]):1809:1809 -> a
-    874:875:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014:2015 -> a
-    876:895:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2030:2049 -> a
-    876:895:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    896:896:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095:2095 -> a
-    896:896:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    896:896:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    842:842:void addSwitch(int,int[],int,int[]):1803 -> a
+    843:847:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1810:1814 -> a
+    843:847:void addSwitch(int,int[],int,int[]):1804 -> a
+    848:848:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
+    848:848:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1816 -> a
+    848:848:void addSwitch(int,int[],int,int[]):1804 -> a
+    849:872:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1817:1840 -> a
+    849:872:void addSwitch(int,int[],int,int[]):1804 -> a
+    873:873:void addSwitch(int,int[],int,int[]):1805:1805 -> a
+    874:875:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2010:2011 -> a
+    876:895:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2026:2045 -> a
+    876:895:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    896:896:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2091:2091 -> a
+    896:896:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    896:896:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     897:897:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
-    897:897:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
-    897:897:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    897:897:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    898:898:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095:2095 -> a
-    898:898:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    898:898:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    897:897:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2091 -> a
+    897:897:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    897:897:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    898:898:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2091:2091 -> a
+    898:898:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    898:898:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     899:899:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
-    899:899:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
-    899:899:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    899:899:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    899:899:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2091 -> a
+    899:899:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    899:899:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     900:900:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
-    900:900:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2097 -> a
-    900:900:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    900:900:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    901:901:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2098:2098 -> a
-    901:901:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    901:901:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    900:900:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2093 -> a
+    900:900:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    900:900:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    901:901:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2094:2094 -> a
+    901:901:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    901:901:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     902:912:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():161:171 -> a
-    902:912:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
-    902:912:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    902:912:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    902:912:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
+    902:912:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    902:912:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     913:913:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():167:167 -> a
-    913:913:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
-    913:913:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    913:913:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    913:913:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
+    913:913:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    913:913:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     914:914:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():165:165 -> a
-    914:914:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
-    914:914:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    914:914:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    914:914:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
+    914:914:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    914:914:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     915:915:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():163:163 -> a
-    915:915:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
-    915:915:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    915:915:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    916:934:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2100:2118 -> a
-    916:934:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    916:934:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
+    915:915:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
+    915:915:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    915:915:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    916:934:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2096:2114 -> a
+    916:934:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    916:934:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
     935:935:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
-    935:935:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2097 -> a
-    935:935:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    935:935:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    936:938:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2086:2088 -> a
-    936:938:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2056 -> a
-    936:938:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    939:963:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2057:2081 -> a
-    939:963:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    964:964:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    964:964:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):989 -> a
-    965:965:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    965:965:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):990 -> a
-    966:966:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):991:991 -> a
-    967:967:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> a
-    967:967:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):991 -> a
-    968:968:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):992:992 -> a
-    969:969:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    969:969:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):994 -> a
-    970:970:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    970:970:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1070 -> a
-    971:971:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    971:971:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1071 -> a
-    972:975:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1072:1075 -> a
-    976:976:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    976:976:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1970 -> a
-    977:977:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1971:1971 -> a
-    978:978:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> a
-    978:978:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1971 -> a
-    979:979:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1972:1972 -> a
-    980:980:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    980:980:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1974 -> a
-    981:981:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    981:981:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1646 -> a
-    982:982:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1647:1647 -> a
-    983:983:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> a
-    983:983:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1647 -> a
-    984:984:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1648:1648 -> a
-    985:985:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    985:985:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1650 -> a
-    986:989:com.android.tools.r8.ir.code.Value readIntLiteral(long):2143:2146 -> a
-    990:992:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2153:2155 -> a
-    993:993:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2182:2182 -> a
-    993:993:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1980 -> a
-    994:998:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1981:1985 -> a
-    999:999:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():573:573 -> a
-    999:999:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1985 -> a
-    1000:1010:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1986:1996 -> a
-    1011:1015:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1994:1998 -> a
-    1016:1016:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2182:2182 -> a
-    1016:1016:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2160 -> a
-    1017:1017:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    1017:1017:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2161 -> a
-    1018:1019:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2173:2174 -> a
-    1020:1020:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256:2256 -> a
-    1021:1023:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2288:2290 -> a
-    1021:1023:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256 -> a
-    1024:1030:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2288:2294 -> a
-    1024:1030:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256 -> a
-    1031:1031:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2291:2291 -> a
-    1031:1031:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256 -> a
-    1032:1057:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2257:2282 -> a
-    1058:1062:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2271:2275 -> a
-    1063:1069:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2273:2279 -> a
-    1070:1070:boolean isOffsetProcessed(int):2357:2357 -> a
-    1070:1070:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2350 -> a
-    1070:1070:void ensureSuccessorBlock(int,int,boolean):2386 -> a
-    1071:1073:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2351:2353 -> a
-    1071:1073:void ensureSuccessorBlock(int,int,boolean):2386 -> a
-    1074:1077:int getBlockStartOffset(int):2341:2344 -> a
-    1074:1077:void ensureSuccessorBlock(int,int,boolean):2387 -> a
-    1078:1078:void ensureSuccessorBlock(int,int,boolean):2388:2388 -> a
+    935:935:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2093 -> a
+    935:935:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    935:935:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    936:938:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2082:2084 -> a
+    936:938:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2052 -> a
+    936:938:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    939:963:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2053:2077 -> a
+    939:963:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    964:964:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    964:964:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):985 -> a
+    965:965:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    965:965:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):986 -> a
+    966:966:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):987:987 -> a
+    967:967:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
+    967:967:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):987 -> a
+    968:968:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):988:988 -> a
+    969:969:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    969:969:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):990 -> a
+    970:970:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    970:970:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1066 -> a
+    971:971:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    971:971:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1067 -> a
+    972:975:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1068:1071 -> a
+    976:976:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    976:976:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1966 -> a
+    977:977:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967:1967 -> a
+    978:978:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
+    978:978:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967 -> a
+    979:979:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1968:1968 -> a
+    980:980:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    980:980:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1970 -> a
+    981:981:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    981:981:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1642 -> a
+    982:982:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643:1643 -> a
+    983:983:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
+    983:983:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643 -> a
+    984:984:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1644:1644 -> a
+    985:985:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    985:985:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1646 -> a
+    986:989:com.android.tools.r8.ir.code.Value readIntLiteral(long):2139:2142 -> a
+    990:992:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2149:2151 -> a
+    993:993:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
+    993:993:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1976 -> a
+    994:998:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1977:1981 -> a
+    999:999:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():579:579 -> a
+    999:999:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1981 -> a
+    1000:1010:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1982:1992 -> a
+    1011:1015:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1990:1994 -> a
+    1016:1016:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
+    1016:1016:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2156 -> a
+    1017:1017:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    1017:1017:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2157 -> a
+    1018:1019:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2169:2170 -> a
+    1020:1020:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252:2252 -> a
+    1021:1023:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2286 -> a
+    1021:1023:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1024:1030:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2290 -> a
+    1024:1030:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1031:1031:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2287:2287 -> a
+    1031:1031:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1032:1057:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2253:2278 -> a
+    1058:1062:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2267:2271 -> a
+    1063:1069:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2269:2275 -> a
+    1070:1070:boolean isOffsetProcessed(int):2353:2353 -> a
+    1070:1070:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2346 -> a
+    1070:1070:void ensureSuccessorBlock(int,int,boolean):2382 -> a
+    1071:1073:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2347:2349 -> a
+    1071:1073:void ensureSuccessorBlock(int,int,boolean):2382 -> a
+    1074:1077:int getBlockStartOffset(int):2337:2340 -> a
+    1074:1077:void ensureSuccessorBlock(int,int,boolean):2383 -> a
+    1078:1078:void ensureSuccessorBlock(int,int,boolean):2384:2384 -> a
     1079:1079:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):280:280 -> a
-    1079:1079:void ensureSuccessorBlock(int,int,boolean):2390 -> a
+    1079:1079:void ensureSuccessorBlock(int,int,boolean):2386 -> a
     1080:1080:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):276:276 -> a
-    1080:1080:void ensureSuccessorBlock(int,int,boolean):2391 -> a
+    1080:1080:void ensureSuccessorBlock(int,int,boolean):2387 -> a
     1081:1081:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):293:293 -> a
-    1081:1081:void ensureSuccessorBlock(int,int,boolean):2393 -> a
+    1081:1081:void ensureSuccessorBlock(int,int,boolean):2389 -> a
     1082:1082:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> a
-    1082:1082:void ensureSuccessorBlock(int,int,boolean):2394 -> a
-    1083:1083:void ensureSuccessorBlock(int,int,boolean):2396:2396 -> a
-    1084:1084:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> a
-    1084:1084:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1280 -> a
-    1085:1085:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> a
-    1085:1085:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1281 -> a
-    1086:1091:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1282:1287 -> a
-    1092:1095:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435:2438 -> a
-    1096:1096:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2437:2437 -> a
-    1097:1099:void generateSplitEdgeBlocks():2452:2454 -> a
-    1097:1099:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1100:1100:int getOffset(com.android.tools.r8.ir.code.BasicBlock):2422:2422 -> a
-    1100:1100:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2414 -> a
-    1100:1100:void generateSplitEdgeBlocks():2454 -> a
-    1100:1100:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2410:2410 -> a
-    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2414 -> a
-    1101:1101:void generateSplitEdgeBlocks():2454 -> a
-    1101:1101:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1102:1102:void generateSplitEdgeBlocks():2455:2455 -> a
-    1102:1102:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
+    1082:1082:void ensureSuccessorBlock(int,int,boolean):2390 -> a
+    1083:1083:void ensureSuccessorBlock(int,int,boolean):2392:2392 -> a
+    1084:1084:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
+    1084:1084:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1276 -> a
+    1085:1085:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
+    1085:1085:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1277 -> a
+    1086:1091:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1278:1283 -> a
+    1092:1095:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2431:2434 -> a
+    1096:1096:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2433:2433 -> a
+    1097:1099:void generateSplitEdgeBlocks():2448:2450 -> a
+    1097:1099:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1100:1100:int getOffset(com.android.tools.r8.ir.code.BasicBlock):2418:2418 -> a
+    1100:1100:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
+    1100:1100:void generateSplitEdgeBlocks():2450 -> a
+    1100:1100:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
+    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
+    1101:1101:void generateSplitEdgeBlocks():2450 -> a
+    1101:1101:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1102:1102:void generateSplitEdgeBlocks():2451:2451 -> a
+    1102:1102:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
     1103:1104:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():308:309 -> a
-    1103:1104:void generateSplitEdgeBlocks():2456 -> a
-    1103:1104:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1105:1105:void generateSplitEdgeBlocks():2459:2459 -> a
-    1105:1105:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1106:1106:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2410:2410 -> a
-    1106:1106:void generateSplitEdgeBlocks():2460 -> a
-    1106:1106:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
+    1103:1104:void generateSplitEdgeBlocks():2452 -> a
+    1103:1104:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1105:1105:void generateSplitEdgeBlocks():2455:2455 -> a
+    1105:1105:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1106:1106:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
+    1106:1106:void generateSplitEdgeBlocks():2456 -> a
+    1106:1106:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
     1107:1107:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():297:297 -> a
-    1107:1107:void generateSplitEdgeBlocks():2461 -> a
-    1107:1107:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1108:1118:void generateSplitEdgeBlocks():2464:2474 -> a
-    1108:1118:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1119:1127:void generateSplitEdgeBlocks():2471:2479 -> a
-    1119:1127:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1128:1133:com.android.tools.r8.ir.code.BasicBlock createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2495:2500 -> a
-    1128:1133:void generateSplitEdgeBlocks():2479 -> a
-    1128:1133:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1134:1144:void generateSplitEdgeBlocks():2480:2490 -> a
-    1134:1144:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
+    1107:1107:void generateSplitEdgeBlocks():2457 -> a
+    1107:1107:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1108:1118:void generateSplitEdgeBlocks():2460:2470 -> a
+    1108:1118:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1119:1127:void generateSplitEdgeBlocks():2467:2475 -> a
+    1119:1127:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1128:1133:com.android.tools.r8.ir.code.BasicBlock createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2491:2496 -> a
+    1128:1133:void generateSplitEdgeBlocks():2475 -> a
+    1128:1133:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1134:1144:void generateSplitEdgeBlocks():2476:2486 -> a
+    1134:1144:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
     1145:1147:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():301:303 -> a
-    1145:1147:void generateSplitEdgeBlocks():2490 -> a
-    1145:1147:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1148:1148:void generateSplitEdgeBlocks():2490:2490 -> a
-    1148:1148:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1149:1149:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    1149:1149:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2440 -> a
-    1150:1150:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2441:2441 -> a
-    1151:1151:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2589:2589 -> a
-    1:2:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):870:871 -> b
-    3:3:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> b
-    3:3:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):872 -> b
-    4:5:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):873:874 -> b
-    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    6:6:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):874 -> b
-    7:8:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):875:876 -> b
-    9:9:void addConstantOrUnusedArgument(int):910:910 -> b
-    10:12:void flushArgumentInstructions():929:931 -> b
-    13:26:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):942:955 -> b
-    27:29:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):954:956 -> b
-    30:30:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    30:30:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):957 -> b
-    31:31:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):998:998 -> b
-    32:32:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> b
-    32:32:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):999 -> b
-    33:34:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1000:1001 -> b
-    35:35:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> b
-    35:35:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1001 -> b
-    36:36:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1002:1002 -> b
-    37:37:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    37:37:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1004 -> b
-    38:42:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1049:1053 -> b
-    43:46:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):650:653 -> b
-    43:46:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1054 -> b
-    47:47:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1056:1056 -> b
-    48:53:void addConstClass(int,com.android.tools.r8.graph.DexType):1106:1111 -> b
-    54:57:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1364:1367 -> b
-    58:58:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1535:1535 -> b
-    59:59:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> b
-    59:59:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1535 -> b
-    60:66:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1535:1541 -> b
-    67:70:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1668:1671 -> b
+    1145:1147:void generateSplitEdgeBlocks():2486 -> a
+    1145:1147:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1148:1148:void generateSplitEdgeBlocks():2486:2486 -> a
+    1148:1148:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1149:1149:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    1149:1149:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2436 -> a
+    1150:1150:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2437:2437 -> a
+    1151:1151:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2585:2585 -> a
+    1:2:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):866:867 -> b
+    3:3:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> b
+    3:3:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):868 -> b
+    4:5:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):869:870 -> b
+    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    6:6:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):870 -> b
+    7:8:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):871:872 -> b
+    9:9:void addConstantOrUnusedArgument(int):906:906 -> b
+    10:12:void flushArgumentInstructions():925:927 -> b
+    13:26:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):938:951 -> b
+    27:29:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):950:952 -> b
+    30:30:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    30:30:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):953 -> b
+    31:31:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):994:994 -> b
+    32:32:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> b
+    32:32:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):995 -> b
+    33:34:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):996:997 -> b
+    35:35:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> b
+    35:35:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):997 -> b
+    36:36:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):998:998 -> b
+    37:37:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    37:37:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1000 -> b
+    38:42:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1045:1049 -> b
+    43:46:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):646:649 -> b
+    43:46:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1050 -> b
+    47:47:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1052:1052 -> b
+    48:53:void addConstClass(int,com.android.tools.r8.graph.DexType):1102:1107 -> b
+    54:57:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1360:1363 -> b
+    58:58:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1531 -> b
+    59:59:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    59:59:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531 -> b
+    60:66:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1537 -> b
+    67:70:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1664:1667 -> b
     71:71:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> b
-    71:71:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1671 -> b
-    72:73:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1672:1673 -> b
-    74:74:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    74:74:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1675 -> b
-    75:78:void addStaticPut(int,com.android.tools.r8.graph.DexField):1730:1733 -> b
-    79:79:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> b
-    79:79:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1654 -> b
-    80:80:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1655:1655 -> b
-    81:81:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> b
-    81:81:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1655 -> b
-    82:85:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1657:1660 -> b
-    86:89:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2127:2130 -> b
-    86:89:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1660 -> b
-    90:93:com.android.tools.r8.ir.code.Value readLongLiteral(long):2136:2139 -> b
-    90:93:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2131 -> b
-    90:93:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1660 -> b
-    94:96:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1661:1663 -> b
-    97:97:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    97:97:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1664 -> b
-    98:98:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    99:99:void ensureExceptionalSuccessorBlock(int,int):2404:2404 -> b
-    100:100:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2593:2593 -> b
+    71:71:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1667 -> b
+    72:74:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1668:1670 -> b
+    75:75:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    75:75:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1671 -> b
+    76:79:void addStaticPut(int,com.android.tools.r8.graph.DexField):1726:1729 -> b
+    80:80:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> b
+    80:80:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1650 -> b
+    81:81:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651:1651 -> b
+    82:82:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> b
+    82:82:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651 -> b
+    83:86:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1653:1656 -> b
+    87:90:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2123:2126 -> b
+    87:90:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
+    91:94:com.android.tools.r8.ir.code.Value readLongLiteral(long):2132:2135 -> b
+    91:94:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2127 -> b
+    91:94:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
+    95:97:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1657:1659 -> b
+    98:98:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    98:98:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1660 -> b
+    99:99:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    100:100:void ensureExceptionalSuccessorBlock(int,int):2400:2400 -> b
+    101:101:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2589:2589 -> b
     1:2:java.util.List getArgumentValues():482:483 -> c
-    3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1008:1008 -> c
-    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> c
-    4:4:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1009 -> c
-    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> c
-    5:5:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1010 -> c
-    6:6:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1011:1011 -> c
-    7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> c
-    7:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1011 -> c
-    8:8:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1012:1012 -> c
-    9:9:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> c
-    9:9:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1014 -> c
-    10:10:void addNewInstance(int,com.android.tools.r8.graph.DexType):1688:1688 -> c
+    3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1004:1004 -> c
+    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> c
+    4:4:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1005 -> c
+    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> c
+    5:5:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1006 -> c
+    6:6:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1007:1007 -> c
+    7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> c
+    7:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1007 -> c
+    8:8:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1008:1008 -> c
+    9:9:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
+    9:9:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1010 -> c
+    10:10:void addNewInstance(int,com.android.tools.r8.graph.DexType):1684:1684 -> c
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> c
-    11:11:void addNewInstance(int,com.android.tools.r8.graph.DexType):1688 -> c
-    12:13:void addNewInstance(int,com.android.tools.r8.graph.DexType):1689:1690 -> c
-    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> c
-    14:14:void addNewInstance(int,com.android.tools.r8.graph.DexType):1692 -> c
-    15:17:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2003:2005 -> c
-    18:35:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2299:2316 -> c
-    36:36:void ensureNormalSuccessorBlock(int,int):2400:2400 -> c
-    37:37:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> c
-    37:37:void addGoto(int):1258 -> c
-    38:41:void addGoto(int):1259:1262 -> c
+    11:11:void addNewInstance(int,com.android.tools.r8.graph.DexType):1684 -> c
+    12:14:void addNewInstance(int,com.android.tools.r8.graph.DexType):1685:1687 -> c
+    15:15:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
+    15:15:void addNewInstance(int,com.android.tools.r8.graph.DexType):1688 -> c
+    16:18:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):1999:2001 -> c
+    19:36:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2295:2312 -> c
+    37:37:void ensureNormalSuccessorBlock(int,int):2396:2396 -> c
+    38:38:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> c
+    38:38:void addGoto(int):1254 -> c
+    39:42:void addGoto(int):1255:1258 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getCFG():478:478 -> d
     2:2:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):576:576 -> d
-    3:3:void resolveAndBuildNewArrayFilledData(int,int):838:838 -> d
-    4:4:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1018:1018 -> d
-    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> d
-    5:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1019 -> d
-    6:7:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1020:1021 -> d
-    8:8:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> d
-    8:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1021 -> d
-    9:9:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1022:1022 -> d
-    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> d
-    10:10:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1024 -> d
-    11:16:void addMoveException(int):1606:1611 -> d
-    17:22:boolean verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1615:1620 -> d
-    17:22:void addMoveException(int):1611 -> d
+    3:3:void resolveAndBuildNewArrayFilledData(int,int):834:834 -> d
+    4:4:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1014:1014 -> d
+    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> d
+    5:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1015 -> d
+    6:7:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1016:1017 -> d
+    8:8:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> d
+    8:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1017 -> d
+    9:9:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1018:1018 -> d
+    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> d
+    10:10:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1020 -> d
+    11:16:void addMoveException(int):1602:1607 -> d
+    17:22:boolean verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1611:1616 -> d
+    17:22:void addMoveException(int):1607 -> d
     1:1:com.android.tools.r8.ir.code.Value getReceiverValue():487:487 -> e
-    2:2:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1168:1168 -> e
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> e
-    3:3:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1169 -> e
-    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> e
-    4:4:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1170 -> e
-    5:5:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1172:1172 -> e
-    6:6:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> e
-    6:6:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1171 -> e
-    7:9:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1173:1175 -> e
-    10:10:void addTrivialIf(int,int):1266:1266 -> e
-    11:11:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> e
-    11:11:void addTrivialIf(int,int):1270 -> e
-    12:15:void addTrivialIf(int,int):1273:1276 -> e
-    16:19:void addMoveResult(int):1626:1629 -> e
+    2:2:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1164:1164 -> e
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> e
+    3:3:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1165 -> e
+    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> e
+    4:4:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1166 -> e
+    5:5:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1168:1168 -> e
+    6:6:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> e
+    6:6:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1167 -> e
+    7:9:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1169:1171 -> e
+    10:10:void addTrivialIf(int,int):1262:1262 -> e
+    11:11:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> e
+    11:11:void addTrivialIf(int,int):1266 -> e
+    12:15:void addTrivialIf(int,int):1269:1272 -> e
+    16:19:void addMoveResult(int):1622:1625 -> e
     20:20:boolean com.android.tools.r8.ir.code.Invoke.instructionTypeCanThrow():0:0 -> e
-    20:20:void addMoveResult(int):1629 -> e
-    21:25:void addMoveResult(int):1630:1634 -> e
-    26:33:void addMoveResult(int):1633:1640 -> e
+    20:20:void addMoveResult(int):1625 -> e
+    21:25:void addMoveResult(int):1626:1630 -> e
+    26:33:void addMoveResult(int):1629:1636 -> e
     34:34:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> e
-    34:34:void addMoveResult(int):1640 -> e
-    35:36:void addMoveResult(int):1641:1642 -> e
+    34:34:void addMoveResult(int):1636 -> e
+    35:36:void addMoveResult(int):1637:1638 -> e
     1:1:boolean isDebugMode():474:474 -> f
-    2:2:void addNullConst(int):1102:1102 -> f
-    3:4:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1179:1180 -> f
-    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> f
-    5:5:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1181 -> f
-    6:8:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1182:1184 -> f
-    9:9:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> f
-    9:9:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1183 -> f
-    10:12:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1185:1187 -> f
-    13:13:void checkInvokeArgumentRegisters(int,int):1599:1599 -> f
+    2:2:void addNullConst(int):1098:1098 -> f
+    3:4:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1175:1176 -> f
+    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> f
+    5:5:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1177 -> f
+    6:8:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1178:1180 -> f
+    9:9:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> f
+    9:9:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1179 -> f
+    10:12:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1181:1183 -> f
+    13:13:void checkInvokeArgumentRegisters(int,int):1595:1595 -> f
     14:14:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> f
-    14:14:void checkInvokeArgumentRegisters(int,int):1599 -> f
-    15:15:void checkInvokeArgumentRegisters(int,int):1599:1599 -> f
-    1:8:void addReturn(int):1696:1703 -> g
-    9:11:void addReturn(com.android.tools.r8.ir.code.Return):1713:1715 -> g
-    9:11:void addReturn(int):1703 -> g
-    12:12:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> g
-    12:12:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1216 -> g
-    13:13:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> g
-    13:13:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1217 -> g
-    14:14:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1218:1218 -> g
-    15:15:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> g
-    15:15:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1218 -> g
-    16:16:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1219:1219 -> g
-    17:17:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> g
-    17:17:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1221 -> g
-    18:19:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2426:2427 -> g
+    14:14:void checkInvokeArgumentRegisters(int,int):1595 -> f
+    15:15:void checkInvokeArgumentRegisters(int,int):1595:1595 -> f
+    1:8:void addReturn(int):1692:1699 -> g
+    9:11:void addReturn(com.android.tools.r8.ir.code.Return):1709:1711 -> g
+    9:11:void addReturn(int):1699 -> g
+    12:12:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> g
+    12:12:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1212 -> g
+    13:13:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> g
+    13:13:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1213 -> g
+    14:14:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1214:1214 -> g
+    15:15:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> g
+    15:15:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1214 -> g
+    16:16:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1215:1215 -> g
+    17:17:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> g
+    17:17:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1217 -> g
+    18:19:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2422:2423 -> g
     20:20:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):498:498 -> g
-    20:20:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2428 -> g
-    21:23:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2429:2431 -> g
-    1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo getRemovedArgumentInfo():852:857 -> h
-    7:9:void addThisArgument(int):862:864 -> h
+    20:20:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2424 -> g
+    21:23:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2425:2427 -> g
+    1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo getRemovedArgumentInfo():848:853 -> h
+    7:9:void addThisArgument(int):858:860 -> h
     10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> h
-    10:10:void addThisArgument(int):865 -> h
-    11:11:void addThisArgument(int):866:866 -> h
-    12:12:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1225:1225 -> h
-    13:13:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> h
-    13:13:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1226 -> h
-    14:15:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1227:1228 -> h
-    16:16:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> h
-    16:16:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1228 -> h
-    17:17:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1229:1229 -> h
-    18:18:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> h
-    18:18:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1231 -> h
-    1:5:void addThrow(int):1848:1852 -> i
-    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> i
-    6:6:void addThrow(int):1852 -> i
-    7:7:void addThrow(int):1853:1853 -> i
-    8:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1857:1857 -> i
-    9:9:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> i
-    9:9:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1858 -> i
-    10:10:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> i
-    10:10:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1859 -> i
-    11:11:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1860:1860 -> i
-    12:12:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> i
-    12:12:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1860 -> i
-    13:13:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1861:1861 -> i
-    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> i
-    14:14:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1863 -> i
-    1:1:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1867:1867 -> j
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> j
-    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1868 -> j
-    3:4:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1869:1870 -> j
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> j
-    5:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1870 -> j
-    6:6:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1871:1871 -> j
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> j
-    7:7:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1873 -> j
-    8:9:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2323:2324 -> j
-    10:10:boolean isOffsetProcessed(int):2357:2357 -> j
-    10:10:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2327 -> j
-    11:14:int getBlockStartOffset(int):2341:2344 -> j
-    11:14:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2328 -> j
-    15:16:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2329:2330 -> j
+    10:10:void addThisArgument(int):861 -> h
+    11:11:void addThisArgument(int):862:862 -> h
+    12:12:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1221:1221 -> h
+    13:13:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> h
+    13:13:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1222 -> h
+    14:15:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1223:1224 -> h
+    16:16:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> h
+    16:16:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1224 -> h
+    17:17:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1225:1225 -> h
+    18:18:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> h
+    18:18:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1227 -> h
+    1:5:void addThrow(int):1844:1848 -> i
+    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> i
+    6:6:void addThrow(int):1848 -> i
+    7:7:void addThrow(int):1849:1849 -> i
+    8:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1853:1853 -> i
+    9:9:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> i
+    9:9:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1854 -> i
+    10:10:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> i
+    10:10:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1855 -> i
+    11:11:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1856:1856 -> i
+    12:12:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> i
+    12:12:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1856 -> i
+    13:13:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1857:1857 -> i
+    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> i
+    14:14:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1859 -> i
+    1:1:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1863:1863 -> j
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> j
+    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1864 -> j
+    3:4:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1865:1866 -> j
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> j
+    5:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1866 -> j
+    6:6:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1867:1867 -> j
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> j
+    7:7:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1869 -> j
+    8:9:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2319:2320 -> j
+    10:10:boolean isOffsetProcessed(int):2353:2353 -> j
+    10:10:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2323 -> j
+    11:14:int getBlockStartOffset(int):2337:2340 -> j
+    11:14:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2324 -> j
+    15:16:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2325:2326 -> j
     17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:315 -> j
-    17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    17:18:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     19:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
     19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315 -> j
-    19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    19:20:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     21:26:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315:320 -> j
-    21:26:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    21:26:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     27:28:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):284:285 -> j
     27:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):321 -> j
-    27:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    27:28:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):323:324 -> j
-    29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    29:30:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     31:32:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
     31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324 -> j
-    31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    31:32:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     33:37:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324:328 -> j
-    33:37:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    33:37:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     38:38:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> j
     38:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):329 -> j
-    38:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    38:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
-    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     40:41:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):76:77 -> j
     40:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331 -> j
-    40:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    40:41:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     42:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
-    42:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    42:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:314 -> j
-    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
-    44:47:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2332:2335 -> j
-    1:1:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1235:1235 -> k
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> k
-    2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1236 -> k
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> k
-    3:3:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1237 -> k
-    4:4:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1239:1239 -> k
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> k
-    5:5:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1238 -> k
-    6:7:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1240:1241 -> k
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> k
-    8:8:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1242 -> k
-    9:10:void checkRegister(int):2193:2194 -> k
+    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    44:47:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2328:2331 -> j
+    1:1:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1231:1231 -> k
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> k
+    2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1232 -> k
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> k
+    3:3:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1233 -> k
+    4:4:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1235:1235 -> k
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> k
+    5:5:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1234 -> k
+    6:7:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1236:1237 -> k
+    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> k
+    8:8:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1238 -> k
+    9:10:void checkRegister(int):2189:2190 -> k
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> k
-    11:11:void checkRegister(int):2194 -> k
-    12:12:void checkRegister(int):2194:2194 -> k
-    13:13:void checkRegister(int):2191:2191 -> k
-    1:2:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1246:1247 -> l
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> l
-    3:3:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1248 -> l
-    4:6:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1249:1251 -> l
-    7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> l
-    7:7:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1250 -> l
-    8:9:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1252:1253 -> l
-    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> l
-    10:10:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1254 -> l
-    11:11:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> l
-    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1746:1746 -> m
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> m
-    2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1747 -> m
-    3:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1748:1749 -> m
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> m
-    5:5:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1749 -> m
-    6:6:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1752:1752 -> m
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> m
-    7:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1754 -> m
-    8:9:boolean isIndexProcessed(int):2361:2362 -> m
-    10:11:void ensureSubroutineProcessedInstructions():2379:2380 -> m
-    10:11:boolean isIndexProcessed(int):2364 -> m
-    12:12:boolean isIndexProcessed(int):2365:2365 -> m
-    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1877:1877 -> n
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> n
-    2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1878 -> n
-    3:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1879:1880 -> n
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> n
-    5:5:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1880 -> n
-    6:6:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1881:1881 -> n
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> n
-    7:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1883 -> n
-    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1887:1887 -> o
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> o
-    2:2:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1888 -> o
-    3:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1889:1890 -> o
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> o
-    5:5:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1890 -> o
-    6:6:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1891:1891 -> o
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> o
-    7:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1893 -> o
-    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1897:1897 -> p
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> p
-    2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1898 -> p
-    3:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1899:1900 -> p
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> p
-    5:5:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1900 -> p
-    6:6:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1901:1901 -> p
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> p
-    7:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1903 -> p
-    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1907:1907 -> q
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> q
-    2:2:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1908 -> q
-    3:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1909:1910 -> q
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> q
-    5:5:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1910 -> q
-    6:6:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1911:1911 -> q
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> q
-    7:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1913 -> q
-    1:1:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> r
-    1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1737 -> r
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> r
-    2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1738 -> r
-    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1739:1739 -> r
-    4:4:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> r
-    4:4:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1739 -> r
-    5:5:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1740:1740 -> r
-    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> r
-    6:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1742 -> r
-    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1917:1917 -> s
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> s
-    2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1918 -> s
-    3:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1919:1920 -> s
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> s
-    5:5:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1920 -> s
-    6:6:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1921:1921 -> s
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> s
-    7:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1923 -> s
-    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1927:1927 -> t
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> t
-    2:2:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1928 -> t
-    3:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1929:1930 -> t
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> t
-    5:5:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1930 -> t
-    6:6:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1931:1931 -> t
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> t
-    7:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1933 -> t
-    1:7:java.lang.String toString():2602:2608 -> toString
-    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1937:1937 -> u
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> u
-    2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1938 -> u
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> u
-    3:3:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1939 -> u
-    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1940:1940 -> u
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> u
-    5:5:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1940 -> u
-    6:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1942:1949 -> u
-    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> u
-    14:14:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1950 -> u
-    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1954:1954 -> v
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> v
-    2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1955 -> v
-    3:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1957:1958 -> v
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> v
-    5:5:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1958 -> v
-    6:9:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1959:1962 -> v
-    10:10:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> v
-    10:10:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1962 -> v
-    11:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1963:1965 -> v
-    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> v
-    14:14:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1966 -> v
-com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.D.c.S:
+    11:11:void checkRegister(int):2190 -> k
+    12:12:void checkRegister(int):2190:2190 -> k
+    13:13:void checkRegister(int):2187:2187 -> k
+    1:2:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1242:1243 -> l
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> l
+    3:3:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1244 -> l
+    4:6:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1245:1247 -> l
+    7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> l
+    7:7:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1246 -> l
+    8:9:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1248:1249 -> l
+    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> l
+    10:10:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1250 -> l
+    11:11:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> l
+    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1742:1742 -> m
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> m
+    2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1743 -> m
+    3:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1744:1745 -> m
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> m
+    5:5:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1745 -> m
+    6:6:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1748:1748 -> m
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> m
+    7:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1750 -> m
+    8:9:boolean isIndexProcessed(int):2357:2358 -> m
+    10:11:void ensureSubroutineProcessedInstructions():2375:2376 -> m
+    10:11:boolean isIndexProcessed(int):2360 -> m
+    12:12:boolean isIndexProcessed(int):2361:2361 -> m
+    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1873:1873 -> n
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> n
+    2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1874 -> n
+    3:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1875:1876 -> n
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> n
+    5:5:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1876 -> n
+    6:6:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1877:1877 -> n
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> n
+    7:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1879 -> n
+    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1883:1883 -> o
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> o
+    2:2:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1884 -> o
+    3:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1885:1886 -> o
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> o
+    5:5:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1886 -> o
+    6:6:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1887:1887 -> o
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> o
+    7:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1889 -> o
+    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1893:1893 -> p
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> p
+    2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1894 -> p
+    3:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1895:1896 -> p
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> p
+    5:5:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1896 -> p
+    6:6:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1897:1897 -> p
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> p
+    7:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1899 -> p
+    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1903:1903 -> q
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> q
+    2:2:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1904 -> q
+    3:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1905:1906 -> q
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> q
+    5:5:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1906 -> q
+    6:6:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1907:1907 -> q
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> q
+    7:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1909 -> q
+    1:1:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> r
+    1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1733 -> r
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> r
+    2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1734 -> r
+    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1735:1735 -> r
+    4:4:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> r
+    4:4:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1735 -> r
+    5:5:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1736:1736 -> r
+    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> r
+    6:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1738 -> r
+    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1913:1913 -> s
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> s
+    2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1914 -> s
+    3:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1915:1916 -> s
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> s
+    5:5:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1916 -> s
+    6:6:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1917:1917 -> s
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> s
+    7:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1919 -> s
+    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1923:1923 -> t
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> t
+    2:2:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1924 -> t
+    3:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1925:1926 -> t
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> t
+    5:5:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1926 -> t
+    6:6:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1927:1927 -> t
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> t
+    7:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1929 -> t
+    1:7:java.lang.String toString():2598:2604 -> toString
+    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1933:1933 -> u
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> u
+    2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1934 -> u
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> u
+    3:3:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1935 -> u
+    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1936:1936 -> u
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> u
+    5:5:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1936 -> u
+    6:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1938:1945 -> u
+    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> u
+    14:14:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1946 -> u
+    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1950:1950 -> v
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> v
+    2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1951 -> v
+    3:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1953:1954 -> v
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> v
+    5:5:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1954 -> v
+    6:9:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1955:1958 -> v
+    10:10:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> v
+    10:10:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1958 -> v
+    11:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1959:1961 -> v
+    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> v
+    14:14:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1962 -> v
+com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.D.c.Q:
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> a
     1:1:void <clinit>():151:151 -> <clinit>
-com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.D.c.T:
+com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.D.c.S:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalPredecessors -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalSuccessors -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet normalPredecessors -> b
@@ -29394,7 +29420,7 @@
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:6:void <init>():268:273 -> <init>
     1:25:java.lang.String toString():337:361 -> toString
-com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.D.c.U:
+com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.D.c.T:
     com.android.tools.r8.graph.DexType guard -> d
     int targetOffset -> f
     int sourceOffset -> e
@@ -29403,7 +29429,7 @@
     1:1:int access$600(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):193:193 -> a
     1:1:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):193:193 -> b
     1:1:int access$800(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):193:193 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.D.c.V:
+com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.D.c.U:
     int sourceOffset -> d
     int targetOffset -> e
     com.android.tools.r8.ir.code.Position position -> f
@@ -29411,13 +29437,13 @@
     1:1:int access$200(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):207:207 -> a
     1:1:int access$300(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):207:207 -> b
     1:1:com.android.tools.r8.ir.code.Position access$500(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):207:207 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.D.c.W:
+com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.D.c.V:
     java.util.List values -> a
     1:3:void <init>():230:232 -> <init>
     1:3:com.android.tools.r8.ir.conversion.IRBuilder$ValueList fromPhis(java.util.List,int):238:240 -> a
     1:9:boolean equals(java.lang.Object):252:260 -> equals
     1:1:int hashCode():247:247 -> hashCode
-com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.D.c.X:
+com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.D.c.W:
     int firstInstructionIndex -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.code.BasicBlock block -> a
@@ -29426,7 +29452,7 @@
     2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):186:189 -> <init>
     1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> a
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> b
-com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.D.c.Z:
+com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.D.c.Y:
     java.util.List neverMergePrefixes -> Q
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> D
@@ -29475,353 +29501,322 @@
     com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> h
     1:1:void <clinit>():119:119 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):185:185 -> <init>
-    2:174: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):168:340 -> <init>
+    2:170: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):168:336 -> <init>
     boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):689 -> a
-    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):689:689 -> a
-    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685:685 -> a
+    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685 -> a
+    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685:685 -> a
+    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):681:681 -> a
     4:4:java.lang.String lambda$new$0(java.lang.String):205:205 -> a
-    5:8:java.util.Set getDesugaredCallSites():344:347 -> a
-    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):448:455 -> a
-    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):388:389 -> a
-    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):457 -> a
-    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):395:397 -> a
-    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458 -> a
-    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459:459 -> a
-    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):419:420 -> a
-    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459 -> a
-    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):428:429 -> a
-    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):460 -> a
-    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):435:436 -> a
-    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):461 -> a
-    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):441:442 -> a
-    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):462 -> a
-    31:32:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):914:915 -> a
-    31:32:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):463 -> a
-    33:36:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):465:468 -> a
-    37:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):472:478 -> a
-    44:45:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):503:504 -> a
-    44:45:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):479 -> a
-    46:53:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):106:113 -> a
-    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):505 -> a
-    46:53:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):479 -> a
-    54:54:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):505:505 -> a
-    54:54:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):479 -> a
-    55:59:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):541:545 -> a
-    60:62:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):560:562 -> a
-    63:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):626:634 -> a
-    72:73:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):894:895 -> a
-    72:73:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):635 -> a
-    74:75:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):409:410 -> a
-    74:75:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):636 -> a
-    76:84:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):645:653 -> a
-    85:85:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):169:169 -> a
-    85:85:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    85:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    86:87:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):56:57 -> a
-    86:87:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    86:87:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    86:87:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    88:88:boolean com.android.tools.r8.ir.conversion.CallGraphBuilder.verifyAllMethodsWithCodeExists():54:54 -> a
-    88:88:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57 -> a
-    88:88:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    88:88:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    88:88:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    89:89:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    89:89:boolean com.android.tools.r8.ir.conversion.CallGraphBuilder.verifyAllMethodsWithCodeExists():55 -> a
-    89:89:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57 -> a
-    89:89:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    89:89:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    89:89:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    90:91:boolean com.android.tools.r8.ir.conversion.CallGraphBuilder.verifyAllMethodsWithCodeExists():55:56 -> a
-    90:91:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57 -> a
-    90:91:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    90:91:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    90:91:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    92:92:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    92:92:boolean com.android.tools.r8.ir.conversion.CallGraphBuilder.verifyAllMethodsWithCodeExists():55 -> a
-    92:92:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57 -> a
-    92:92:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    92:92:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    92:92:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    93:95:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):59:61 -> a
-    93:95:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    93:95:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    93:95:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    96:96:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet():405:405 -> a
-    96:96:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.lang.Iterable):430 -> a
-    96:96:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):61 -> a
-    96:96:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    96:96:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    96:96:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    97:97:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.lang.Iterable):431:431 -> a
-    97:97:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):61 -> a
-    97:97:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    97:97:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    97:97:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    98:104:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilderBase.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):62:68 -> a
-    98:104:com.android.tools.r8.ir.conversion.CallGraph com.android.tools.r8.ir.conversion.CallGraphBuilder.build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19 -> a
-    98:104:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    98:104:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    105:105:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):176:176 -> a
-    105:105:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    106:158:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654:706 -> a
-    159:159:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    159:159:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):706 -> a
-    160:160:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):707:707 -> a
-    161:162:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):403:404 -> a
-    161:162:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):708 -> a
-    163:170:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):709:716 -> a
-    171:173:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):395:397 -> a
-    171:173:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):717 -> a
-    174:175:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719:720 -> a
-    176:177:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):419:420 -> a
-    176:177:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):720 -> a
-    178:178:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722:722 -> a
-    179:180:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):428:429 -> a
-    179:180:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):723 -> a
-    181:182:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):435:436 -> a
-    181:182:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):724 -> a
-    183:185:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):725:727 -> a
-    186:187: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):905:906 -> a
-    186:187:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):728 -> a
-    188:188:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):730:730 -> a
-    189:190:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):914:915 -> a
-    189:190:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731 -> a
-    191:193:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):733:735 -> a
-    194:212:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):734:752 -> a
-    213:215:com.android.tools.r8.graph.DexType computeOutlineClassType():956:958 -> a
-    213:215:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752 -> a
-    216:216:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    216:216:com.android.tools.r8.graph.DexType computeOutlineClassType():958 -> a
-    216:216:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752 -> a
-    217:219:com.android.tools.r8.graph.DexType computeOutlineClassType():959:961 -> a
-    217:219:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752 -> a
-    220:275:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752:807 -> a
-    276:283:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):801:808 -> a
-    284:284:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    284:284:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    285:285:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):664:664 -> a
-    286:286:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):660:660 -> a
-    287:288:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):749:750 -> a
-    289:292:void waveStart(java.util.Collection):812:815 -> a
-    293:293:void addWaveDoneAction(com.android.tools.r8.utils.Action):826:826 -> a
-    294:294:boolean isInWave():836:836 -> a
-    294:294:void addWaveDoneAction(com.android.tools.r8.utils.Action):829 -> a
-    295:295:void addWaveDoneAction(com.android.tools.r8.utils.Action):832:832 -> a
-    296:296:void addWaveDoneAction(com.android.tools.r8.utils.Action):830:830 -> a
-    297:297:void addWaveDoneAction(com.android.tools.r8.utils.Action):827:827 -> a
-    298:298:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):840:840 -> a
-    299:304:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):850:855 -> a
-    305:323:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):854:872 -> a
-    324:335:java.lang.Object lambda$forEachSelectedOutliningMethod$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):857:868 -> a
-    336:336:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):877:877 -> a
-    337:337:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    337:337:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):878 -> a
-    338:340:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):878:880 -> a
-    341:352:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):879:890 -> a
-    353:353:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    353:353:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):878 -> a
-    354:354:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):924:924 -> a
-    355:358:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):968:971 -> a
-    359:364:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):977:982 -> a
-    365:370:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):986:991 -> a
-    371:371:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    371:371:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):992 -> a
-    372:372:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):992:992 -> a
-    373:373:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):988:988 -> a
-    374:376:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):1009:1011 -> a
-    377:377:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):1010:1010 -> a
-    378:378:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1013:1013 -> a
-    379:379:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    379:379:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1017 -> a
-    380:380:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1017:1017 -> a
-    381:381:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1013:1013 -> a
-    382:388:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1034:1040 -> a
-    389:391:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1082:1084 -> a
-    392:397:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1083:1088 -> a
-    398:398:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1025:1025 -> a
-    398:398:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1088 -> a
-    399:399:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1088:1088 -> a
-    400:413:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1087:1100 -> a
-    414:419:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1731:1736 -> a
-    414:419:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1103 -> a
-    420:426:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1104:1110 -> a
-    427:427:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1286:1286 -> a
-    427:427:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1110 -> a
-    428:442:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1111:1125 -> a
-    443:443:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():984:984 -> a
-    443:443:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1125 -> a
-    444:463:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1126:1145 -> a
-    464:464:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1484 -> a
-    464:464:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    465:465:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    465:465:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484 -> a
-    465:465:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    466:468:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1486 -> a
-    466:468:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    469:469:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    469:469:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1486 -> a
-    469:469:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    470:473:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1487:1490 -> a
-    470:473:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    474:488:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1154:1168 -> a
-    489:489:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
-    489:489:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1169 -> a
-    490:535:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1170:1215 -> a
-    536:536:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    536:536:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1215 -> a
-    537:591:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1220:1274 -> a
-    592:594:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1045:1047 -> a
-    592:594:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1275 -> a
-    595:603:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1278:1286 -> a
-    604:622:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1285:1303 -> a
-    623:623:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():984:984 -> a
-    623:623:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1303 -> a
-    624:647:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1304:1327 -> a
-    648:666:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1319:1337 -> a
-    667:667:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    667:667:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1320 -> a
-    668:717:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1340:1389 -> a
-    718:718:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    718:718:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1389 -> a
-    719:729:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1390:1400 -> a
-    730:735:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):894:899 -> a
-    730:735:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1400 -> a
-    736:784:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1401:1449 -> a
-    785:785:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1294:1294 -> a
-    785:785:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1449 -> a
-    786:793:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1450:1457 -> a
-    794:794:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
-    794:794:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1460 -> a
-    795:800:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1460:1465 -> a
-    801:801:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
-    801:801:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465 -> a
-    802:803:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1466 -> a
-    804:809:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1470 -> a
-    810:810:void lambda$rewriteCodeInternal$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1202:1202 -> a
-    811:811:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1329:1329 -> a
-    812:813:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1474:1475 -> a
-    814:814:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    814:814:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1475 -> a
-    815:819:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1494:1498 -> a
-    815:819:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
-    820:820:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1478:1478 -> a
-    821:821:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1503:1503 -> a
-    821:821:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    822:827:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1542:1547 -> a
-    822:827:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    822:827:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    828:828:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1319:1319 -> a
-    828:828:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1547 -> a
-    828:828:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    828:828:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    829:829:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548:1548 -> a
-    829:829:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    829:829:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    830:842:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3712:3724 -> a
-    830:842:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
-    830:842:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    830:842:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    843:843:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    843:843:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3725 -> a
-    843:843:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
-    843:843:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    843:843:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    844:845:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3725:3726 -> a
-    844:845:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
-    844:845:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    844:845:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    846:846:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3712:3712 -> a
-    846:846:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
-    846:846:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    846:846:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    847:856:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1550:1559 -> a
-    847:856:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    847:856:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    857:857:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1558:1558 -> a
-    857:857:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
-    857:857:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    858:858:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1506:1506 -> a
-    858:858:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    859:863:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> a
-    859:863:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507 -> a
-    859:863:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    864:866:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1508:1510 -> a
-    864:866:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    867:867:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1025:1025 -> a
-    867:867:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510 -> a
-    867:867:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    868:868:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510:1510 -> a
-    868:868:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    869:873:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1509:1513 -> a
-    869:873:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    874:874:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616:1616 -> a
-    875:875:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1270:1270 -> a
-    875:875:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616 -> a
-    876:887:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1619:1630 -> a
-    888:890:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1676:1678 -> a
-    888:890:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1631 -> a
-    891:891:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1634:1634 -> a
-    892:893:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1683:1684 -> a
-    892:893:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1635 -> a
-    894:895:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1688:1689 -> a
-    894:895:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1638 -> a
-    896:897:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641:1642 -> a
-    898:902:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1662:1666 -> a
-    898:902:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1643 -> a
-    903:908:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1644:1649 -> a
-    909:909: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):1698:1698 -> a
-    909:909:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
-    910:910:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    910:910: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):1698 -> a
+    5:8:java.util.Set getDesugaredCallSites():340:343 -> a
+    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):444:451 -> a
+    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):384:385 -> a
+    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):453 -> a
+    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):391:393 -> a
+    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):454 -> a
+    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455:455 -> a
+    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):415:416 -> a
+    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455 -> a
+    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):424:425 -> a
+    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):456 -> a
+    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):431:432 -> a
+    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):457 -> a
+    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):437:438 -> a
+    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458 -> a
+    31:32:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):901:902 -> a
+    31:32:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459 -> a
+    33:36:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):461:464 -> a
+    37:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):468:474 -> a
+    44:45:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):499:500 -> a
+    44:45:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    46:53:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):102:109 -> a
+    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):501 -> a
+    46:53:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    54:54:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):501:501 -> a
+    54:54:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    55:59:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):537:541 -> a
+    60:62:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):556:558 -> a
+    63:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):622:630 -> a
+    72:73:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):881:882 -> a
+    72:73:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):631 -> a
+    74:74:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    74:74:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):882 -> a
+    74:74:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):631 -> a
+    75:76:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):405:406 -> a
+    75:76:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):632 -> a
+    77:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):641:649 -> a
+    86:86:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):156:156 -> a
+    86:86:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170 -> a
+    86:86:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
+    87:88:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170:171 -> a
+    87:88:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
+    89:140:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):650:701 -> a
+    141:141:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    141:141:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):701 -> a
+    142:142:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):702:702 -> a
+    143:144:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):399:400 -> a
+    143:144:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):703 -> a
+    145:148:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):707:710 -> a
+    149:151:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):391:393 -> a
+    149:151:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):711 -> a
+    152:153:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):713:714 -> a
+    154:155:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):415:416 -> a
+    154:155:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):714 -> a
+    156:156:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716:716 -> a
+    157:158:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):424:425 -> a
+    157:158:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):717 -> a
+    159:160:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):431:432 -> a
+    159:160:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):718 -> a
+    161:163:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719:721 -> a
+    164:165: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):892:893 -> a
+    164:165:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722 -> a
+    166:166:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):724:724 -> a
+    167:168:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):901:902 -> a
+    167:168:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):725 -> a
+    169:171:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):727:729 -> a
+    172:187:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):728:743 -> a
+    188:190:com.android.tools.r8.graph.DexType computeOutlineClassType():943:945 -> a
+    188:190:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    191:191:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    191:191:com.android.tools.r8.graph.DexType computeOutlineClassType():945 -> a
+    191:191:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    192:194:com.android.tools.r8.graph.DexType computeOutlineClassType():946:948 -> a
+    192:194:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    195:247:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743:795 -> a
+    248:255:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):789:796 -> a
+    256:256:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    256:256:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
+    257:257:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):660:660 -> a
+    258:258:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):656:656 -> a
+    259:260:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):740:741 -> a
+    261:264:void waveStart(java.util.Collection):800:803 -> a
+    265:265:void addWaveDoneAction(com.android.tools.r8.utils.Action):814:814 -> a
+    266:266:boolean isInWave():824:824 -> a
+    266:266:void addWaveDoneAction(com.android.tools.r8.utils.Action):817 -> a
+    267:267:void addWaveDoneAction(com.android.tools.r8.utils.Action):820:820 -> a
+    268:268:void addWaveDoneAction(com.android.tools.r8.utils.Action):818:818 -> a
+    269:269:void addWaveDoneAction(com.android.tools.r8.utils.Action):815:815 -> a
+    270:270:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):828:828 -> a
+    271:276:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):838:843 -> a
+    277:294:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):842:859 -> a
+    295:305:java.lang.Object lambda$forEachSelectedOutliningMethod$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):845:855 -> a
+    306:306:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):864:864 -> a
+    307:307:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    307:307:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):865 -> a
+    308:310:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):865:867 -> a
+    311:322:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):866:877 -> a
+    323:323:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    323:323:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):865 -> a
+    324:324:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):911:911 -> a
+    325:328:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):955:958 -> a
+    329:334:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):964:969 -> a
+    335:340:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):973:978 -> a
+    341:341:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
+    341:341:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):979 -> a
+    342:342:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):979:979 -> a
+    343:343:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):975:975 -> a
+    344:346:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):996:998 -> a
+    347:347:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):997:997 -> a
+    348:348:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1000:1000 -> a
+    349:349:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
+    349:349:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1004 -> a
+    350:350:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1004:1004 -> a
+    351:351:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1000:1000 -> a
+    352:358:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1021:1027 -> a
+    359:361:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1069:1071 -> a
+    362:367:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1070:1075 -> a
+    368:368:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    368:368:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075 -> a
+    369:369:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075:1075 -> a
+    370:383:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1074:1087 -> a
+    384:389:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1731:1736 -> a
+    384:389:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1090 -> a
+    390:396:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1091:1097 -> a
+    397:397:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1281:1281 -> a
+    397:397:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1097 -> a
+    398:412:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1098:1112 -> a
+    413:413:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
+    413:413:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1112 -> a
+    414:428:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1113:1127 -> a
+    429:429:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1484 -> a
+    429:429:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    430:430:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    430:430:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484 -> a
+    430:430:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    431:433:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1486 -> a
+    431:433:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    434:434:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    434:434:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1486 -> a
+    434:434:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    435:438:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1487:1490 -> a
+    435:438:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    439:453:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1136:1150 -> a
+    454:454:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
+    454:454:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1151 -> a
+    455:500:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1152:1197 -> a
+    501:501:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    501:501:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1197 -> a
+    502:555:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1202:1255 -> a
+    556:558:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1032:1034 -> a
+    556:558:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1256 -> a
+    559:567:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1259:1267 -> a
+    568:586:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1266:1284 -> a
+    587:587:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
+    587:587:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1284 -> a
+    588:611:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1285:1308 -> a
+    612:630:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1300:1318 -> a
+    631:631:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    631:631:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1301 -> a
+    632:681:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1321:1370 -> a
+    682:682:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    682:682:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1370 -> a
+    683:693:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1371:1381 -> a
+    694:699:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):891:896 -> a
+    694:699:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1381 -> a
+    700:743:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1382:1425 -> a
+    744:748:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:193 -> a
+    744:748:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    749:755:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):205:211 -> a
+    749:755:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):196 -> a
+    749:755:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    756:759:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):198:201 -> a
+    756:759:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    760:776:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1426:1442 -> a
+    777:777:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:189 -> a
+    777:777:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    778:780:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1447:1449 -> a
+    781:781:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1289:1289 -> a
+    781:781:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1449 -> a
+    782:789:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1450:1457 -> a
+    790:790:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    790:790:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1460 -> a
+    791:796:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1460:1465 -> a
+    797:797:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    797:797:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465 -> a
+    798:799:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1466 -> a
+    800:805:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1470 -> a
+    806:806:void lambda$rewriteCodeInternal$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1184:1184 -> a
+    807:807:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1310:1310 -> a
+    808:809:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1474:1475 -> a
+    810:810:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    810:810:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1475 -> a
+    811:815:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1494:1498 -> a
+    811:815:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
+    816:816:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1478:1478 -> a
+    817:817:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1503:1503 -> a
+    817:817:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    818:823:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1542:1547 -> a
+    818:823:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    818:823:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    824:824:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1314:1314 -> a
+    824:824:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1547 -> a
+    824:824:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    824:824:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    825:825:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548:1548 -> a
+    825:825:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    825:825:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    826:838:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3680:3692 -> a
+    826:838:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    826:838:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    826:838:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    839:839:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    839:839:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3693 -> a
+    839:839:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    839:839:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    839:839:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    840:841:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3693:3694 -> a
+    840:841:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    840:841:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    840:841:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    842:842:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3680:3680 -> a
+    842:842:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> a
+    842:842:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    842:842:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    843:852:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1550:1559 -> a
+    843:852:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    843:852:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    853:853:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1558:1558 -> a
+    853:853:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1505 -> a
+    853:853:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    854:854:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1506:1506 -> a
+    854:854:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    855:859:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> a
+    855:859:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507 -> a
+    855:859:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    860:862:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1508:1510 -> a
+    860:862:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    863:863:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    863:863:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510 -> a
+    863:863:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    864:864:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510:1510 -> a
+    864:864:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    865:869:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1509:1513 -> a
+    865:869:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    870:870:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616:1616 -> a
+    871:871:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1265:1265 -> a
+    871:871:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616 -> a
+    872:883:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1619:1630 -> a
+    884:886:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1676:1678 -> a
+    884:886:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1631 -> a
+    887:887:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1634:1634 -> a
+    888:889:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1683:1684 -> a
+    888:889:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1635 -> a
+    890:891:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1688:1689 -> a
+    890:891:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1638 -> a
+    892:893:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641:1642 -> a
+    894:898:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1662:1666 -> a
+    894:898:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1643 -> a
+    899:904:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1644:1649 -> a
+    905:905: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):1698:1698 -> a
+    905:905:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    906:906:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    906:906: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):1698 -> a
+    906:906:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    907:909: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):1699:1701 -> a
+    907:909:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    910:910:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    910:910: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):1703 -> a
     910:910:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
-    911:913: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):1699:1701 -> a
-    911:913:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
-    914:914:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
-    914:914: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):1703 -> a
-    914:914:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
-    915:920: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):1704:1709 -> a
-    915:920:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
-    921:922:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1624:1625 -> a
-    923:923:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1623:1623 -> a
-    924:924:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1671:1671 -> a
-    925:925:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1747:1747 -> a
-    926:926:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    926:926:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1748 -> a
-    927:944:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1749:1766 -> a
-    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):484:489 -> b
-    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):487:498 -> b
-    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):549:558 -> b
-    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):568:596 -> b
+    911:916: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):1704:1709 -> a
+    911:916:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    917:918:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1624:1625 -> a
+    919:919:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1623:1623 -> a
+    920:920:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1671:1671 -> a
+    921:921:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1747:1747 -> a
+    922:922:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    922:922:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1748 -> a
+    923:940:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1749:1766 -> a
+    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):480:485 -> b
+    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):483:494 -> b
+    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):545:554 -> b
+    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):564:592 -> b
     58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
+    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
-    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:600 -> b
-    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> b
-    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):600 -> b
-    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):600:606 -> b
-    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603:603 -> b
+    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592 -> b
+    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592:596 -> b
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
+    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:602 -> b
+    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599:599 -> b
     74:74:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> b
-    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603 -> b
-    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603:608 -> b
-    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> b
-    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):608 -> b
+    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599 -> b
+    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599:604 -> b
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604 -> b
     82:86:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> b
-    82:86:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):609 -> b
-    87:89:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):758:760 -> b
-    90:90:boolean isInWave():836:836 -> b
-    91:93:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):1000:1002 -> b
-    94:102:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1058:1066 -> b
-    103:103:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1064:1064 -> b
+    82:86:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):605 -> b
+    87:89:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):749:751 -> b
+    90:90:boolean isInWave():824:824 -> b
+    91:93:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):987:989 -> b
+    94:102:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1045:1053 -> b
+    103:103:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1051:1051 -> b
     104:109:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1519:1524 -> b
     110:114:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1522:1526 -> b
     115:115:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1565:1565 -> b
-    116:116:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1307:1307 -> b
+    116:116:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1302:1302 -> b
     116:116:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1565 -> b
     117:121:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1569:1573 -> b
     122:122:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> b
@@ -29829,48 +29824,48 @@
     123:134:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1574:1585 -> b
     135:135:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1715:1715 -> b
     135:135:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
-    136:136:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> b
+    136:136:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> b
     136:136:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1715 -> b
     136:136:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
     137:139:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1716:1718 -> b
     137:139:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
-    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> b
+    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> b
     140:140:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1718 -> b
     140:140:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
     141:143:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1719:1721 -> b
     141:143:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
-    144:144:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> b
+    144:144:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
     144:144:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1722 -> b
     144:144:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
     145:147:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1724:1726 -> b
     145:147:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
-    148:148:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> b
+    148:148:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
     148:148:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1727 -> b
     148:148:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
     149:153:boolean lambda$workaroundForwardingInitializerBug$18(com.android.tools.r8.ir.code.Instruction):1587:1591 -> b
     154:155:void printPhase(java.lang.String):1741:1742 -> b
-    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):511:530 -> c
-    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):529:535 -> c
-    28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):129:142 -> c
-    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):535 -> c
-    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):535:535 -> c
-    43:43:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):841:841 -> c
+    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):507:526 -> c
+    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):525:531 -> c
+    28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):125:138 -> c
+    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):531 -> c
+    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):531:531 -> c
+    43:43:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):829:829 -> c
     44:44:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
-    44:44:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):842 -> c
-    45:45:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):842:842 -> c
-    46:46:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexEncodedMethod):842:842 -> c
-    47:47:void clearDexMethodCompilationState():920:920 -> c
+    44:44:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):830 -> c
+    45:45:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):830:830 -> c
+    46:46:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexEncodedMethod):830:830 -> c
+    47:47:void clearDexMethodCompilationState():907:907 -> c
     boolean lambda$convertMethod$5(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    1:7:boolean enableTryWithResourcesDesugaring():370:376 -> d
-    8:8:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):543:543 -> d
-    1:1:boolean enableTwrCloseResourceDesugaring():366:366 -> e
-    2:2:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):488:488 -> e
-    3:7:java.lang.Object lambda$forEachSynthesizedServiceLoaderMethod$14(com.android.tools.r8.graph.DexEncodedMethod):882:886 -> e
-    1:2:boolean removeLambdaDeserializationMethods():380:381 -> f
-    3:3:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):527:527 -> f
-    4:4:void lambda$waveStart$10(com.android.tools.r8.graph.DexEncodedMethod):815:815 -> f
-    1:3:void waveDone():820:822 -> g
-com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.D.c.b0:
+    1:7:boolean enableTryWithResourcesDesugaring():366:372 -> d
+    8:8:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):539:539 -> d
+    1:1:boolean enableTwrCloseResourceDesugaring():362:362 -> e
+    2:2:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):484:484 -> e
+    3:7:java.lang.Object lambda$forEachSynthesizedServiceLoaderMethod$14(com.android.tools.r8.graph.DexEncodedMethod):869:873 -> e
+    1:2:boolean removeLambdaDeserializationMethods():376:377 -> f
+    3:3:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):523:523 -> f
+    4:4:void lambda$waveStart$10(com.android.tools.r8.graph.DexEncodedMethod):803:803 -> f
+    1:3:void waveDone():808:810 -> g
+com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.D.c.a0:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> c
@@ -29885,10 +29880,10 @@
     19:39:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):484:504 -> a
     19:39:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):111 -> a
     40:41:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):114:115 -> a
-    42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     42:42:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):116 -> a
     43:58:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):117:132 -> a
-    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():984:984 -> a
+    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
     59:59:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
     60:63:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):133:136 -> a
     64:104:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:175 -> a
@@ -29907,10 +29902,10 @@
     226:226:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
     226:226:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):222 -> a
     227:237:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):222:232 -> a
-    238:238:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    238:238:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     238:238:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):233 -> a
     239:239:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):234:234 -> a
-    240:240:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    240:240:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     240:240:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):235 -> a
     241:244:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):236:239 -> a
     245:245:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
@@ -29920,9 +29915,9 @@
     248:248: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
     248:248:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):243 -> a
     249:261:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):244:256 -> a
-    262:262:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    262:262:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     262:262:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):256 -> a
-    263:263:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    263:263:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     263:263:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):258 -> a
     264:283:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):262:281 -> a
     284:293:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):280:289 -> a
@@ -29962,7 +29957,7 @@
     541:541:boolean canInvokeTargetWithInvokeVirtual(com.android.tools.r8.graph.DexEncodedMethod):656:656 -> a
     542:559:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):660:677 -> a
     1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):375:375 -> b
-com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.D.c.a0:
+com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.D.c.Z:
     com.android.tools.r8.ir.code.Instruction current -> b
     java.util.Set affectedPhis -> d
     com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> e
@@ -29973,21 +29968,21 @@
     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):688:692 -> <init>
     1:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):697:710 -> a
     15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):707:707 -> a
-com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.D.c.c0:
+com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.D.c.b0:
     java.util.Deque waves -> b
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):35:37 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():41:41 -> a
-    2:25:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallSiteInformation):46:69 -> a
-    26:30:void lambda$createWaves$1(java.util.Set,com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.ir.conversion.CallGraph,java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):56:60 -> a
-    31:31:void lambda$createWaves$0(java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):61:61 -> a
-    32:42:void extractLeaves(java.util.Set,java.util.function.Consumer):81:91 -> a
-    43:50:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):106:113 -> a
-    51:59:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):112:120 -> a
-    60:60:java.lang.Object lambda$forEachMethod$2(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):115:115 -> a
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.D.c.d0:
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):34:36 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():40:40 -> a
+    2:25:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallSiteInformation):45:68 -> a
+    26:30:void lambda$createWaves$1(java.util.Set,com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.ir.conversion.CallGraph,java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):55:59 -> a
+    31:31:void lambda$createWaves$0(java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):60:60 -> a
+    32:42:void extractLeaves(java.util.Set,java.util.function.Consumer):74:84 -> a
+    43:50:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):99:106 -> a
+    51:59:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):105:113 -> a
+    60:60:java.lang.Object lambda$forEachMethod$2(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):108:108 -> a
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.D.c.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
@@ -30009,17 +30004,17 @@
     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.D.c.m0:
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.D.c.l0:
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     1:1:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):184 -> a
     1:1:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
     2:7:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):185:190 -> a
     2:7:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
-    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     8:8:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):184 -> a
     8:8:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.D.c.e0:
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.D.c.g0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.D.c.d0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.D.c.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
@@ -30030,7 +30025,7 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock access$002(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     1:1:com.android.tools.r8.ir.code.Phi access$100(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):587:587 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap access$300(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):587:587 -> c
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.D.c.f0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.D.c.e0:
     1:1:void <init>():589:589 -> <init>
     1:1:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping build(com.android.tools.r8.ir.code.BasicBlock):616:616 -> a
     2:2:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):628:628 -> a
@@ -30043,13 +30038,13 @@
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):658 -> a
     25:45:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):663:683 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     46:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):684 -> a
     47:62:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):685:700 -> a
     63:63:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):687:687 -> a
     64:64:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
     64:64:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):687 -> a
-    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     65:65:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):684 -> a
     66:66:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.If):675:675 -> a
     67:67:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
@@ -30058,7 +30053,7 @@
     83:83:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch):708:708 -> a
     84:84:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
     84:84:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch):708 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.D.c.i0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.D.c.h0:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
@@ -30067,7 +30062,7 @@
     1:29:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):273:301 -> a
     30:30:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
     30:30:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):301 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.D.c.h0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.D.c.g0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:1:void <clinit>():195:195 -> <clinit>
@@ -30081,7 +30076,7 @@
     15:16:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):216 -> a
     17:19:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):217:219 -> a
     20:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):218:244 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.D.c.k0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.D.c.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
@@ -30093,7 +30088,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$200(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):305:305 -> a
     2:2:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder builder(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):583:583 -> a
     1:1:com.android.tools.r8.ir.code.Value access$500(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):305:305 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.D.c.j0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.D.c.i0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.ir.code.Phi idValue -> c
     com.android.tools.r8.ir.code.Value stringValue -> d
@@ -30103,7 +30098,7 @@
     2:4:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):360:362 -> a
     5:23:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):404:422 -> a
     5:23:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
-    24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):423 -> a
     24:24:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
     25:35:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):424:434 -> a
@@ -30113,7 +30108,7 @@
     36:36:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
     37:45:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):441:449 -> a
     37:45:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     46:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithIf(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.If):423 -> a
     46:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):362 -> a
     47:48:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):364:365 -> a
@@ -30133,7 +30128,7 @@
     31:31:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):400:400 -> b
     32:32:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():0:0 -> b
     32:32:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):399 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.D.c.l0:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.D.c.k0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():736:736 -> <clinit>
     1:2:com.android.tools.r8.ir.code.BasicBlock getTrueTarget(com.android.tools.r8.ir.code.If):739:740 -> a
@@ -30144,7 +30139,7 @@
     18:23:com.android.tools.r8.ir.code.Value getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):766:771 -> a
     24:25:com.android.tools.r8.ir.code.Value getStringHashValueFromSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.graph.DexItemFactory):779:780 -> a
     26:28:boolean isSameStringHashValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):797:799 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.D.c.n0:
+com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.D.c.m0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> b
     boolean $assertionsDisabled -> e
@@ -30154,10 +30149,10 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.IdentifierNameStringMarker):43:47 -> <init>
     1:21:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):51:71 -> a
     22:45:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):80:103 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     46:46:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):104 -> a
     47:52:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):104:109 -> a
-    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     53:53:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):110 -> a
     54:75:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):111:132 -> a
     76:88:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):129:141 -> a
@@ -30166,7 +30161,7 @@
     91:91:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
     91:91:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):141 -> a
     92:104:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):142:154 -> a
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.D.c.p0:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.D.c.o0:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -30187,13 +30182,13 @@
     2:2:int com.android.tools.r8.code.Instruction.getOffset():119:119 -> b
     2:2:void addPayloadUser(com.android.tools.r8.code.Instruction):35 -> b
     3:7:void addPayloadUser(com.android.tools.r8.code.Instruction):36:40 -> b
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.D.c.o0:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.D.c.n0:
     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.D.c.q0:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.D.c.p0:
     java.util.Map unificationParents -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
@@ -30296,58 +30291,57 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):70:70 -> <init>
     2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):67:74 -> <init>
     1:1:void desugar(com.android.tools.r8.ir.code.IRCode):89:89 -> a
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     2:2:void desugar(com.android.tools.r8.ir.code.IRCode):93 -> a
-    3:17:void desugar(com.android.tools.r8.ir.code.IRCode):94:108 -> a
-    18:32:com.android.tools.r8.graph.DexEncodedMethod quickLookUp(com.android.tools.r8.graph.DexMethod):146:160 -> a
-    18:32:void desugar(com.android.tools.r8.ir.code.IRCode):108 -> a
-    33:59:void desugar(com.android.tools.r8.ir.code.IRCode):112:138 -> a
-    60:60:boolean hasRewrittenMethodPrefix(com.android.tools.r8.graph.DexType):178:178 -> a
-    61:67:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):183:189 -> a
-    68:68:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):169:169 -> a
-    68:68:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):191 -> a
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    69:69:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):170 -> a
-    69:69:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):191 -> a
-    70:70:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):171:171 -> a
-    70:70:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):191 -> a
-    71:124:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):192:245 -> a
-    125:125:boolean lambda$synthesizeUtilityClasses$0(com.android.tools.r8.graph.DexProgramClass):241:241 -> a
-    126:144:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):250:268 -> a
+    3:10:void desugar(com.android.tools.r8.ir.code.IRCode):94:101 -> a
+    11:29:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):199:217 -> a
+    11:29:void desugar(com.android.tools.r8.ir.code.IRCode):101 -> a
+    30:35:void desugar(com.android.tools.r8.ir.code.IRCode):106:111 -> a
+    36:36:boolean hasRewrittenMethodPrefix(com.android.tools.r8.graph.DexType):126:126 -> a
+    37:43:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132:138 -> a
+    44:44:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):117:117 -> a
+    44:44:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):140 -> a
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    45:45:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):118 -> a
+    45:45:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):140 -> a
+    46:46:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):119:119 -> a
+    46:46:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):140 -> a
+    47:100:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):141:194 -> a
+    101:101:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.DexProgramClass):190:190 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.D.d.b:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriter -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1320:1320 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1325:1326 -> <init>
+    1:1:void <clinit>():1246:1246 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1250:1251 -> <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):1332:1333 -> a
-    3:3:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1343:1343 -> a
-    4:4:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1348:1348 -> 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):1256:1257 -> a
+    3:3:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1267:1267 -> a
+    4:4:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1272:1272 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.D.d.c:
     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):1359:1359 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1363:1365 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1283:1283 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1287:1289 -> <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):1371:1372 -> 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):1371:1371 -> a
-    4:11:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1377:1384 -> a
-    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    12:12:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1384 -> a
-    13:13:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1385:1385 -> 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):1295:1296 -> 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):1295:1295 -> a
+    4:11:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1301:1308 -> a
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    12:12:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1308 -> a
+    13:13:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1309:1309 -> a
     14:14:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    14:14:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1390 -> a
-    15:15:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1390:1390 -> a
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    16:16:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1395 -> a
-    17:17:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1396:1396 -> a
-    18:18:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1402:1402 -> a
+    14:14:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1314 -> a
+    15:15:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1314:1314 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    16:16:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1319 -> a
+    17:17:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1320:1320 -> a
+    18:18:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1326:1326 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.D.d.d:
     void rewrite(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory) -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.D.d.e:
     com.android.tools.r8.graph.DexMethod method -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1264:1265 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1190:1191 -> <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
@@ -30356,87 +30350,85 @@
     com.android.tools.r8.graph.DexType newHolder -> b
     com.android.tools.r8.graph.DexMethod targetMethod -> c
     boolean isStatic -> d
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):1285:1287 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):1211:1213 -> <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):1293:1294 -> 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):1293:1293 -> a
-    4:10:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1299:1305 -> a
-    11:11:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1311:1311 -> 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):1219:1220 -> 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):1219:1219 -> a
+    4:10:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1225:1231 -> a
+    11:11:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1237:1237 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.D.d.g:
     java.util.Map rewritable -> a
-    java.util.Map virtualRewrites -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():271:271 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):280:280 -> <init>
-    2:35:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):274:307 -> <init>
-    1:1:boolean isEmpty():325:325 -> a
-    2:131:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):334:463 -> a
-    132:132:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1078:1078 -> a
-    133:136:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1213:1216 -> a
-    137:142:void warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1203:1208 -> a
-    137:142:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1218 -> a
-    143:143:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1220:1220 -> a
-    144:144:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1240:1240 -> a
-    144:144:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1221 -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():220:220 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):225:225 -> <init>
+    2:31:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):223:252 -> <init>
+    1:1:boolean isEmpty():257:257 -> a
+    2:131:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):266:395 -> a
+    132:132:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1010:1010 -> a
+    133:136:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1144:1147 -> a
+    137:142:void warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1134:1139 -> a
+    137:142:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1149 -> a
+    143:143:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1151:1151 -> a
+    144:144:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1167:1167 -> a
+    144:144:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1152 -> a
     145:145:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    145:145:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1241 -> a
-    145:145:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1221 -> a
-    146:151:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1241:1246 -> a
-    146:151:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1221 -> a
-    152:161:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1222:1231 -> a
-    162:162:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1229:1229 -> a
-    163:164:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1251:1252 -> a
-    165:165:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1256:1256 -> a
-    1:6:boolean matchesVirtualRewrite(com.android.tools.r8.graph.DexMethod):312:317 -> b
-    7:345:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):469:807 -> b
-    346:346:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1100:1100 -> b
+    145:145:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1168 -> a
+    145:145:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1152 -> a
+    146:151:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1168:1173 -> a
+    146:151:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1152 -> a
+    152:157:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1153:1158 -> a
+    158:158:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1156:1156 -> a
+    159:160:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1178:1179 -> a
+    161:161:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1183:1183 -> a
+    1:339:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):401:739 -> b
+    340:340:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1031:1031 -> b
     1:3: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:76 -> c
-    1:3:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c
+    1:3:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     4:4: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):76 -> c
-    4:4:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
+    4:4:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     5:7: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:79 -> c
-    5:7:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
-    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> c
+    5:7:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
+    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> c
     8:8: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 -> c
-    8:8:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
+    8:8:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     9:34: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):85:110 -> c
-    9:34:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
+    9:34:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     35:35: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
-    35:35:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
+    35:35:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     36:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):102:120 -> c
-    36:54:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
-    55:212:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):814:971 -> c
-    1:7:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1138:1144 -> d
-    1:98:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):978:1075 -> e
-    99:124:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1072:1097 -> e
-    125:149:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1094:1118 -> e
-    150:158:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1115:1123 -> e
-    159:159:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> e
-    159:159:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1124 -> e
-    160:166:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1125:1131 -> e
-    167:167:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> e
-    167:167:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1132 -> e
-    168:168:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1133:1133 -> e
-    1:12:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1151:1162 -> f
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f
-    13:13:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1163 -> f
-    14:28:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1163:1177 -> f
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f
-    29:29:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1180 -> f
-    30:30:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1180:1180 -> f
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f
-    31:31:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1181 -> f
-    32:32:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1181:1181 -> f
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f
-    33:33:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1182 -> f
-    34:49:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1182:1197 -> f
+    36:54:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
+    55:212:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):746:903 -> c
+    1:7:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1069:1075 -> d
+    1:98:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):910:1007 -> e
+    99:123:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1004:1028 -> e
+    124:148:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1025:1049 -> e
+    149:157:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1046:1054 -> e
+    158:158:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> e
+    158:158:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1055 -> e
+    159:165:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1056:1062 -> e
+    166:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> e
+    166:166:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1063 -> e
+    167:167:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1064:1064 -> e
+    1:12:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1082:1093 -> f
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
+    13:13:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1094 -> f
+    14:28:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1094:1108 -> f
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
+    29:29:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1111 -> f
+    30:30:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1111:1111 -> f
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
+    31:31:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1112 -> f
+    32:32:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1112:1112 -> f
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f
+    33:33:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1113 -> f
+    34:49:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1113:1128 -> f
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.D.d.h:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType receiverType -> e
-    1:1:void <clinit>():1414:1414 -> <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):1420:1421 -> <init>
-    1:8:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1426:1433 -> a
+    1:1:void <clinit>():1338:1338 -> <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):1344:1345 -> <init>
+    1:8:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1350:1357 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.D.d.i:
     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.D.d.k:
@@ -30446,58 +30438,53 @@
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> c
     boolean $assertionsDisabled -> f
     java.util.Map createdMethods -> e
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):40:40 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):36:43 -> <init>
-    1:1:java.util.Set getForwardMethods():47:47 -> a
-    2:27:void process(com.android.tools.r8.graph.DexClass):51:76 -> a
-    28:29:void process(com.android.tools.r8.graph.DexClass):73:74 -> a
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):39:39 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):35:42 -> <init>
+    1:1:java.util.Set getForwardMethods():46:46 -> a
+    2:27:void process(com.android.tools.r8.graph.DexClass):50:75 -> a
+    28:29:void process(com.android.tools.r8.graph.DexClass):72:73 -> a
     30:30:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    30:30:void process(com.android.tools.r8.graph.DexClass):74 -> a
+    30:30:void process(com.android.tools.r8.graph.DexClass):73 -> a
     31:31:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     31:31:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    31:31:void process(com.android.tools.r8.graph.DexClass):74 -> a
-    32:45:void process(com.android.tools.r8.graph.DexClass):74:87 -> a
-    46:93:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):162:209 -> a
-    46:93:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    31:31:void process(com.android.tools.r8.graph.DexClass):73 -> a
+    32:45:void process(com.android.tools.r8.graph.DexClass):73:86 -> a
+    46:93:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):144:191 -> a
+    46:93:void process(com.android.tools.r8.graph.DexClass):96 -> a
     94:94:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
-    94:94:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):209 -> a
-    94:94:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    94:94:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
+    94:94:void process(com.android.tools.r8.graph.DexClass):96 -> a
     95:95:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
     95:95:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
-    95:95:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):209 -> a
-    95:95:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    95:95:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
+    95:95:void process(com.android.tools.r8.graph.DexClass):96 -> a
     96:96:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
     96:96:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
-    96:96:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):209 -> a
-    96:96:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    96:96:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
+    96:96:void process(com.android.tools.r8.graph.DexClass):96 -> a
     97:97:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
-    97:97:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):209 -> a
-    97:97:void process(com.android.tools.r8.graph.DexClass):97 -> a
-    98:109:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):212:223 -> a
-    98:109:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    97:97:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191 -> a
+    97:97:void process(com.android.tools.r8.graph.DexClass):96 -> a
+    98:109:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):194:205 -> a
+    98:109:void process(com.android.tools.r8.graph.DexClass):96 -> a
     110:110:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    110:110:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):223 -> a
-    110:110:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    110:110:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):205 -> a
+    110:110:void process(com.android.tools.r8.graph.DexClass):96 -> a
     111:111:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     111:111:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    111:111:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):223 -> a
-    111:111:void process(com.android.tools.r8.graph.DexClass):97 -> a
-    112:169:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):223:280 -> a
-    112:169:void process(com.android.tools.r8.graph.DexClass):97 -> a
-    170:182:void process(com.android.tools.r8.graph.DexClass):98:110 -> a
-    183:191:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):114:122 -> a
-    192:199:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexMethod):146:153 -> a
-    192:199:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):123 -> a
-    200:200:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexMethod):151:151 -> a
-    200:200:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):123 -> a
-    201:212:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):126:137 -> a
-    213:217:void hideCandidates(java.util.List,java.util.List,java.util.List):290:294 -> a
-    218:218:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
-    218:218:void hideCandidates(java.util.List,java.util.List,java.util.List):294 -> a
-    219:232:void hideCandidates(java.util.List,java.util.List,java.util.List):296:309 -> a
-    233:233:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
-    233:233:void hideCandidates(java.util.List,java.util.List,java.util.List):294 -> a
+    111:111:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):205 -> a
+    111:111:void process(com.android.tools.r8.graph.DexClass):96 -> a
+    112:157:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):205:250 -> a
+    112:157:void process(com.android.tools.r8.graph.DexClass):96 -> a
+    158:170:void process(com.android.tools.r8.graph.DexClass):97:109 -> a
+    171:189:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):113:131 -> a
+    190:194:void hideCandidates(java.util.List,java.util.List,java.util.List):260:264 -> a
+    195:195:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    195:195:void hideCandidates(java.util.List,java.util.List,java.util.List):264 -> a
+    196:209:void hideCandidates(java.util.List,java.util.List,java.util.List):266:279 -> a
+    210:210:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    210:210:void hideCandidates(java.util.List,java.util.List,java.util.List):264 -> a
 com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.D.d.l:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
@@ -30565,16 +30552,16 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView):47:47 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView):44:44 -> <init>
     1:12:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):52:63 -> a
-    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     13:13:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):64 -> a
     14:22:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):65:73 -> a
-    23:23:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    23:23:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     23:23:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):74 -> a
     24:24:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):76:76 -> a
-    25:25:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    25:25:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     25:25:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):77 -> a
     26:29:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):78:81 -> a
-    30:30:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    30:30: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):40:40 -> a
     30:30:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):81 -> a
     31:35:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):80:84 -> a
     36:53:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):83:100 -> a
@@ -30633,115 +30620,112 @@
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map callBackMethods -> d
     com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> c
-    java.util.Set trackedCallBackAPIs -> e
-    java.util.Set trackedAPIs -> f
-    boolean $assertionsDisabled -> g
-    1:1:void <clinit>():60:60 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):71:71 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.AppView):67:80 -> <init>
-    1:1:void desugar(com.android.tools.r8.ir.code.IRCode):86:86 -> a
-    2:17:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):129:144 -> a
-    2:17:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
-    18:39:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):183:204 -> a
-    18:39:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):144 -> a
-    18:39:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
-    40:41:void addCallBackSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):209:210 -> a
-    40:41:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):205 -> a
-    40:41:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):144 -> a
-    40:41:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
-    42:46:void desugar(com.android.tools.r8.ir.code.IRCode):92:96 -> a
-    47:47:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    47:47:void desugar(com.android.tools.r8.ir.code.IRCode):97 -> a
-    48:64:void desugar(com.android.tools.r8.ir.code.IRCode):98:114 -> a
-    65:79: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):289:303 -> a
-    65:79:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    80:81:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):420:421 -> a
-    80:81: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):306 -> a
-    80:81:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    82:82:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444:444 -> a
-    82:82:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):421 -> a
-    82:82: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):306 -> a
-    82:82:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    83:83:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    83:83:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444 -> a
-    83:83:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):421 -> a
-    83:83: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):306 -> a
-    83:83:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    84:84:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    84:84:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444 -> a
-    84:84:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):421 -> a
-    84:84: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):306 -> a
-    84:84:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    85:87:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):422:424 -> a
-    85:87: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):306 -> a
-    85:87:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    88: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):309:332 -> a
-    88:111:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    112:115:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):411:414 -> a
-    112: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):334 -> a
-    112:115:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    116:116:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444:444 -> a
-    116:116:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):414 -> a
-    116:116: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):334 -> a
-    116:116:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    117:117:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    117:117:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444 -> a
-    117:117:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):414 -> a
-    117:117: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):334 -> a
-    117:117:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    118:118:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    118:118:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444 -> a
-    118:118:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):414 -> a
-    118:118: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):334 -> a
-    118:118:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    119:119:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):415:415 -> a
-    119:119: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):334 -> a
-    119:119:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    120:141: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):333:354 -> a
-    120:141:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    142:142: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
-    142:142: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):350 -> a
-    142:142:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    143:144: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):356:357 -> a
-    143:144:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    145:145: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):356:356 -> a
-    145:145:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    146:146:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    146:146: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):360 -> a
-    146:146:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    147:148: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):361:362 -> a
-    147:148:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    149:149:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    149:149: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):363 -> a
-    149:149:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    150:150: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):365:365 -> a
-    150:150:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    151:151:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    151:151:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):366 -> a
-    151:151:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    152:154: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):367:369 -> a
-    152:154:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    155:155:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    155:155: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):370 -> a
-    155:155:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    156:157: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):375:376 -> a
-    156:157:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    158:181:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):150:173 -> a
-    182:196: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):215:229 -> a
-    197:205:void generateWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):235:243 -> a
-    206:212:void generateTrackDesugaredAPIWarnings(java.util.Set,java.lang.String):248:254 -> a
-    213:217:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):258:262 -> a
-    218:218:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):278:278 -> a
-    219:219:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    219:219:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):279 -> a
-    220:220:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):279:279 -> a
-    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    221:221:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):279 -> a
-    222:222:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):280:280 -> a
-    223:240:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):385:402 -> a
-    241:251: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):430:440 -> a
-    252:252: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):439:439 -> a
-    253:254:boolean canConvert(com.android.tools.r8.graph.DexType):448:449 -> a
+    boolean $assertionsDisabled -> e
+    1:1:void <clinit>():59:59 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):68:68 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):66:71 -> <init>
+    1:1:void desugar(com.android.tools.r8.ir.code.IRCode):76:76 -> a
+    2:17:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):119:134 -> a
+    2:17:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    18:36:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):173:191 -> a
+    18:36:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):134 -> a
+    18:36:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    37:38:void addCallBackSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):196:197 -> a
+    37:38:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
+    37:38:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):134 -> a
+    37:38:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    39:43:void desugar(com.android.tools.r8.ir.code.IRCode):82:86 -> a
+    44:44:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    44:44:void desugar(com.android.tools.r8.ir.code.IRCode):87 -> a
+    45:61:void desugar(com.android.tools.r8.ir.code.IRCode):88:104 -> a
+    62:73: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):262:273 -> a
+    62:73:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    74:75:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):390:391 -> a
+    74:75: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):276 -> a
+    74:75:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    76:76:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414:414 -> a
+    76:76:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    76:76: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):276 -> a
+    76:76:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    77:77:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    77:77:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    77:77:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    77:77: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):276 -> a
+    77:77:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    78:78:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    78:78:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    78:78:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    78:78: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):276 -> a
+    78:78:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    79:81:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):392:394 -> a
+    79:81: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):276 -> a
+    79:81:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    82:105: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):279:302 -> a
+    82:105:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    106:109:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):381:384 -> a
+    106:109:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    106:109:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    110:110:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414:414 -> a
+    110:110:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    110:110:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    110:110:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    111:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    111:111:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    111:111:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    111: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):304 -> a
+    111:111:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    112:112:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    112:112:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> 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):304 -> a
+    112:112:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    113:113:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):385:385 -> a
+    113:113:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    113:113:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    114:135: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):303:324 -> a
+    114:135:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    136:136: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
+    136:136: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):320 -> a
+    136:136:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    137:138: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):326:327 -> a
+    137:138:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    139:139: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):326:326 -> a
+    139:139:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    140:140:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    140:140: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):330 -> a
+    140:140:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    141:142: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):331:332 -> a
+    141:142:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    143:143:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    143:143: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):333 -> a
+    143:143:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    144:144: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):335:335 -> a
+    144:144:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    145:145:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    145:145: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):336 -> a
+    145:145:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    146:148: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):337:339 -> a
+    146:148:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    149:149:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    149:149: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):340 -> a
+    149:149:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    150:151:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):345:346 -> a
+    150:151:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    152:175:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):140:163 -> a
+    176:190: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):202:216 -> a
+    191:195:void generateWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):222:226 -> a
+    196:200:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):231:235 -> a
+    201:201:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):251:251 -> a
+    202:202:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    202:202:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):252 -> a
+    203:203:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):252:252 -> a
+    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    204:204:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):252 -> a
+    205:205:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):253:253 -> a
+    206:223:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):355:372 -> a
+    224:234: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):400:410 -> a
+    235:235: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):409:409 -> a
+    236:237:boolean canConvert(com.android.tools.r8.graph.DexType):418:419 -> a
 com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.D.d.s:
     java.util.Map rewritePrefix -> b
     java.util.Map emulateLibraryInterface -> c
@@ -30782,12 +30766,12 @@
     7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder addDontRewriteInvocation(java.lang.String):181:181 -> a
     8:8:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> a
     8:8:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):173 -> a
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     9:9:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> a
     9:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):173 -> a
     10:10:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> a
     10:10:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):174 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     11:11:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> a
     11:11:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):174 -> a
     12:12:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putBackportCoreLibraryMember(java.lang.String,java.lang.String):175:175 -> a
@@ -30795,34 +30779,34 @@
     1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setLibraryCompilation():136:136 -> b
     2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
     2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):154 -> b
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     3:3:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):154 -> b
     4:4:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
     4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):155 -> b
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     5:5:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):155 -> b
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putCustomConversion(java.lang.String,java.lang.String):156:156 -> b
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> b
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     8:8:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> b
     1:1:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder setProgramCompilation():131:131 -> c
     2:2:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> c
     2:2:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):147 -> c
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     3:3:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> c
     3:3:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):147 -> c
     4:4:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> c
     4:4:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):148 -> c
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     5:5:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> c
     5:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):148 -> c
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putEmulateLibraryInterface(java.lang.String,java.lang.String):149:149 -> c
     1:5:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):161:165 -> d
     6:6:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198:198 -> d
     6:6:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):166 -> d
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> d
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):198 -> d
     7:7:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):166 -> d
     8:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):167:168 -> d
@@ -30906,7 +30890,7 @@
     44:44:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
     45:45:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):156:156 -> a
     45:45:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     46:46:com.android.tools.r8.graph.DexType createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):155 -> a
     46:46:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):177 -> a
     47:48:com.android.tools.r8.utils.Pair lambda$getWrapper$0(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):178:179 -> a
@@ -30997,369 +30981,362 @@
     12:12:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
     12:12:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160 -> a
     13:15:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):160:162 -> a
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     16:16:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):161 -> a
     17:24:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):159:166 -> a
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     25:25:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):165 -> a
     26:26:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:163 -> a
     27:36:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):177:186 -> a
-    37:37:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    37:37:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     37:37:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):187 -> a
-    38:65:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):189:216 -> a
-    66:66:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):524:524 -> a
-    66:66:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):217 -> a
-    67:71:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):228:232 -> a
-    72:72:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
-    72:72:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233 -> a
-    73:73:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):234:234 -> a
-    74:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):232:240 -> a
-    83:83:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
-    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
-    84:84:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    84:84:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> a
-    84:84:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
-    85:85:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
-    85:85:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
-    86:86:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
-    87:118:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:271 -> a
-    119:120:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
-    119:120:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):270 -> a
-    121:121:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:272 -> a
-    122:122:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    122:122:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
-    123:123:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    123:123:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    123:123:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
-    124:125:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):275:276 -> a
-    126:144:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:290 -> a
-    145:146:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
-    145:146:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289 -> a
-    147:147:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:291 -> a
-    148:148:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    148:148:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
-    149:149:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    149:149:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    149:149:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
-    150:150:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293:293 -> a
-    151:189:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:329 -> a
-    190:190:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    190:190:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
-    191:191:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    191:191:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    191:191:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
-    192:192:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331:331 -> a
-    193:202:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):329:338 -> a
-    203:203:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> a
-    203:203:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
-    204:204:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> a
-    204:204:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> a
-    204:204:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
-    205:205:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):340:340 -> a
-    206:206:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):338:338 -> a
-    207:209:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):312:314 -> a
-    210:210:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    210:210:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    210:210:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314 -> a
-    211:259:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:362 -> a
-    260:260:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    260:260:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362 -> a
-    261:273:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:374 -> a
-    274:274:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):236:236 -> a
-    275:276:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):386:387 -> a
-    277:278:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):537:538 -> a
-    277:278: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):387 -> a
-    279:280: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):388:389 -> a
-    281:283: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):629:631 -> a
-    281:283: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):391 -> a
-    284:284: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):628:628 -> a
-    284:284: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):391 -> a
-    285:286: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):392:393 -> a
-    287:287: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):389:389 -> a
-    288:292:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):464:468 -> a
-    293:324:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):472:503 -> a
-    325:325:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    325:325:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
-    326:326:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    326:326:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    326:326:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
-    327:341:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503:517 -> a
-    342:342:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    342:342:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
-    343:343:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    343:343:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    343:343:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
-    344:344:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517:517 -> a
-    345:345:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:528 -> a
-    346:346:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    346:346:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528 -> a
-    347:351:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:532 -> a
-    352:370:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):587:605 -> a
-    371:380:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):755:764 -> a
-    381:382:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:777 -> a
-    383:383:java.lang.String getCompanionClassDescriptor(java.lang.String):771:771 -> a
-    383:383:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):778 -> a
-    384:384:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    384:384:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):779 -> a
-    385:389:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):788:792 -> a
-    390:390:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    390:390:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):792 -> a
-    391:400:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):837:846 -> a
-    401:401:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):843:843 -> a
-    402:402:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    403:403:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    404:404:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    404:404:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    405:407:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):926:928 -> a
-    408:408:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964:964 -> a
-    409:409:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    409:409:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964 -> a
-    410:413:java.util.Map processEmulatedInterfaceHierarchy():575:578 -> a
-    410:413:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):556 -> a
-    410:413:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    414:421:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):557:564 -> a
-    414:421:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    422:422:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:636 -> a
-    422:422:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    422:422:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    423:423:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    423:423:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
-    423:423:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    423:423:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    424:428:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637:641 -> a
-    424:428:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    424:428:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    429:435:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
-    429:435:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    429:435:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    436:436:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    436:436:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
-    436:436:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    436:436:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    437:437:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
-    437:437:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    437:437:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    438:457:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:666 -> a
-    438:457:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    438:457:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    458:466:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):612:620 -> a
-    458:466:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
-    458:466:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    458:466:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    467:471:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
-    467:471:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    467:471:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    472:474:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1284:1286 -> a
-    472:474:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
-    472:474:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    472:474:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    475:475:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
-    475:475:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    475:475:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    476:476:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
-    476:476:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    476:476:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    477:477:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
-    477:477:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    477:477:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    478:478:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1284:1284 -> a
-    478:478:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
-    478:478:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    478:478:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    479:485:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:686 -> a
-    479:485:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    479:485:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    486:486:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    486:486:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
-    486:486:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    486:486:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    487:487:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
-    487:487:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    487:487:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    488:490:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1284:1286 -> a
-    488:490:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
-    488:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    488:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    491:491:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
+    38:81:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):189:232 -> a
+    82:82:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
+    82:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233 -> a
+    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):234:234 -> a
+    84:92:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):232:240 -> a
+    93:93:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
+    93:93:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    94:94:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    94:94:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> a
+    94:94:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    95:95:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
+    95:95:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    96:96:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    97:128:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:271 -> a
+    129:130:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
+    129:130:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):270 -> a
+    131:131:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:272 -> a
+    132:132:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    132:132:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
+    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    133:133:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
+    134:135:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):275:276 -> a
+    136:154:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:290 -> a
+    155:156:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
+    155:156:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289 -> a
+    157:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:291 -> a
+    158:158:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
+    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    159:159:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
+    160:160:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293:293 -> a
+    161:199:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:329 -> a
+    200:200:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    200:200:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
+    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    201:201:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
+    202:202:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331:331 -> a
+    203:212:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):329:338 -> a
+    213:213:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> a
+    213:213:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
+    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> a
+    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> a
+    214:214:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
+    215:215:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):340:340 -> a
+    216:216:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):338:338 -> a
+    217:219:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):312:314 -> a
+    220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    220:220:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314 -> a
+    221:269:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:362 -> a
+    270:270:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    270:270:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362 -> a
+    271:283:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:374 -> a
+    284:284:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):236:236 -> a
+    285:286: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):386:387 -> a
+    287:288:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):537:538 -> a
+    287:288: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):387 -> a
+    289:290: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):388:389 -> a
+    291:293: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):629:631 -> a
+    291:293: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):391 -> a
+    294:294: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):628:628 -> a
+    294:294: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):391 -> a
+    295:296: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):392:393 -> a
+    297:297: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):389:389 -> a
+    298:302:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):464:468 -> a
+    303:334:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):472:503 -> a
+    335:335:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    335:335:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
+    336:336:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    336:336:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    336:336:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
+    337:351:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503:517 -> a
+    352:352:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    352:352:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
+    353:353:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    353:353:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    353:353:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
+    354:354:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517:517 -> a
+    355:355:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):524:524 -> a
+    356:374:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):587:605 -> a
+    375:384:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):755:764 -> a
+    385:386:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:777 -> a
+    387:387:java.lang.String getCompanionClassDescriptor(java.lang.String):771:771 -> a
+    387:387:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):778 -> a
+    388:388:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    388:388:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):779 -> a
+    389:393:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):788:792 -> a
+    394:394:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    394:394:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):792 -> a
+    395:404:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):837:846 -> a
+    405:405:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):843:843 -> a
+    406:406:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    407:407:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    408:408:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    408:408:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    409:411:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):926:928 -> a
+    412:412:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964:964 -> a
+    413:413:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    413:413:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964 -> a
+    414:417:java.util.Map processEmulatedInterfaceHierarchy():575:578 -> a
+    414:417:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):556 -> a
+    414:417:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    418:425:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):557:564 -> a
+    418:425:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    426:426:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:636 -> a
+    426:426:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    426:426:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    427:427:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    427:427:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
+    427:427:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    427:427:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    428:432:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637:641 -> a
+    428:432:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    428:432:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    433:439:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
+    433:439:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    433:439:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    440:440:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    440:440:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
+    440:440:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    440:440:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    441:441:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
+    441:441:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    441:441:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    442:461:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:666 -> a
+    442:461:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    442:461:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    462:470:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):612:620 -> a
+    462:470:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    462:470:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    462:470:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    471:475:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
+    471:475:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    471:475:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    476:478:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1266 -> a
+    476:478:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
+    476:478:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    476:478:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    479:479:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
+    479:479:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    479:479:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    480:480:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
+    480:480:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    480:480:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    481:481:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
+    481:481:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    481:481:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    482:482:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1264 -> a
+    482:482:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
+    482:482:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    482:482:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    483:489:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:686 -> a
+    483:489:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    483:489:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    490:490:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    490:490:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
+    490:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    490:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    491:491:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
     491:491:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     491:491:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    492:492:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
-    492:492:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    492:492:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    493:493:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
-    493:493:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    493:493:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    494:494:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1284:1284 -> a
-    494:494:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
-    494:494:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    494:494:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    495:495:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
+    492:494:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1266 -> a
+    492:494:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
+    492:494:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    492:494:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    495:495:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
     495:495:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     495:495:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    496:498: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):629:631 -> a
-    496:498:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
-    496:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    496:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    499:499: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):628:628 -> a
-    499:499:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    496:496:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
+    496:496:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    496:496:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    497:497:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
+    497:497:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    497:497:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    498:498:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1264 -> a
+    498:498:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
+    498:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    498:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    499:499:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
     499:499:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     499:499:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    500:500:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
-    500:500:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    500:500:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    501:501:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
-    501:501:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    501:501:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    502:543:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
-    502:543:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    502:543:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    544:544:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
-    544:544:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566 -> a
-    544:544:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    545:546:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566:567 -> a
-    545:546:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    547:547:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    547:547:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
-    547:547:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    547:547:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    548:556:void duplicateEmulatedInterfaces():936:944 -> a
-    548:556:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    557:557:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    557:557:void duplicateEmulatedInterfaces():946 -> a
-    557:557:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    558:558:void duplicateEmulatedInterfaces():946:946 -> a
-    558:558:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    559:561:void duplicateEmulatedInterfaces():945:947 -> a
-    559:561:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    562:562:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    562:562:void duplicateEmulatedInterfaces():947 -> a
+    500:502: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):629:631 -> a
+    500:502:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    500:502:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    500:502:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    503:503: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):628:628 -> a
+    503:503:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    503:503:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    503:503:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    504:504:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
+    504:504:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    504:504:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    505:505:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
+    505:505:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    505:505:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    506:547:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
+    506:547:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    506:547:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    548:548:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
+    548:548:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566 -> a
+    548:548:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    549:550:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566:567 -> a
+    549:550:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    551:551:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    551:551:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):637 -> a
+    551:551:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    551:551:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    552:560:void duplicateEmulatedInterfaces():936:944 -> a
+    552:560:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    561:561:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    561:561:void duplicateEmulatedInterfaces():946 -> a
+    561:561:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    562:562:void duplicateEmulatedInterfaces():946:946 -> a
     562:562:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    563:564:void duplicateEmulatedInterfaces():947:948 -> a
-    563:564:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    565:565:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    565:565:void duplicateEmulatedInterfaces():948 -> a
-    565:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    566:568:void duplicateEmulatedInterfaces():948:950 -> a
-    566:568:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    569:569:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:971 -> a
-    570:571:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1026:1027 -> a
-    570:571:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    572:573:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
-    572:573:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1028 -> a
-    572:573:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    574:577:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1029:1032 -> a
-    574:577:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    578:584:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:977 -> a
-    585:587:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1009:1011 -> a
-    585:587:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
-    588:589:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
-    588:589:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1012 -> a
-    588:589:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
-    590:599:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1013:1022 -> a
-    590:599:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
-    600:604:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978:982 -> a
-    605:605:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
-    605:605:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    606:610:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982:986 -> a
-    611:611:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    611:611:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
-    612:613:void renameEmulatedInterfaces():881:882 -> a
-    612:613:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    614:622:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):894:902 -> a
-    614:622:void renameEmulatedInterfaces():883 -> a
-    614:622:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    623:624:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):913:914 -> a
-    623:624:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
-    623:624:void renameEmulatedInterfaces():883 -> a
-    623:624:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    625:625:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    625:625:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):915 -> a
-    625:625:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
-    625:625:void renameEmulatedInterfaces():883 -> a
-    625:625:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    626:627:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):915:916 -> a
-    626:627:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
-    626:627:void renameEmulatedInterfaces():883 -> a
-    626:627:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    628:628:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    628:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):916 -> a
-    628:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
-    628:628:void renameEmulatedInterfaces():883 -> a
-    628:628:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    629:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904:906 -> a
-    629:631:void renameEmulatedInterfaces():883 -> a
-    629:631:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    632:634:void renameEmulatedInterfaces():884:886 -> a
-    632:634:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    635:635:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    635:635:void renameEmulatedInterfaces():886 -> a
-    635:635:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    636:636:void renameEmulatedInterfaces():886:886 -> a
-    636:636:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    637:639:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):920:922 -> a
-    637:639:void renameEmulatedInterfaces():887 -> a
-    637:639:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    640:640:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):990:990 -> a
-    641:643:void clear():997:999 -> a
-    641:643:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):993 -> a
-    644:658:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1036:1050 -> a
-    659:659:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1043:1043 -> a
-    660:660:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067:1067 -> a
-    661:661:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
-    661:661:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067 -> a
-    662:665:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1070:1073 -> a
-    666:666: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):1089:1089 -> a
-    667:668:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1102:1103 -> a
-    667:668: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):1093 -> a
-    669:670:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1059:1060 -> a
-    669:670: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):1105 -> a
-    669:670: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):1093 -> a
-    671:673: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):1106:1108 -> a
-    671:673: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):1093 -> a
-    674:674:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):524:524 -> a
-    674:674: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):1114 -> a
-    674:674: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):1093 -> a
-    675:681: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):1119:1125 -> a
-    675:681: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):1093 -> a
-    682:682:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
-    682:682: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):1125 -> a
-    682:682: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):1093 -> a
-    683:683:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    683:683:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
-    683:683: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):1125 -> a
-    683:683: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):1093 -> a
-    684:684:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    684:684:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
-    684:684: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):1125 -> a
-    684:684: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):1093 -> a
-    685:685:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
-    685:685: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):1125 -> a
-    685:685: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):1093 -> a
-    686:702: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):1129:1145 -> a
-    686:702: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):1093 -> a
-    703:703: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):1094:1094 -> a
-    704:706: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):1109:1111 -> a
-    704:706: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):1093 -> a
-    707:707:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    707:707: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):1111 -> a
-    707:707: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):1093 -> a
-    708:708: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):1111:1111 -> a
-    708:708: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):1093 -> a
+    563:565:void duplicateEmulatedInterfaces():945:947 -> a
+    563:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    566:566:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    566:566:void duplicateEmulatedInterfaces():947 -> a
+    566:566:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    567:568:void duplicateEmulatedInterfaces():947:948 -> a
+    567:568:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    569:569:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    569:569:void duplicateEmulatedInterfaces():948 -> a
+    569:569:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    570:572:void duplicateEmulatedInterfaces():948:950 -> a
+    570:572:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    573:573:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:971 -> a
+    574:575:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1026:1027 -> a
+    574:575:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    576:577:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
+    576:577:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1028 -> a
+    576:577:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    578:581:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1029:1032 -> a
+    578:581:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    582:588:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:977 -> a
+    589:591:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1009:1011 -> a
+    589:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    592:593:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
+    592:593:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1012 -> a
+    592:593:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    594:603:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1013:1022 -> a
+    594:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    604:608:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978:982 -> a
+    609:609:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
+    609:609:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    610:614:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982:986 -> a
+    615:615:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    615:615:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
+    616:617:void renameEmulatedInterfaces():881:882 -> a
+    616:617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    618:626:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):894:902 -> a
+    618:626:void renameEmulatedInterfaces():883 -> a
+    618:626:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    627:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):913:914 -> a
+    627:628:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    627:628:void renameEmulatedInterfaces():883 -> a
+    627:628:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    629:629:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    629:629:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):915 -> a
+    629:629:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    629:629:void renameEmulatedInterfaces():883 -> a
+    629:629:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    630:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):915:916 -> a
+    630:631:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    630:631:void renameEmulatedInterfaces():883 -> a
+    630:631:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    632:632:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):916 -> a
+    632:632:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    632:632:void renameEmulatedInterfaces():883 -> a
+    632:632:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    633:635:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904:906 -> a
+    633:635:void renameEmulatedInterfaces():883 -> a
+    633:635:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    636:638:void renameEmulatedInterfaces():884:886 -> a
+    636:638:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    639:639:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    639:639:void renameEmulatedInterfaces():886 -> a
+    639:639:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    640:640:void renameEmulatedInterfaces():886:886 -> a
+    640:640:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    641:643:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):920:922 -> a
+    641:643:void renameEmulatedInterfaces():887 -> a
+    641:643:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    644:644:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):990:990 -> a
+    645:647:void clear():997:999 -> a
+    645:647:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):993 -> a
+    648:662:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1036:1050 -> a
+    663:663:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1043:1043 -> a
+    664:664:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067:1067 -> a
+    665:665:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
+    665:665:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067 -> a
+    666:669:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1070:1073 -> a
+    670:670: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):1089:1089 -> a
+    671:672:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1102:1103 -> a
+    671:672: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):1093 -> a
+    673:674:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1059:1060 -> a
+    673:674: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):1105 -> a
+    673:674: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):1093 -> a
+    675:694:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1106:1125 -> a
+    675:694:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    695:695:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
+    695:695:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    695:695:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    696:696:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    696:696:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
+    696:696:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    696:696:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    697:697:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    697:697:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
+    697:697:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    697:697:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    698:698:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
+    698:698: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):1125 -> a
+    698:698: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):1093 -> a
+    699:715: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):1129:1145 -> a
+    699:715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    716:716: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):1094:1094 -> a
+    717:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1109:1111 -> a
+    717:719:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    720:720:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    720:720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1111 -> a
+    720:720:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    721:721: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):1111:1111 -> a
+    721:721: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):1093 -> a
     1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):171:171 -> b
-    2:3:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
-    4:4:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):742:742 -> b
-    4:4:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750 -> b
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
-    5:5:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):751 -> b
-    6:6:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> b
-    7:7:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> b
-    7:7:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> b
+    2:2:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:528 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
+    3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528 -> b
+    4:8:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:532 -> b
+    9:10:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
+    11:11:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):742:742 -> b
+    11:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750 -> b
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
+    12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):751 -> b
+    13:13:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> b
+    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> b
+    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> b
     1:1:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807:807 -> c
     2:2:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> c
     2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807 -> c
     3:6:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807:810 -> c
     7:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):809:809 -> c
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c
     8:8:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811 -> c
     9:9:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> c
     10:10:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> c
@@ -31465,7 +31442,7 @@
     2:40: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):65:103 -> <init>
     41:47: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):101:107 -> <init>
     1:21:com.android.tools.r8.graph.DexType createLambdaClassType(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor):113:133 -> a
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     22: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):133 -> a
     23:23:com.android.tools.r8.graph.DexProgramClass getOrCreateLambdaClass():137:137 -> a
     24:25:com.android.tools.r8.graph.DexField getCaptureField(int):184:185 -> a
@@ -31648,7 +31625,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):437:437 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):435:435 -> 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
@@ -31658,12 +31635,12 @@
     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():513:513 -> 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():335:335 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513 -> a
     64:64:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     65:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:522 -> a
     65:65:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522 -> a
     66:66:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     67:77:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:532 -> a
@@ -31675,7 +31652,7 @@
     95:112:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
     113:113:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     113:113:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):437:437 -> a
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):435:435 -> a
     114:114:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     114:114:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
     115:156:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
@@ -31742,7 +31719,7 @@
     3:18:void synthesizeLambdaClassesFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.LensCodeRewriter):110:125 -> a
     19:19:void synthesizeLambdaClassesFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.conversion.LensCodeRewriter):123:123 -> a
     20:26:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):144:150 -> a
-    27:27:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next() -> a
+    27:27:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     27:27:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):151 -> a
     28:38:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):152:162 -> a
     39:40:com.android.tools.r8.ir.desugar.LambdaClass getKnownLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):333:334 -> a
@@ -31753,20 +31730,20 @@
     55:55:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     55:55: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):388 -> a
     55:55:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
-    56:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    56:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     56:56: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):387 -> a
     56:56:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
     57:90: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):390:423 -> a
     57:90:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
-    91:91:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    91:91: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):40:40 -> a
     91:91: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):423 -> a
     91:91:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
-    92:92:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    92:92:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     92:92: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):425 -> a
     92:92:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
     93:96: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):426:429 -> a
     93:96:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
-    97:97:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    97:97:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     97:97: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):435 -> a
     97:97:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
     98:112: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):436:450 -> a
@@ -31780,73 +31757,73 @@
     119:119:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     119:119:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
     120:122:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175:177 -> a
-    123:129:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):185:191 -> a
-    130:135:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):470:475 -> a
-    130:135:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    136:136:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    136:136:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):475 -> a
-    136:136:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> 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.TypeLatticeElement):1012:1012 -> a
-    137:137:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):474 -> a
-    137:137:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    138:155:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):480:497 -> a
-    138:155:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    156:157:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
-    156:157:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499 -> a
-    156:157:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    158:159:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499:500 -> a
-    158:159:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    160:162:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):200:202 -> a
-    163:163:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):201:201 -> a
-    164:172:boolean removeLambdaDeserializationMethods(java.lang.Iterable):210:218 -> a
-    173:173:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
-    173:173:boolean removeLambdaDeserializationMethods(java.lang.Iterable):218 -> a
-    174:176:boolean removeLambdaDeserializationMethods(java.lang.Iterable):219:221 -> a
-    177:183:void adjustAccessibility():237:243 -> a
-    184:184:void adjustAccessibility():242:242 -> a
-    185:186:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):252:253 -> a
-    187:196:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):259:268 -> a
-    197:197:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):265:265 -> a
-    198:202:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):287:291 -> a
-    203:209:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
-    203:209:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
-    210:210:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290:290 -> a
-    211:211:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
-    211:211:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
-    212:216:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):301:305 -> a
-    217:223:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
-    217:223:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
-    224:228:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306:310 -> a
-    229:229:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    229:229:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):310 -> a
-    230:237:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):311:318 -> a
-    238:238:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    238:238:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):338 -> a
-    238:238:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    239:239:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    239:239:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):339 -> a
-    239:239:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    240:240:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):340:340 -> a
-    240:240:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    241:241:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    241:241:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):341 -> a
-    241:241:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    242:248:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):342:348 -> a
-    242:248:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    249:249:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):347:347 -> a
-    249:249:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    250:250:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    250:250:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):346 -> a
-    250:250:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    251:251:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):344:344 -> a
-    251:251:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    252:252:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
-    252:252:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
-    253:253:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325:325 -> a
-    254:254:boolean isInMainDexList(com.android.tools.r8.graph.DexType):295:295 -> a
-    254:254:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):326 -> a
-    255:255:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):327:327 -> a
-    256:258:java.lang.Object getKnown(java.util.Map,java.lang.Object):352:354 -> a
+    123:130:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):185:192 -> a
+    131:141:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):465:475 -> a
+    131:141:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    142:142:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    142:142:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):475 -> a
+    142:142:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    143:143:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    143:143:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):474 -> a
+    143:143:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    144:161:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):480:497 -> a
+    144:161:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    162:163:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    162:163:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499 -> a
+    162:163:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    164:165:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499:500 -> a
+    164:165:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    166:168:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):200:202 -> a
+    169:169:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):201:201 -> a
+    170:178:boolean removeLambdaDeserializationMethods(java.lang.Iterable):210:218 -> a
+    179:179:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    179:179:boolean removeLambdaDeserializationMethods(java.lang.Iterable):218 -> a
+    180:182:boolean removeLambdaDeserializationMethods(java.lang.Iterable):219:221 -> a
+    183:189:void adjustAccessibility():237:243 -> a
+    190:190:void adjustAccessibility():242:242 -> a
+    191:192:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):252:253 -> a
+    193:202:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):259:268 -> a
+    203:203:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):265:265 -> a
+    204:208:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):287:291 -> a
+    209:215:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
+    209:215:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
+    216:216:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290:290 -> a
+    217:217:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
+    217:217:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
+    218:222:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):301:305 -> a
+    223:229:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
+    223:229:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    230:234:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306:310 -> a
+    235:235:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    235:235:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):310 -> a
+    236:243:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):311:318 -> a
+    244:244:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    244:244:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):338 -> a
+    244:244:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    245:245:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    245:245:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):339 -> a
+    245:245:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    246:246:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):340:340 -> a
+    246:246:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    247:247:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
+    247:247:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):341 -> a
+    247:247:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    248:254:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):342:348 -> a
+    248:254:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    255:255:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):347:347 -> a
+    255:255:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    256:256:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    256:256:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):346 -> a
+    256:256:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    257:257:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):344:344 -> a
+    257:257:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    258:258:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
+    258:258:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    259:259:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325:325 -> a
+    260:260:boolean isInMainDexList(com.android.tools.r8.graph.DexType):295:295 -> a
+    260:260:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):326 -> a
+    261:261:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):327:327 -> a
+    262:264:java.lang.Object getKnown(java.util.Map,java.lang.Object):352:354 -> a
     1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):91:91 -> b
     2:4:java.util.Set getDesugaredCallSites():273:275 -> b
 com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.D.d.L:
@@ -31894,33 +31871,33 @@
     61:66:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):301:306 -> a
     67:68:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):219:220 -> a
     67:68:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    69:69: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):1298:1298 -> a
+    69:69: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):1278:1278 -> a
     69:69:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     69:69:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     70:70:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    70:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1298 -> a
+    70:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278 -> a
     70:70:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     70:70:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    71:71: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):1298:1298 -> a
+    71:71: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):1278:1278 -> a
     71:71:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     71:71:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     72:72:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    72:72: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):1300 -> a
+    72:72: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):1280 -> a
     72:72:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     72:72:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    73:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1299:1302 -> a
+    73:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1279:1282 -> a
     73:76:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     73:76:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     77:77:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221:221 -> a
     77:77:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    78:78: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):1298:1298 -> a
+    78:78: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):1278:1278 -> a
     78:78:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     78:78:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     79:86:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):308:315 -> a
     87:89:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureInvokeBridge$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):318:320 -> a
     1:14:java.util.List extractNest(com.android.tools.r8.graph.DexClass):94:107 -> b
     15:16:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():148:149 -> b
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     17:17:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():149 -> b
     18:36:com.android.tools.r8.graph.DexProgramClass createNestAccessConstructor():149:167 -> b
     37:37:void com.android.tools.r8.graph.DexProgramClass.<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):70:70 -> b
@@ -32077,8 +32054,8 @@
     2:4:void <init>(com.android.tools.r8.graph.AppView):34:36 -> <init>
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1055 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
     2:2:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44 -> a
     3:4:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:45 -> a
     5:5:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
@@ -32121,7 +32098,7 @@
     84:84:void <init>(com.android.tools.r8.graph.AppView):108:108 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory access$100(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> a
     2:6:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):117:121 -> a
-    7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     7:7:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):122 -> a
     8:25:void desugarStringConcats(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode):123:140 -> a
     26:41:void rewriteMakeConcat(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):155:170 -> a
@@ -32195,13 +32172,13 @@
     11:11:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     11:11:void desugar():342 -> a
     12:12:void desugar():343:343 -> 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.TypeLatticeElement):1012:1012 -> 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.TypeLatticeElement):1008:1008 -> a
     13:13:void desugar():343 -> a
     14:14:void desugar():344:344 -> a
     15:16:void appendInstruction(com.android.tools.r8.ir.code.Instruction):308:309 -> a
     15:16:void desugar():344 -> a
     17:18:void desugar():347:348 -> a
-    19:19:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    19:19: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):40:40 -> a
     19:19:void desugar():348 -> a
     20:21:void appendInstruction(com.android.tools.r8.ir.code.Instruction):308:309 -> a
     20:21:void desugar():347 -> a
@@ -32211,7 +32188,7 @@
     26:26:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):413:413 -> a
     26:26:void desugar():352 -> a
     27:36:void desugar():356:365 -> 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.TypeLatticeElement):1012:1012 -> 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.TypeLatticeElement):1008:1008 -> a
     37:37:void desugar():365 -> a
     38:39:void desugar():369:370 -> a
     40:70:void desugar():369:399 -> a
@@ -32230,7 +32207,7 @@
     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>
     1:2:com.android.tools.r8.ir.code.Value getOrCreateValue():443:444 -> a
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     3:3:com.android.tools.r8.ir.code.Value getOrCreateValue():444 -> a
     4:8:com.android.tools.r8.ir.code.Value getOrCreateValue():445:449 -> a
     9:9:com.android.tools.r8.ir.code.Value getOrCreateValue():445:445 -> a
@@ -32262,34 +32239,34 @@
     14:19:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):122:127 -> a
     20:38:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):237:255 -> a
     20:38:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     39:39: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):262 -> a
     39:39:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     40:40: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):262:262 -> a
     40:40:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     41:41: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):266 -> a
     41:41:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     42:42: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):266:266 -> a
     42:42:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     43:43: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):270 -> a
     43:43:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     44:44: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):270:270 -> a
     44:44:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     45:45: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):271 -> a
     45:45:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     46:47: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):271:272 -> a
     46:47:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     48:48:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):269:269 -> a
     48:48:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     49:49: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):280 -> a
     49:49:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     50:50: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):280:280 -> a
     50:50:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     51:51: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):282 -> a
     51:51:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     52:52: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):282:282 -> a
@@ -32298,27 +32275,27 @@
     53:55:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     56:62:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):279:285 -> a
     56:62:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     63:63: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):287 -> a
     63:63:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     64:64: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):287:287 -> a
     64:64:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     65:65: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):291 -> a
     65:65:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     66:66: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):291:291 -> a
     66:66:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     67:67: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):293 -> a
     67:67:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     68:68: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):293:293 -> a
     68:68:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     69:69:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):294 -> a
     69:69:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     70:70:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):294:294 -> a
     70:70:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     71:71: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):295 -> a
     71:71:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     72:72:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295:295 -> a
@@ -32327,27 +32304,27 @@
     73:77:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     78:78:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):290:290 -> a
     78:78:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     79:79: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):303 -> a
     79:79:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     80:80: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):303:303 -> a
     80:80:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     81:81: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):307 -> a
     81:81:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     82:82: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):307:307 -> a
     82:82:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     83:83: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):309 -> a
     83:83:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     84:84: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):309:309 -> a
     84:84:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     85:85: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):310 -> a
     85:85:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     86:86: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):310:310 -> a
     86:86:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     87:87: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):311 -> a
     87:87:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     88:88: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):311:311 -> a
@@ -32356,34 +32333,34 @@
     89:93:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     94:94:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):306:306 -> a
     94:94:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     95:95:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):320 -> a
     95:95:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     96:96: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):320:320 -> a
     96:96:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     97:97: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):322 -> a
     97:97:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     98:98: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):322:322 -> a
     98:98:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     99:99: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):327 -> a
     99:99:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     100:100: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):327:327 -> a
     100:100:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     101:101: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):328 -> a
     101:101:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     102:103: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):328:329 -> a
     102:103:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     104:104:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):326:326 -> a
     104:104:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     105:105: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):335 -> a
     105:105:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     106:106: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):335:335 -> a
     106:106:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     107:107: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):337 -> a
     107:107:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     108:108: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):337:337 -> a
@@ -32392,17 +32369,17 @@
     109:111:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     112:112:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):334:334 -> a
     112:112:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     113:113: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):343 -> a
     113:113:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     114:114: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):343:343 -> a
     114:114:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     115:115: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):345 -> a
     115:115:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     116:116:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):345:345 -> a
     116:116:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    117:117:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    117:117:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     117:117:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):346 -> a
     117:117:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     118:118: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):346:346 -> a
@@ -32411,17 +32388,17 @@
     119:122:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     123:130:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):342:349 -> a
     123:130:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    131:131:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     131:131: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):353 -> a
     131:131:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     132:132: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):353:353 -> a
     132:132:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     133:133: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):355 -> a
     133:133:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     134:134: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):355:355 -> a
     134:134:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     135:135: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):356 -> a
     135:135:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     136:136: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):356:356 -> a
@@ -32430,12 +32407,12 @@
     137:140:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     141:141:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):352:352 -> a
     141:141:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     142:142: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):362 -> a
     142:142:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     143:143: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):362:362 -> a
     143:143:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     144:144: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):364 -> a
     144:144:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     145:145:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):364:364 -> a
@@ -32444,22 +32421,22 @@
     146:148:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     149:149:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):361:361 -> a
     149:149:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    150:150:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     150:150: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):371 -> a
     150:150:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     151:151: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):371:371 -> a
     151:151:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     152:152: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):373 -> a
     152:152:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     153:153: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):373:373 -> a
     153:153:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     154:154: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):374 -> a
     154:154:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     155:155: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):374:374 -> a
     155:155:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     156:156: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):375 -> a
     156:156:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     157:157:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):375:375 -> a
@@ -32468,39 +32445,39 @@
     158:162:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     163:163:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):370:370 -> a
     163:163:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     164:164: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):382 -> a
     164:164:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     165:165: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):382:382 -> a
     165:165:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     166:166: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):384 -> a
     166:166:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     167:167: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):384:384 -> a
     167:167:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    168:168:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    168:168:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     168:168: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):389 -> a
     168:168:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     169:169: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):389:389 -> a
     169:169:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    170:170:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     170:170: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):390 -> a
     170:170:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     171:172: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):390:391 -> a
     171:172:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     173:178:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):388:393 -> a
     173:178:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    179:179:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    179:179:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     179:179: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):397 -> a
     179:179:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     180:180: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):397:397 -> a
     180:180:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    181:181:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     181:181: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):399 -> a
     181:181:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     182:182: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):399:399 -> a
     182:182:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    183:183:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    183:183:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     183:183: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):400 -> a
     183:183:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     184:184: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):400:400 -> a
@@ -32509,12 +32486,12 @@
     185:188:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     189:189:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):396:396 -> a
     189:189:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    190:190:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     190:190: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):407 -> a
     190:190:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     191:191: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):407:407 -> a
     191:191:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    192:192:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    192:192:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     192:192:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):409 -> a
     192:192:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     193:193:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):409:409 -> a
@@ -32523,17 +32500,17 @@
     194:196:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     197:197:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):406:406 -> a
     197:197:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     198:198: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):415 -> a
     198:198:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     199:199: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):415:415 -> a
     199:199:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     200:200: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):417 -> a
     200:200:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     201:201: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):417:417 -> a
     201:201:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     202:202: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):418 -> a
     202:202:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     203:203: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):418:418 -> a
@@ -32542,12 +32519,12 @@
     204:207:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     208:208:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):414:414 -> a
     208:208:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    209:209:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     209:209:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):424 -> a
     209:209:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     210:210:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):424:424 -> a
     210:210:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    211:211:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    211:211:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     211:211: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):426 -> a
     211:211:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     212:212:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):426:426 -> a
@@ -32556,22 +32533,22 @@
     213:215:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     216:216:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):423:423 -> a
     216:216:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    217:217:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     217:217: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):433 -> a
     217:217:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     218:218: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):433:433 -> a
     218:218:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    219:219:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     219:219: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):435 -> a
     219:219:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     220:220: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):435:435 -> a
     220:220:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    221:221:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     221:221: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):436 -> a
     221:221:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     222:222: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):436:436 -> a
     222:222:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    223:223:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    223:223:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     223:223: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):437 -> a
     223:223:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     224:224: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):437:437 -> a
@@ -32580,12 +32557,12 @@
     225:229:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     230:230:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):432:432 -> a
     230:230:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     231:231: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):448 -> a
     231:231:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     232:232:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):448:448 -> a
     232:232:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    233:233:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     233:233:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):450 -> a
     233:233:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     234:234: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):450:450 -> a
@@ -32596,37 +32573,37 @@
     238:238:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     239:239:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):259:259 -> a
     239:239:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     240:240: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):475 -> a
     240:240:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     241:243:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):474:476 -> a
     241:243:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     244:244: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):480 -> a
     244:244:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     245:246: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):480:481 -> a
     245:246:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    247:247:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    247:247:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     247:247: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):486 -> a
     247:247:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     248:250:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):485:487 -> a
     248:250:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    251:251:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     251:251: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):492 -> a
     251:251:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     252:254:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):491:493 -> a
     252:254:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    255:255:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    255:255:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     255:255:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):498 -> a
     255:255:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     256:258:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):497:499 -> a
     256:258:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    259:259:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    259:259:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     259:259: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):504 -> a
     259:259:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     260:263:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.BackportedMethods.CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):503:506 -> a
     260:263:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
-    264:264:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    264:264:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     264:264: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):510 -> a
     264:264:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     265:266: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):510:511 -> a
@@ -32635,22 +32612,22 @@
     267:309:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     310:343:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):130:163 -> a
     344:344:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
-    345:345:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    345:345:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     345:345:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):78 -> a
     346:362:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):79:95 -> a
     363:367:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):94:98 -> a
 com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.D.d.f0.a:
     1:4:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1541:1544 -> A
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> A
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1561 -> A
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1561:1561 -> A
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> A
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1563 -> A
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1563:1563 -> A
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> A
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1564 -> A
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1564:1564 -> A
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> A
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> A
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1565 -> A
     12:12:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1565:1565 -> A
     13:17:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1562:1566 -> A
@@ -32658,16 +32635,16 @@
     19:42:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1548:1571 -> A
     1:19:com.android.tools.r8.graph.CfCode ShortMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4833:4851 -> A0
     1:5:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1575:1579 -> B
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> B
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     6:6:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1600 -> B
     7:7:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1600:1600 -> B
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> B
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     8:8:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1602 -> B
     9:9:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1602:1602 -> B
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> B
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     10:10:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1603 -> B
     11:11:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1603:1603 -> B
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> B
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> B
     12:12:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1604 -> B
     13:13:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1604:1604 -> B
     14:18:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1601:1605 -> B
@@ -32678,356 +32655,356 @@
     1:16:com.android.tools.r8.graph.CfCode ShortMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4873:4888 -> C0
     1:18:com.android.tools.r8.graph.CfCode LongMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1717:1734 -> D
     1:12:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4892:4903 -> D0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     13:13:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4911 -> D0
     14:16:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4911:4913 -> D0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     17:17:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4917 -> D0
     18:18:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4917:4917 -> D0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     19:19:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4919 -> D0
     20:20:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4919:4919 -> D0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     21:21:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4920 -> D0
     22:22:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4920:4920 -> D0
     23:26:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4918:4921 -> D0
     27:27:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4916:4916 -> D0
-    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     28:28:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4925 -> D0
     29:29:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4925:4925 -> D0
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     30:30:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4930 -> D0
     31:31:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4930:4930 -> D0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     32:32:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4931 -> D0
     33:34:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4931:4932 -> D0
     35:35:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4929:4929 -> D0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     36:36:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4947 -> D0
     37:37:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4947:4947 -> D0
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     38:38:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4949 -> D0
     39:39:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4949:4949 -> D0
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     40:40:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4950 -> D0
     41:41:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4950:4950 -> D0
     42:45:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4948:4951 -> D0
     46:46:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4946:4946 -> D0
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     47:47:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4968 -> D0
     48:48:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4968:4968 -> D0
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     49:49:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4970 -> D0
     50:50:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4970:4970 -> D0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     51:51:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4971 -> D0
     52:52:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4971:4971 -> D0
     53:56:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4969:4972 -> D0
     57:57:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4967:4967 -> D0
-    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     58:58:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4983 -> D0
     59:59:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4983:4983 -> D0
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     60:60:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4985 -> D0
     61:61:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4985:4985 -> D0
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     62:62:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4986 -> D0
     63:63:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4986:4986 -> D0
     64:67:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4984:4987 -> D0
     68:68:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4982:4982 -> D0
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     69:69:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998 -> D0
     70:70:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998:4998 -> D0
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> D0
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> D0
     71:71:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5000 -> D0
     72:72:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5000:5000 -> D0
     73:75:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4999:5001 -> D0
     76:76:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4997:4997 -> D0
     77:176:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4907:5006 -> D0
     1:3:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1738:1740 -> E
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     4:4:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1751 -> E
     5:5:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1751:1751 -> E
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     6:6:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1753 -> E
     7:7:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1753:1753 -> E
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     8:8:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1754 -> E
     9:9:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1754:1754 -> E
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E
     10:10:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1755 -> E
     11:11:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1755:1755 -> E
     12:16:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1752:1756 -> E
     17:17:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1750:1750 -> E
     18:35:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1744:1761 -> E
     1:11:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5010:5020 -> E0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     12:12:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5028 -> E0
     13:15:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5028:5030 -> E0
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     16:16:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5034 -> E0
     17:17:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5034:5034 -> E0
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     18:18:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036 -> E0
     19:19:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5036:5036 -> E0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     20:20:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5037 -> E0
     21:21:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5037:5037 -> E0
     22:25:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5035:5038 -> E0
     26:26:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5033:5033 -> E0
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     27:27:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5042 -> E0
     28:28:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5042:5042 -> E0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     29:29:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047 -> E0
     30:30:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5047:5047 -> E0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     31:31:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5048 -> E0
     32:33:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5048:5049 -> E0
     34:34:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5046:5046 -> E0
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     35:35:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5057 -> E0
     36:36:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5057:5057 -> E0
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     37:37:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5059 -> E0
     38:38:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5059:5059 -> E0
     39:41:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5058:5060 -> E0
     42:42:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5056:5056 -> E0
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     43:43:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5068 -> E0
     44:44:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5068:5068 -> E0
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     45:45:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5069 -> E0
     46:47:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5069:5070 -> E0
     48:48:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5067:5067 -> E0
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     49:49:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5079 -> E0
     50:50:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5079:5079 -> E0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     51:51:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5081 -> E0
     52:52:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5081:5081 -> E0
     53:55:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5080:5082 -> E0
     56:56:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5078:5078 -> E0
-    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     57:57:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5084 -> E0
     58:58:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5084:5084 -> E0
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     59:59:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5088 -> E0
     60:60:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5088:5088 -> E0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     61:61:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5090 -> E0
     62:62:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5090:5090 -> E0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     63:63:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5091 -> E0
     64:64:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5091:5091 -> E0
     65:68:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5089:5092 -> E0
     69:69:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5087:5087 -> E0
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     70:70:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5100 -> E0
     71:71:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5100:5100 -> E0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     72:72:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5101 -> E0
     73:74:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5101:5102 -> E0
     75:75:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5099:5099 -> E0
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     76:76:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5111 -> E0
     77:77:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5111:5111 -> E0
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     78:78:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5113 -> E0
     79:79:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5113:5113 -> E0
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     80:80:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5114 -> E0
     81:81:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5114:5114 -> E0
     82:85:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5112:5115 -> E0
     86:86:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5110:5110 -> E0
-    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    87:87:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     87:87:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5124 -> E0
     88:88:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5124:5124 -> E0
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     89:89:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5126 -> E0
     90:90:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5126:5126 -> E0
     91:93:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5125:5127 -> E0
     94:94:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5123:5123 -> E0
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     95:95:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5129 -> E0
     96:96:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5129:5129 -> E0
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     97:97:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5133 -> E0
     98:98:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5133:5133 -> E0
-    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    99:99:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     99:99:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5135 -> E0
     100:100:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5135:5135 -> E0
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     101:101:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5136 -> E0
     102:102:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5136:5136 -> E0
     103:106:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5134:5137 -> E0
     107:107:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5132:5132 -> E0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     108:108:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5146 -> E0
     109:109:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5146:5146 -> E0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> E0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> E0
     110:110:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5148 -> E0
     111:111:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5148:5148 -> E0
     112:114:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5147:5149 -> E0
     115:115:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5145:5145 -> E0
     116:246:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5024:5154 -> E0
     1:23:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1766:1788 -> F
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     24:24:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1798 -> F
     25:25:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1798:1798 -> F
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     26:26:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1799 -> F
     27:28:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1799:1800 -> F
     29:29:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1797:1797 -> F
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     30:30:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1807 -> F
     31:33:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1807:1809 -> F
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     34:34:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1813 -> F
     35:35:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1813:1813 -> F
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     36:36:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1815 -> F
     37:37:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1815:1815 -> F
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     38:38:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1816 -> F
     39:39:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1816:1816 -> F
     40:43:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1814:1817 -> F
     44:44:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1812:1812 -> F
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     45:45:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1828 -> F
     46:48:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1828:1830 -> F
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     49:49:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1835 -> F
     50:50:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1835:1835 -> F
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     51:51:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1837 -> F
     52:52:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1837:1837 -> F
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     53:53:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1838 -> F
     54:54:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1838:1838 -> F
     55:58:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1836:1839 -> F
     59:59:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1834:1834 -> F
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     60:60:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1844 -> F
     61:61:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1844:1844 -> F
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     62:62:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1846 -> F
     63:63:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1846:1846 -> F
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     64:64:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1847 -> F
     65:65:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1847:1847 -> F
     66:69:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1845:1848 -> F
     70:70:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1843:1843 -> F
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     71:71:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1853 -> F
     72:72:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1853:1853 -> F
-    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     73:73:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1855 -> F
     74:74:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1855:1855 -> F
-    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    75:75:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     75:75:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1856 -> F
     76:76:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1856:1856 -> F
     77:80:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1854:1857 -> F
     81:81:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1852:1852 -> F
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     82:82:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1867 -> F
     83:83:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1867:1867 -> F
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     84:84:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1869 -> F
     85:85:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1869:1869 -> F
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     86:86:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1870 -> F
     87:87:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1870:1870 -> F
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     88:88:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1871 -> F
     89:89:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1871:1871 -> F
     90:94:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1868:1872 -> F
     95:95:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1866:1866 -> F
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     96:96:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1881 -> F
     97:97:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1881:1881 -> F
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     98:98:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883 -> F
     99:99:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883:1883 -> F
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     100:100:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883 -> F
     101:101:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1883:1883 -> F
     102:104:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1882:1884 -> F
     105:105:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1880:1880 -> F
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     106:106:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1913 -> F
     107:107:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1913:1913 -> F
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     108:108:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915 -> F
     109:109:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915:1915 -> F
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     110:110:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915 -> F
     111:111:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1915:1915 -> F
     112:114:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1914:1916 -> F
     115:115:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1912:1912 -> F
-    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     116:116:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1922 -> F
     117:117:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1922:1922 -> F
-    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     118:118:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1924 -> F
     119:119:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1924:1924 -> F
-    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     120:120:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1925 -> F
     121:121:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1925:1925 -> F
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     122:122:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1926 -> F
     123:123:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1926:1926 -> F
     124:128:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1923:1927 -> F
     129:129:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1921:1921 -> F
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     130:130:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1935 -> F
     131:131:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1935:1935 -> F
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     132:132:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1941 -> F
     133:133:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1941:1941 -> F
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     134:134:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1943 -> F
     135:135:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1943:1943 -> F
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     136:136:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1944 -> F
     137:137:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1944:1944 -> F
     138:141:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1942:1945 -> F
     142:142:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1940:1940 -> F
-    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     143:143:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1969 -> F
     144:144:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1969:1969 -> F
-    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     145:145:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1971 -> F
     146:146:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1971:1971 -> F
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     147:147:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1972 -> F
     148:148:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1972:1972 -> F
-    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    149:149:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     149:149:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1973 -> F
     150:150:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1973:1973 -> F
     151:155:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1970:1974 -> F
     156:156:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1968:1968 -> F
-    157:157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    157:157:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     157:157:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1979 -> F
     158:160:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1979:1981 -> F
-    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     161:161:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1986 -> F
     162:162:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1986:1986 -> F
-    163:163:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    163:163:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     163:163:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1988 -> F
     164:164:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1988:1988 -> F
-    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    165:165:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     165:165:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1989 -> F
     166:166:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1989:1989 -> F
     167:170:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1987:1990 -> F
     171:171:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1985:1985 -> F
-    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    172:172:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     172:172:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1995 -> F
     173:173:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1995:1995 -> F
-    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     174:174:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1997 -> F
     175:175:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1997:1997 -> F
-    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> F
+    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> F
     176:176:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1998 -> F
     177:177:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1998:1998 -> F
     178:181:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1996:1999 -> F
@@ -33035,171 +33012,171 @@
     183:410:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1792:2019 -> F
     1:101:com.android.tools.r8.graph.CfCode LongMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2023:2123 -> G
     1:3:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2127:2129 -> H
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> H
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     4:4:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2140 -> H
     5:5:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2140:2140 -> H
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> H
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     6:6:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2142 -> H
     7:7:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2142:2142 -> H
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> H
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     8:8:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2143 -> H
     9:9:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2143:2143 -> H
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> H
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> H
     10:10:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2144 -> H
     11:11:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2144:2144 -> H
     12:16:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2141:2145 -> H
     17:17:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2139:2139 -> H
     18:35:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2133:2150 -> H
     1:39:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2155:2193 -> I
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     40:40:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2206 -> I
     41:41:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2206:2206 -> I
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     42:42:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2208 -> I
     43:43:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2208:2208 -> I
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     44:44:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2209 -> I
     45:45:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2209:2209 -> I
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     46:46:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2210 -> I
     47:47:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2210:2210 -> I
     48:52:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2207:2211 -> I
     53:53:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2205:2205 -> I
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     54:54:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2226 -> I
     55:55:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2226:2226 -> I
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     56:56:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2244 -> I
     57:57:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2244:2244 -> I
-    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    58:58:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     58:58:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246 -> I
     59:59:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246:2246 -> I
-    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    60:60:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     60:60:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246 -> I
     61:61:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246:2246 -> I
     62:64:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2245:2247 -> I
     65:65:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2243:2243 -> I
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     66:66:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2267 -> I
     67:67:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2267:2267 -> I
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     68:68:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2269 -> I
     69:69:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2269:2269 -> I
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     70:70:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2270 -> I
     71:71:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2270:2270 -> I
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     72:72:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2271 -> I
     73:73:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2271:2271 -> I
     74:78:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2268:2272 -> I
     79:79:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2266:2266 -> I
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     80:80:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2311 -> I
     81:81:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2311:2311 -> I
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     82:82:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2313 -> I
     83:83:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2313:2313 -> I
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     84:84:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2314 -> I
     85:85:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2314:2314 -> I
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     86:86:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2315 -> I
     87:87:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2315:2315 -> I
     88:92:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2312:2316 -> I
     93:93:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2310:2310 -> I
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     94:94:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337 -> I
     95:95:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337:2337 -> I
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     96:96:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2339 -> I
     97:97:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2339:2339 -> I
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     98:98:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2340 -> I
     99:99:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2340:2340 -> I
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     100:100:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2341 -> I
     101:101:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2341:2341 -> I
     102:106:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2338:2342 -> I
     107:107:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2336:2336 -> I
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     108:108:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2366 -> I
     109:109:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2366:2366 -> I
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     110:110:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2368 -> I
     111:111:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2368:2368 -> I
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     112:112:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2369 -> I
     113:113:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2369:2369 -> I
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     114:114:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2370 -> I
     115:115:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2370:2370 -> I
     116:120:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2367:2371 -> I
     121:121:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2365:2365 -> I
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     122:122:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2382 -> I
     123:123:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2382:2382 -> I
-    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     124:124:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2393 -> I
     125:125:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2393:2393 -> I
-    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     126:126:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2395 -> I
     127:127:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2395:2395 -> I
-    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     128:128:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2396 -> I
     129:129:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2396:2396 -> I
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     130:130:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2397 -> I
     131:131:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2397:2397 -> I
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> I
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> I
     132:132:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2398 -> I
     133:133:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2398:2398 -> I
     134:139:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2394:2399 -> I
     140:140:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2392:2392 -> I
     141:359:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2186:2404 -> I
     1:7:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2408:2414 -> J
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> J
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> J
     8:8:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2440 -> J
     9:9:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2440:2440 -> J
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> J
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> J
     10:10:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2445 -> J
     11:11:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2445:2445 -> J
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> J
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> J
     12:12:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2446 -> J
     13:14:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2446:2447 -> J
     15:15:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2444:2444 -> J
     16:50:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2418:2452 -> J
     1:10:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2456:2465 -> K
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> K
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> K
     11:11:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2504 -> K
     12:12:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2504:2504 -> K
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> K
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> K
     13:13:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2509 -> K
     14:14:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2509:2509 -> K
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> K
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> K
     15:15:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2510 -> K
     16:17:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2510:2511 -> K
     18:18:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2508:2508 -> K
     19:66:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2469:2516 -> K
     1:5:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2520:2524 -> L
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> L
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> L
     6:6:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2534 -> L
     7:7:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2534:2534 -> L
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> L
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> L
     8:8:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2539 -> L
     9:9:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2539:2539 -> L
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> L
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> L
     10:10:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2540 -> L
     11:12:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2540:2541 -> L
     13:13:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2538:2538 -> L
     14:37:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2528:2551 -> L
     1:5:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2555:2559 -> M
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> M
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> M
     6:6:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570 -> M
     7:7:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570:2570 -> M
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> M
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> M
     8:8:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2575 -> M
     9:9:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2575:2575 -> M
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> M
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> M
     10:10:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2576 -> M
     11:12:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2576:2577 -> M
     13:13:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2574:2574 -> M
@@ -33207,16 +33184,16 @@
     1:55:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2591:2645 -> N
     1:59:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2649:2707 -> O
     1:3:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2711:2713 -> P
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> P
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     4:4:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2725 -> P
     5:5:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2725:2725 -> P
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> P
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     6:6:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2727 -> P
     7:7:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2727:2727 -> P
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> P
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     8:8:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2728 -> P
     9:9:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2728:2728 -> P
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> P
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> P
     10:10:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2729 -> P
     11:11:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2729:2729 -> P
     12:16:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2726:2730 -> P
@@ -33225,162 +33202,162 @@
     1:47:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2739:2785 -> Q
     1:51:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2789:2839 -> R
     1:3:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2843:2845 -> S
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> S
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     4:4:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2857 -> S
     5:5:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2857:2857 -> S
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> S
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     6:6:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2859 -> S
     7:7:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2859:2859 -> S
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> S
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     8:8:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2860 -> S
     9:9:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2860:2860 -> S
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> S
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> S
     10:10:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2861 -> S
     11:11:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2861:2861 -> S
     12:16:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2858:2862 -> S
     17:17:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2856:2856 -> S
     18:37:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2849:2868 -> S
     1:5:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2872:2876 -> T
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> T
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> T
     6:6:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2886 -> T
     7:7:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2886:2886 -> T
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> T
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> T
     8:8:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2891 -> T
     9:9:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2891:2891 -> T
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> T
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> T
     10:10:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2892 -> T
     11:12:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2892:2893 -> T
     13:13:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2890:2890 -> T
     14:37:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2880:2903 -> T
     1:5:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2907:2911 -> U
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> U
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> U
     6:6:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2922 -> U
     7:7:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2922:2922 -> U
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> U
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> U
     8:8:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2927 -> U
     9:9:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2927:2927 -> U
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> U
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> U
     10:10:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2928 -> U
     11:12:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2928:2929 -> U
     13:13:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2926:2926 -> U
     14:38:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2915:2939 -> U
     1:7:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2943:2949 -> V
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> V
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> V
     8:8:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2975 -> V
     9:9:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2975:2975 -> V
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> V
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> V
     10:10:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2980 -> V
     11:11:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2980:2980 -> V
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> V
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> V
     12:12:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2981 -> V
     13:14:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2981:2982 -> V
     15:15:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2979:2979 -> V
     16:50:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2953:2987 -> V
     1:18:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2991:3008 -> W
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     19:19:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3019 -> W
     20:20:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3019:3019 -> W
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     21:21:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021 -> W
     22:22:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021:3021 -> W
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     23:23:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021 -> W
     24:24:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3021:3021 -> W
     25:27:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3020:3022 -> W
     28:28:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3018:3018 -> W
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     29:29:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3031 -> W
     30:30:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3031:3031 -> W
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     31:31:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033 -> W
     32:32:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033:3033 -> W
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     33:33:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033 -> W
     34:34:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3033:3033 -> W
     35:37:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3032:3034 -> W
     38:38:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3030:3030 -> W
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     39:39:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3042 -> W
     40:40:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3042:3042 -> W
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     41:41:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044 -> W
     42:42:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044:3044 -> W
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     43:43:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044 -> W
     44:44:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3044:3044 -> W
     45:47:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3043:3045 -> W
     48:48:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3041:3041 -> W
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     49:49:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3055 -> W
     50:50:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3055:3055 -> W
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     51:51:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057 -> W
     52:52:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057:3057 -> W
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     53:53:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057 -> W
     54:54:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3057:3057 -> W
     55:57:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3056:3058 -> W
     58:58:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3054:3054 -> W
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     59:59:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3115 -> W
     60:60:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3115:3115 -> W
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     61:61:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3120 -> W
     62:62:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3120:3120 -> W
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> W
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> W
     63:63:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3121 -> W
     64:65:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3121:3122 -> W
     66:66:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3119:3119 -> W
     67:182:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3012:3127 -> W
     1:3:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3131:3133 -> X
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> X
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     4:4:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3145 -> X
     5:5:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3145:3145 -> X
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> X
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     6:6:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3147 -> X
     7:7:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3147:3147 -> X
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> X
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     8:8:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3148 -> X
     9:9:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3148:3148 -> X
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> X
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> X
     10:10:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3149 -> X
     11:11:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3149:3149 -> X
     12:16:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3146:3150 -> X
     17:17:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3144:3144 -> X
     18:36:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3137:3155 -> X
     1:5:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3159:3163 -> Y
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> Y
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Y
     6:6:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3173 -> Y
     7:7:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3173:3173 -> Y
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> Y
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Y
     8:8:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3178 -> Y
     9:9:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3178:3178 -> Y
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> Y
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Y
     10:10:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3179 -> Y
     11:12:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3179:3180 -> Y
     13:13:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3177:3177 -> Y
     14:36:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3167:3189 -> Y
     1:5:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3193:3197 -> Z
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> Z
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Z
     6:6:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3208 -> Z
     7:7:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3208:3208 -> Z
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> Z
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Z
     8:8:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3213 -> Z
     9:9:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3213:3213 -> Z
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> Z
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> Z
     10:10:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3214 -> Z
     11:12:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3214:3215 -> Z
     13:13:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3212:3212 -> Z
     14:37:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3201:3224 -> Z
     1:28:com.android.tools.r8.graph.CfCode BooleanMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):51:78 -> a
     1:3:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3228:3230 -> a0
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a0
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a0
     4:4:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3241 -> a0
     5:5:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3241:3241 -> a0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a0
     6:6:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243 -> a0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243:3243 -> a0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243 -> a0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3243:3243 -> a0
     10:12:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3242:3244 -> a0
@@ -33388,13 +33365,13 @@
     14:30:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3234:3250 -> a0
     1:21:com.android.tools.r8.graph.CfCode BooleanMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):82:102 -> b
     1:3:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3254:3256 -> b0
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b0
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b0
     4:4:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3267 -> b0
     5:5:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3267:3267 -> b0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b0
     6:6:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269 -> b0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269:3269 -> b0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269 -> b0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3269:3269 -> b0
     10:12:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3268:3270 -> b0
@@ -33402,161 +33379,161 @@
     14:30:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3260:3276 -> b0
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):106:120 -> c
     1:7:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3280:3286 -> c0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3312 -> c0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3312:3312 -> c0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c0
     10:10:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3317 -> c0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3317:3317 -> c0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> c0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> c0
     12:12:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3318 -> c0
     13:14:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3318:3319 -> c0
     15:15:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3316:3316 -> c0
     16:50:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3290:3324 -> c0
     1:19:com.android.tools.r8.graph.CfCode ByteMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):124:142 -> d
     1:10:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3328:3337 -> d0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> d0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3376 -> d0
     12:12:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3376:3376 -> d0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> d0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d0
     13:13:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3381 -> d0
     14:14:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3381:3381 -> d0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> d0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> d0
     15:15:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3382 -> d0
     16:17:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3382:3383 -> d0
     18:18:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3380:3380 -> d0
     19:66:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3341:3388 -> d0
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):146:160 -> e
     1:6:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3392:3397 -> e0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> e0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> e0
     7:7:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3413 -> e0
     8:8:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3413:3413 -> e0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> e0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> e0
     9:9:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3418 -> e0
     10:10:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3418:3418 -> e0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> e0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> e0
     11:11:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3419 -> e0
     12:13:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3419:3420 -> e0
     14:14:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3417:3417 -> e0
     15:42:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3401:3428 -> e0
     1:16:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):164:179 -> f
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3433:3437 -> f0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3455 -> f0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3455:3455 -> f0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3457 -> f0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3457:3457 -> f0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3462 -> f0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3462:3462 -> f0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3463 -> f0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3463:3464 -> f0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3461:3466 -> f0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3470 -> f0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3470:3470 -> f0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3472 -> f0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3472:3472 -> f0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3473 -> f0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3473:3473 -> f0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3471:3474 -> f0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3469:3469 -> f0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3480 -> f0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3480:3480 -> f0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3482 -> f0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3482:3482 -> f0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3483 -> f0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3483:3483 -> f0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3481:3484 -> f0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3479:3486 -> f0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3490 -> f0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3490:3490 -> f0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3492 -> f0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3492:3492 -> f0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3493 -> f0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3493:3493 -> f0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3491:3494 -> f0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3489:3489 -> f0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3500 -> f0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3500:3500 -> f0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3502 -> f0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3502:3502 -> f0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3503 -> f0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3503:3503 -> f0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3501:3504 -> f0
     71:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3499:3506 -> f0
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3510 -> f0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3510:3510 -> f0
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3512 -> f0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3512:3512 -> f0
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3513 -> f0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3513:3513 -> f0
     85:88:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3511:3514 -> f0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3509:3509 -> f0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3520 -> f0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3520:3520 -> f0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3522 -> f0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3522:3522 -> f0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3523 -> f0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3523:3523 -> f0
     96:99:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3521:3524 -> f0
     100:107:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3519:3526 -> f0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3530 -> f0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3530:3530 -> f0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3532 -> f0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3532:3532 -> f0
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3533 -> f0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3533:3533 -> f0
     114:117:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3531:3534 -> f0
     118:118:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3529:3529 -> f0
-    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3540 -> f0
     120:120:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3540:3540 -> f0
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     121:121:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3542 -> f0
     122:122:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3542:3542 -> f0
-    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     123:123:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3543 -> f0
     124:124:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3543:3543 -> f0
     125:128:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3541:3544 -> f0
     129:129:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3539:3539 -> f0
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3549 -> f0
     131:131:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3549:3549 -> f0
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     132:132:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3551 -> f0
     133:133:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3551:3551 -> f0
     134:136:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3550:3552 -> f0
     137:137:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3548:3548 -> f0
-    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     138:138:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3557 -> f0
     139:139:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3557:3557 -> f0
-    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     140:140:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3559 -> f0
     141:141:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3559:3559 -> f0
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> f0
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> f0
     142:142:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3560 -> f0
     143:143:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3560:3560 -> f0
     144:147:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3558:3561 -> f0
@@ -33564,837 +33541,837 @@
     149:277:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3441:3569 -> f0
     1:15:com.android.tools.r8.graph.CfCode CharacterMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):183:197 -> g
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3573:3577 -> g0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3592 -> g0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3592:3592 -> g0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3594 -> g0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3594:3594 -> g0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3599 -> g0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3599:3599 -> g0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3600 -> g0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3600:3601 -> g0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3598:3603 -> g0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3607 -> g0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3607:3607 -> g0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3609 -> g0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3609:3609 -> g0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3610 -> g0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3610:3610 -> g0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3608:3611 -> g0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3606:3606 -> g0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3617 -> g0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3617:3617 -> g0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3619 -> g0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3619:3619 -> g0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3620 -> g0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3620:3620 -> g0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3618:3621 -> g0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3616:3623 -> g0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3627 -> g0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3627:3627 -> g0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3629 -> g0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3629:3629 -> g0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3630 -> g0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3630:3630 -> g0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3628:3631 -> g0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3626:3626 -> g0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3637 -> g0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3637:3637 -> g0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3639 -> g0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3639:3639 -> g0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3640 -> g0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3640:3640 -> g0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3638:3641 -> g0
     71:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3636:3643 -> g0
-    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    79:79:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3647 -> g0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3647:3647 -> g0
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3649 -> g0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3649:3649 -> g0
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3650 -> g0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3650:3650 -> g0
     85:88:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3648:3651 -> g0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3646:3646 -> g0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3657 -> g0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3657:3657 -> g0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3659 -> g0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3659:3659 -> g0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3660 -> g0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3660:3660 -> g0
     96:99:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3658:3661 -> g0
     100:100:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3656:3656 -> g0
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     101:101:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3666 -> g0
     102:102:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3666:3666 -> g0
-    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     103:103:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3668 -> g0
     104:104:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3668:3668 -> g0
     105:107:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3667:3669 -> g0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3665:3665 -> g0
-    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3674 -> g0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3674:3674 -> g0
-    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3676 -> g0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3676:3676 -> g0
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> g0
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> g0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3677 -> g0
     114:114:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3677:3677 -> g0
     115:118:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3675:3678 -> g0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3673:3673 -> g0
     120:225:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3581:3686 -> g0
     1:3:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):202:204 -> h
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     4:4:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):210 -> h
     5:5:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):210:210 -> h
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     6:6:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):216 -> h
     7:7:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):216:216 -> h
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     8:8:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218 -> h
     9:9:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218:218 -> h
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     10:10:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218 -> h
     11:11:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):218:218 -> h
     12:14:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):217:219 -> h
     15:15:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):215:215 -> h
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     16:16:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):224 -> h
     17:17:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):224:224 -> h
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     18:18:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226 -> h
     19:19:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226:226 -> h
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h
     20:20:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226 -> h
     21:21:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):226:226 -> h
     22:24:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):225:227 -> h
     25:25:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):223:223 -> h
     26:50:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):208:232 -> h
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3690:3694 -> h0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3706 -> h0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3706:3706 -> h0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3708 -> h0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3708:3708 -> h0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3713 -> h0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3713:3713 -> h0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3714 -> h0
     13:14:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3714:3715 -> h0
     15:20:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3712:3717 -> h0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3721 -> h0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3721:3721 -> h0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3723 -> h0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3723:3723 -> h0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3724 -> h0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3724:3724 -> h0
     27:30:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3722:3725 -> h0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3720:3720 -> h0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3731 -> h0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3731:3731 -> h0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3733 -> h0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3733:3733 -> h0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3734 -> h0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3734:3734 -> h0
     38:41:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3732:3735 -> h0
     42:49:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3730:3737 -> h0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3741 -> h0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3741:3741 -> h0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3743 -> h0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3743:3743 -> h0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3744 -> h0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3744:3744 -> h0
     56:59:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3742:3745 -> h0
     60:60:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3740:3740 -> h0
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3751 -> h0
     62:62:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3751:3751 -> h0
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3753 -> h0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3753:3753 -> h0
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3754 -> h0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3754:3754 -> h0
     67:70:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3752:3755 -> h0
     71:71:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3750:3750 -> h0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     72:72:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3760 -> h0
     73:73:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3760:3760 -> h0
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     74:74:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3762 -> h0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3762:3762 -> h0
     76:78:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3761:3763 -> h0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3759:3759 -> h0
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     80:80:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3768 -> h0
     81:81:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3768:3768 -> h0
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     82:82:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3770 -> h0
     83:83:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3770:3770 -> h0
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> h0
+    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> h0
     84:84:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3771 -> h0
     85:85:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3771:3771 -> h0
     86:89:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3769:3772 -> h0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3767:3767 -> h0
     91:173:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3698:3780 -> h0
     1:8:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):516:523 -> i
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     9:9:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):529 -> i
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):529:529 -> i
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):536 -> i
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):536:536 -> i
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538 -> i
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538:538 -> i
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538 -> i
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):538:538 -> i
     17:19:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):537:539 -> i
     20:20:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):535:535 -> i
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):564 -> i
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):564:564 -> i
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):566 -> i
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):566:566 -> i
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):567 -> i
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):567:567 -> i
     27:30:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):565:568 -> i
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):563:563 -> i
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):573 -> i
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):573:573 -> i
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):575 -> i
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):575:575 -> i
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):576 -> i
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):576:576 -> i
     38:41:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):574:577 -> i
     42:42:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):572:572 -> i
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):588 -> i
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):588:588 -> i
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590 -> i
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):590:590 -> i
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i
     47:47:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):591 -> i
     48:48:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):591:591 -> i
     49:52:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):589:592 -> i
     53:53:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):587:587 -> i
     54:124:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):527:597 -> i
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3784:3788 -> i0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3806 -> i0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3806:3806 -> i0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3808 -> i0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3808:3808 -> i0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3809 -> i0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3809:3809 -> i0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> i0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> i0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3810 -> i0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3810:3810 -> i0
     14:18:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3807:3811 -> i0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3805:3805 -> i0
     20:45:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3792:3817 -> i0
     1:6:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):601:606 -> j
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     7:7:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):613 -> j
     8:8:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):613:613 -> j
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     9:9:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):620 -> j
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):620:620 -> j
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):622 -> j
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):622:622 -> j
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):623 -> j
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):623:623 -> j
     15:18:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):621:624 -> j
     19:19:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):619:619 -> j
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     20:20:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):631 -> j
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):631:631 -> j
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):633 -> j
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):633:633 -> j
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):634 -> j
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):634:634 -> j
     26:29:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):632:635 -> j
     30:30:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):630:630 -> j
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640 -> j
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):640:640 -> j
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):642 -> j
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):642:642 -> j
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):643 -> j
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):643:643 -> j
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):644 -> j
     38:38:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):644:644 -> j
     39:43:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):641:645 -> j
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):639:639 -> j
     45:86:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):610:651 -> j
     1:41:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3821:3861 -> j0
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     42:42:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3879 -> j0
     43:43:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3879:3879 -> j0
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     44:44:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3883 -> j0
     45:45:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3883:3883 -> j0
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     46:46:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3886 -> j0
     47:47:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3886:3886 -> j0
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     48:48:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3888 -> j0
     49:49:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3888:3888 -> j0
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     50:50:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3892 -> j0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3892:3892 -> j0
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3894 -> j0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3894:3894 -> j0
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3895 -> j0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3895:3895 -> j0
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     56:56:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3896 -> j0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3896:3896 -> j0
     58:62:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3893:3897 -> j0
     63:63:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3891:3891 -> j0
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3908 -> j0
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3908:3908 -> j0
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     66:66:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3912 -> j0
     67:67:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3912:3912 -> j0
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     68:68:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3915 -> j0
     69:69:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3915:3915 -> j0
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     70:70:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3917 -> j0
     71:71:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3917:3917 -> j0
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     72:72:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3921 -> j0
     73:73:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3921:3921 -> j0
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     74:74:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3923 -> j0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3923:3923 -> j0
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     76:76:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3924 -> j0
     77:77:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3924:3924 -> j0
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     78:78:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3925 -> j0
     79:79:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3925:3925 -> j0
     80:84:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3922:3926 -> j0
     85:85:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3920:3920 -> j0
-    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    86:86:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     86:86:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3937 -> j0
     87:87:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3937:3937 -> j0
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     88:88:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3941 -> j0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3941:3941 -> j0
-    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    90:90:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     90:90:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3944 -> j0
     91:91:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3944:3944 -> j0
-    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    92:92:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     92:92:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3946 -> j0
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3946:3946 -> j0
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     94:94:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3950 -> j0
     95:95:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3950:3950 -> j0
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     96:96:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3952 -> j0
     97:97:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3952:3952 -> j0
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     98:98:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3953 -> j0
     99:99:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3953:3953 -> j0
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     100:100:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3954 -> j0
     101:101:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3954:3954 -> j0
     102:106:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3951:3955 -> j0
     107:107:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3949:3949 -> j0
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     108:108:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3966 -> j0
     109:109:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3966:3966 -> j0
-    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    110:110:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     110:110:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3970 -> j0
     111:111:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3970:3970 -> j0
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     112:112:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3973 -> j0
     113:113:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3973:3973 -> j0
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     114:114:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3975 -> j0
     115:115:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3975:3975 -> j0
-    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     116:116:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3979 -> j0
     117:117:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3979:3979 -> j0
-    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    118:118:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     118:118:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3981 -> j0
     119:119:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3981:3981 -> j0
-    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    120:120:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     120:120:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3982 -> j0
     121:121:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3982:3982 -> j0
-    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    122:122:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     122:122:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3983 -> j0
     123:123:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3983:3983 -> j0
     124:128:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3980:3984 -> j0
     129:129:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3978:3978 -> j0
-    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    130:130:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3995 -> j0
     131:131:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3995:3995 -> j0
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     132:132:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3999 -> j0
     133:133:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3999:3999 -> j0
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     134:134:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4002 -> j0
     135:135:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4002:4002 -> j0
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     136:136:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4004 -> j0
     137:137:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4004:4004 -> j0
-    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     138:138:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4008 -> j0
     139:139:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4008:4008 -> j0
-    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    140:140:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     140:140:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4010 -> j0
     141:141:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4010:4010 -> j0
-    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    142:142:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     142:142:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4011 -> j0
     143:143:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4011:4011 -> j0
-    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    144:144:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     144:144:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4012 -> j0
     145:145:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4012:4012 -> j0
     146:150:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4009:4013 -> j0
     151:151:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4007:4007 -> j0
-    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    152:152:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     152:152:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4024 -> j0
     153:153:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4024:4024 -> j0
-    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    154:154:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     154:154:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4028 -> j0
     155:155:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4028:4028 -> j0
-    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    156:156:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     156:156:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4031 -> j0
     157:157:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4031:4031 -> j0
-    158:158:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    158:158:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     158:158:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4033 -> j0
     159:159:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4033:4033 -> j0
-    160:160:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    160:160:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     160:160:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4037 -> j0
     161:161:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4037:4037 -> j0
-    162:162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    162:162:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     162:162:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4039 -> j0
     163:163:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4039:4039 -> j0
-    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    164:164:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     164:164:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4040 -> j0
     165:165:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4040:4040 -> j0
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     166:166:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4041 -> j0
     167:167:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4041:4041 -> j0
     168:172:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4038:4042 -> j0
     173:173:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4036:4036 -> j0
-    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    174:174:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     174:174:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4053 -> j0
     175:175:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4053:4053 -> j0
-    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    176:176:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     176:176:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4057 -> j0
     177:177:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4057:4057 -> j0
-    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    178:178:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     178:178:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4060 -> j0
     179:179:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4060:4060 -> j0
-    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    180:180:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     180:180:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4062 -> j0
     181:181:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4062:4062 -> j0
-    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    182:182:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     182:182:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4066 -> j0
     183:183:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4066:4066 -> j0
-    184:184:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    184:184:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     184:184:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4068 -> j0
     185:185:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4068:4068 -> j0
-    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    186:186:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     186:186:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4069 -> j0
     187:187:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4069:4069 -> j0
-    188:188:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    188:188:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     188:188:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4070 -> j0
     189:189:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4070:4070 -> j0
     190:194:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4067:4071 -> j0
     195:195:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4065:4065 -> j0
-    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     196:196:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4082 -> j0
     197:197:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4082:4082 -> j0
-    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    198:198:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     198:198:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4086 -> j0
     199:199:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4086:4086 -> j0
-    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    200:200:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     200:200:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4089 -> j0
     201:201:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4089:4089 -> j0
-    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    202:202:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     202:202:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4091 -> j0
     203:203:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4091:4091 -> j0
-    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    204:204:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     204:204:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4095 -> j0
     205:205:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4095:4095 -> j0
-    206:206:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    206:206:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     206:206:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4097 -> j0
     207:207:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4097:4097 -> j0
-    208:208:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    208:208:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     208:208:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4098 -> j0
     209:209:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4098:4098 -> j0
-    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    210:210:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     210:210:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4099 -> j0
     211:211:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4099:4099 -> j0
     212:216:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4096:4100 -> j0
     217:217:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4094:4094 -> j0
-    218:218:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    218:218:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     218:218:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4111 -> j0
     219:219:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4111:4111 -> j0
-    220:220:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    220:220:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     220:220:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4115 -> j0
     221:221:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4115:4115 -> j0
-    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    222:222:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     222:222:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4118 -> j0
     223:223:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4118:4118 -> j0
-    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    224:224:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     224:224:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4120 -> j0
     225:225:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4120:4120 -> j0
-    226:226:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    226:226:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     226:226:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4124 -> j0
     227:227:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4124:4124 -> j0
-    228:228:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    228:228:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     228:228:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4126 -> j0
     229:229:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4126:4126 -> j0
-    230:230:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    230:230:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     230:230:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4127 -> j0
     231:231:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4127:4127 -> j0
-    232:232:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    232:232:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     232:232:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4128 -> j0
     233:233:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4128:4128 -> j0
     234:238:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4125:4129 -> j0
     239:239:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4123:4123 -> j0
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     240:240:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4144 -> j0
     241:241:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4144:4144 -> j0
-    242:242:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    242:242:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     242:242:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4146 -> j0
     243:243:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4146:4146 -> j0
-    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> j0
+    244:244:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> j0
     244:244:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4147 -> j0
     245:245:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4147:4147 -> j0
     246:249:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4145:4148 -> j0
     250:250:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4143:4143 -> j0
     251:539:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3865:4153 -> j0
     1:11:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):655:665 -> k
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):671 -> k
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):671:671 -> k
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):678 -> k
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):678:678 -> k
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680 -> k
     17:17:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680:680 -> k
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     18:18:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680 -> k
     19:19:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):680:680 -> k
     20:22:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):679:681 -> k
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):677:677 -> k
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):705 -> k
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):705:705 -> k
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707 -> k
     27:27:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):707:707 -> k
     28:30:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):706:708 -> k
     31:31:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):704:704 -> k
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):713 -> k
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):713:713 -> k
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):715 -> k
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):715:715 -> k
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):716 -> k
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):716:716 -> k
     38:41:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):714:717 -> k
     42:42:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):712:712 -> k
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725 -> k
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725:725 -> k
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):727 -> k
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):727:727 -> k
     47:49:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):726:728 -> k
     50:50:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):724:724 -> k
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     51:51:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):733 -> k
     52:52:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):733:733 -> k
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     53:53:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):735 -> k
     54:54:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):735:735 -> k
-    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     55:55:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):736 -> k
     56:56:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):736:736 -> k
     57:60:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):734:737 -> k
     61:61:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):732:732 -> k
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     62:62:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):747 -> k
     63:63:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):747:747 -> k
-    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    64:64:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     64:64:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):749 -> k
     65:65:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):749:749 -> k
-    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    66:66:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     66:66:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):750 -> k
     67:67:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):750:750 -> k
-    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    68:68:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     68:68:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):751 -> k
     69:69:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):751:751 -> k
     70:74:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):748:752 -> k
     75:75:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):746:746 -> k
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     76:76:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756 -> k
     77:77:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):756:756 -> k
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     78:78:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):758 -> k
     79:79:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):758:758 -> k
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     80:80:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):763 -> k
     81:81:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):763:763 -> k
-    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    82:82:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     82:82:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):764 -> k
     83:84:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):764:765 -> k
     85:90:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):762:767 -> k
-    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     91:91:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):771 -> k
     92:92:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):771:771 -> k
-    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     93:93:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773 -> k
     94:94:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):773:773 -> k
-    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    95:95:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     95:95:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):774 -> k
     96:96:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):774:774 -> k
     97:100:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):772:775 -> k
     101:101:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):770:770 -> k
-    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     102:102:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):781 -> k
     103:103:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):781:781 -> k
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     104:104:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):783 -> k
     105:105:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):783:783 -> k
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     106:106:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784 -> k
     107:107:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):784:784 -> k
     108:111:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):782:785 -> k
     112:112:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):780:780 -> k
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     113:113:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):790 -> k
     114:114:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):790:790 -> k
-    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    115:115:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     115:115:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):792 -> k
     116:116:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):792:792 -> k
     117:119:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):791:793 -> k
     120:120:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):789:789 -> k
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     121:121:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):798 -> k
     122:122:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):798:798 -> k
-    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     123:123:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800 -> k
     124:124:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):800:800 -> k
-    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     125:125:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):801 -> k
     126:126:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):801:801 -> k
     127:130:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):799:802 -> k
     131:131:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):797:797 -> k
-    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    132:132:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     132:132:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):813 -> k
     133:133:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):813:813 -> k
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     134:134:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815 -> k
     135:135:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):815:815 -> k
-    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k
+    136:136:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k
     136:136:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):816 -> k
     137:137:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):816:816 -> k
     138:141:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):814:817 -> k
     142:142:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):812:812 -> k
     143:296:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):669:822 -> k
     1:6:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4157:4162 -> k0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4178 -> k0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4178:4178 -> k0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4180 -> k0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4180:4180 -> k0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> k0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> k0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4181 -> k0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4181:4181 -> k0
     13:16:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4179:4182 -> k0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4177:4177 -> k0
     18:46:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4166:4194 -> k0
     1:9:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):826:834 -> l
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     10:10:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):840 -> l
     11:11:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):840:840 -> l
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     12:12:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):847 -> l
     13:13:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):847:847 -> l
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     14:14:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849 -> l
     15:15:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849:849 -> l
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     16:16:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849 -> l
     17:17:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):849:849 -> l
     18:20:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):848:850 -> l
     21:21:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):846:846 -> l
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     22:22:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):875 -> l
     23:23:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):875:875 -> l
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     24:24:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):877 -> l
     25:25:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):877:877 -> l
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     26:26:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):878 -> l
     27:27:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):878:878 -> l
     28:31:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):876:879 -> l
     32:32:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):874:874 -> l
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     33:33:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):884 -> l
     34:34:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):884:884 -> l
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     35:35:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):886 -> l
     36:36:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):886:886 -> l
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     37:37:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):887 -> l
     38:38:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):887:887 -> l
     39:42:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):885:888 -> l
     43:43:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):883:883 -> l
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     44:44:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):892 -> l
     45:45:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):892:892 -> l
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     46:46:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):894 -> l
     47:47:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):894:894 -> l
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     48:48:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):899 -> l
     49:49:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):899:899 -> l
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     50:50:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):900 -> l
     51:52:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):900:901 -> l
     53:58:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):898:903 -> l
-    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    59:59:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     59:59:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):907 -> l
     60:60:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):907:907 -> l
-    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     61:61:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):909 -> l
     62:62:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):909:909 -> l
-    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    63:63:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     63:63:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):910 -> l
     64:64:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):910:910 -> l
     65:68:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):908:911 -> l
     69:69:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):906:906 -> l
-    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    70:70:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     70:70:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):917 -> l
     71:71:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):917:917 -> l
-    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    72:72:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     72:72:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):919 -> l
     73:73:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):919:919 -> l
-    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    74:74:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     74:74:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):920 -> l
     75:75:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):920:920 -> l
     76:79:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):918:921 -> l
     80:80:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):916:916 -> l
-    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    81:81:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     81:81:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):926 -> l
     82:82:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):926:926 -> l
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     83:83:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):928 -> l
     84:84:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):928:928 -> l
     85:87:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):927:929 -> l
     88:88:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):925:925 -> l
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     89:89:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):934 -> l
     90:90:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):934:934 -> l
-    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    91:91:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     91:91:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):936 -> l
     92:92:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):936:936 -> l
-    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    93:93:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     93:93:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):937 -> l
     94:94:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):937:937 -> l
     95:98:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):935:938 -> l
     99:99:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):933:933 -> l
-    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     100:100:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):949 -> l
     101:101:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):949:949 -> l
-    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    102:102:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     102:102:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):951 -> l
     103:103:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):951:951 -> l
-    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l
     104:104:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):952 -> l
     105:105:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):952:952 -> l
     106:109:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):950:953 -> l
     110:110:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):948:948 -> l
     111:231:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):838:958 -> l
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4198:4202 -> l0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4217 -> l0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4217:4217 -> l0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> l0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> l0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4218 -> l0
     9:10:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4218:4219 -> l0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4216:4216 -> l0
     12:31:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4206:4225 -> l0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):963:964 -> m
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> m
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):973 -> m
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):973:973 -> m
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> m
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):975 -> m
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):975:975 -> m
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):974:976 -> m
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):972:972 -> m
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> m
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):981 -> m
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):981:981 -> m
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> m
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):983 -> m
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):983:983 -> m
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> m
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> m
     15:15:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):984 -> m
     16:16:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):984:984 -> m
     17:20:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):982:985 -> m
@@ -34402,18 +34379,18 @@
     22:43:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):968:989 -> m
     1:21:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4229:4249 -> m0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):993:994 -> n
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> n
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1003 -> n
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1003:1003 -> n
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> n
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005 -> n
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1005:1005 -> n
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1004:1006 -> n
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1002:1002 -> n
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> n
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1011 -> n
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1011:1011 -> n
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> n
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> n
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1013 -> n
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1013:1013 -> n
     15:17:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1012:1014 -> n
@@ -34421,168 +34398,168 @@
     19:39:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):998:1018 -> n
     1:21:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4253:4273 -> n0
     1:2:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1023:1024 -> o
-    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     3:3:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1033 -> o
     4:4:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1033:1033 -> o
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     5:5:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1035 -> o
     6:6:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1035:1035 -> o
     7:9:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1034:1036 -> o
     10:10:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1032:1032 -> o
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     11:11:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1041 -> o
     12:12:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1041:1041 -> o
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o
     13:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1043 -> o
     14:14:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1043:1043 -> o
     15:17:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1042:1044 -> o
     18:18:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1040:1040 -> o
     19:39:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1028:1048 -> o
     1:16:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4278:4293 -> o0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4297 -> o0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4297:4297 -> o0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4299 -> o0
     20:20:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4299:4299 -> o0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4300 -> o0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4300:4300 -> o0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> o0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> o0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4301 -> o0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4301:4301 -> o0
     25:29:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4298:4302 -> o0
     30:30:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4296:4296 -> o0
     31:53:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4285:4307 -> o0
     1:4:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052:1055 -> p
-    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p
     5:5:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1065 -> p
     6:6:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1065:1065 -> p
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p
     7:7:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067 -> p
     8:8:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067:1067 -> p
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p
     9:9:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067 -> p
     10:10:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1067:1067 -> p
     11:13:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1066:1068 -> p
     14:14:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1064:1064 -> p
     15:37:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1059:1081 -> p
     1:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4312:4328 -> p0
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4332 -> p0
     19:19:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4332:4332 -> p0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     20:20:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4334 -> p0
     21:21:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4334:4334 -> p0
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     22:22:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4335 -> p0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4335:4335 -> p0
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4336 -> p0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4336:4336 -> p0
     26:30:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4333:4337 -> p0
     31:31:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4331:4331 -> p0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     32:32:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4339 -> p0
     33:33:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4339:4339 -> p0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     34:34:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4343 -> p0
     35:35:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4343:4343 -> p0
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4345 -> p0
     37:37:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4345:4345 -> p0
     38:40:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4344:4346 -> p0
     41:50:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4342:4351 -> p0
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     51:51:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4355 -> p0
     52:52:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4355:4355 -> p0
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     53:53:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4357 -> p0
     54:54:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4357:4357 -> p0
-    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     55:55:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4358 -> p0
     56:56:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4358:4358 -> p0
-    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> p0
+    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> p0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4359 -> p0
     58:58:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4359:4359 -> p0
     59:63:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4356:4360 -> p0
     64:64:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4354:4354 -> p0
     65:110:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4320:4365 -> p0
     1:5:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1085:1089 -> q
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     6:6:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1099 -> q
     7:7:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1099:1099 -> q
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     8:8:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101 -> q
     9:9:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101:1101 -> q
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     10:10:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101 -> q
     11:11:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1101:1101 -> q
     12:14:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1100:1102 -> q
     15:15:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1098:1098 -> q
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     16:16:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1109 -> q
     17:17:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1109:1109 -> q
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     18:18:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111 -> q
     19:19:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111:1111 -> q
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q
     20:20:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111 -> q
     21:21:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1111:1111 -> q
     22:24:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1110:1112 -> q
     25:25:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1108:1108 -> q
     26:56:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1093:1123 -> q
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4370:4374 -> q0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4383 -> q0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4383:4383 -> q0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4389 -> q0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4389:4389 -> q0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     10:10:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4391 -> q0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4391:4391 -> q0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> q0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> q0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4392 -> q0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4392:4392 -> q0
     14:17:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4390:4393 -> q0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4388:4388 -> q0
     19:42:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4378:4401 -> q0
     1:5:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1127:1131 -> r
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     6:6:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1141 -> r
     7:7:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1141:1141 -> r
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     8:8:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> r
     9:9:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143:1143 -> r
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     10:10:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> r
     11:11:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143:1143 -> r
     12:14:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1142:1144 -> r
     15:15:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1140:1140 -> r
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     16:16:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1151 -> r
     17:17:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1151:1151 -> r
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     18:18:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153 -> r
     19:19:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153:1153 -> r
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r
     20:20:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153 -> r
     21:21:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1153:1153 -> r
     22:24:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1152:1154 -> r
     25:25:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1150:1150 -> r
     26:56:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1135:1165 -> r
     1:10:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4405:4414 -> r0
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r0
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     11:11:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4418 -> r0
     12:12:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4418:4418 -> r0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4420 -> r0
     14:14:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4420:4420 -> r0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     15:15:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4421 -> r0
     16:16:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4421:4421 -> r0
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> r0
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> r0
     17:17:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4422 -> r0
     18:18:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4422:4422 -> r0
     19:23:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4419:4423 -> r0
@@ -34590,411 +34567,411 @@
     25:42:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4411:4428 -> r0
     1:29:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1169:1197 -> s
     1:5:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4432:4436 -> s0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> s0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> s0
     6:6:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4451 -> s0
     7:7:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4451:4451 -> s0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> s0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> s0
     8:8:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4453 -> s0
     9:9:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4453:4453 -> s0
     10:12:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4452:4454 -> s0
     13:13:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4450:4450 -> s0
     14:34:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4440:4460 -> s0
     1:5:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1201:1205 -> t
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1226 -> t
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1226:1226 -> t
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1228 -> t
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1228:1228 -> t
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1229 -> t
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1229:1229 -> t
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t
     12:12:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1230 -> t
     13:13:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1230:1230 -> t
     14:18:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1227:1231 -> t
     19:19:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1225:1225 -> t
     20:47:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1209:1236 -> t
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4464:4469 -> t0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4479 -> t0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4479:4479 -> t0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4480 -> t0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4480:4481 -> t0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4478:4478 -> t0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4490 -> t0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4490:4490 -> t0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4492 -> t0
     16:16:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4492:4492 -> t0
     17:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4491:4493 -> t0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4489:4489 -> t0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4498 -> t0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4498:4498 -> t0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4500 -> t0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4500:4500 -> t0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4501 -> t0
     26:26:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4501:4501 -> t0
     27:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4499:4502 -> t0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4497:4497 -> t0
-    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510 -> t0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510:4510 -> t0
-    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> t0
+    34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> t0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4511 -> t0
     35:36:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4511:4512 -> t0
     37:37:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4509:4509 -> t0
     38:83:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4473:4518 -> t0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1240:1269 -> u
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4523:4528 -> u0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4538 -> u0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4538:4538 -> u0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4539 -> u0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4539:4540 -> u0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4537:4537 -> u0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4549 -> u0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4549:4549 -> u0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4550 -> u0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4550:4551 -> u0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4548:4548 -> u0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4556 -> u0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4556:4556 -> u0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558 -> u0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558:4558 -> u0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558 -> u0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4558:4558 -> u0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4557:4559 -> u0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4555:4555 -> u0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4567 -> u0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4567:4567 -> u0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> u0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> u0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4568 -> u0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4568:4569 -> u0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4566:4566 -> u0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4532:4575 -> u0
     1:3:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1273:1275 -> v
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     4:4:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1286 -> v
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1286:1286 -> v
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1288 -> v
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1288:1288 -> v
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1289 -> v
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1289:1289 -> v
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1290 -> v
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1290:1290 -> v
     12:16:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1287:1291 -> v
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1285:1285 -> v
     18:35:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1279:1296 -> v
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4580:4585 -> v0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4595 -> v0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4595:4595 -> v0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4596 -> v0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4596:4597 -> v0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4594:4594 -> v0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4606 -> v0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4606:4606 -> v0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4607 -> v0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4607:4608 -> v0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4605:4605 -> v0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4613 -> v0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4613:4613 -> v0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615 -> v0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615:4615 -> v0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615 -> v0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4615:4615 -> v0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4614:4616 -> v0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4612:4612 -> v0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4624 -> v0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4624:4624 -> v0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> v0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> v0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4625 -> v0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4625:4626 -> v0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4623:4623 -> v0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4589:4632 -> v0
     1:8:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1301:1308 -> w
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1318 -> w
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1318:1318 -> w
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1319 -> w
     12:13:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1319:1320 -> w
     14:14:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1317:1317 -> w
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     15:15:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1329 -> w
     16:16:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1329:1329 -> w
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331 -> w
     18:18:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331:1331 -> w
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     19:19:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331 -> w
     20:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1331:1331 -> w
     21:23:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1330:1332 -> w
     24:24:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1328:1328 -> w
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     25:25:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1342 -> w
     26:26:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1342:1342 -> w
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     27:27:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1344 -> w
     28:28:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1344:1344 -> w
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     29:29:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1345 -> w
     30:30:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1345:1345 -> w
     31:34:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1343:1346 -> w
     35:35:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1341:1341 -> w
-    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     36:36:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1355 -> w
     37:37:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1355:1355 -> w
-    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     38:38:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1357 -> w
     39:39:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1357:1357 -> w
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     40:40:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1358 -> w
     41:41:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1358:1358 -> w
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     42:42:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359 -> w
     43:43:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1359:1359 -> w
     44:48:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1356:1360 -> w
     49:49:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1354:1354 -> w
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     50:50:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1371 -> w
     51:51:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1371:1371 -> w
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     52:52:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1373 -> w
     53:53:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1373:1373 -> w
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     54:54:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1378 -> w
     55:55:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1378:1378 -> w
-    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     56:56:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1379 -> w
     57:58:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1379:1380 -> w
     59:64:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1377:1382 -> w
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     65:65:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1386 -> w
     66:66:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1386:1386 -> w
-    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    67:67:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     67:67:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1388 -> w
     68:68:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1388:1388 -> w
-    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    69:69:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     69:69:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1389 -> w
     70:70:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1389:1389 -> w
     71:74:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1387:1390 -> w
     75:75:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1385:1385 -> w
-    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    76:76:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     76:76:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1396 -> w
     77:77:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1396:1396 -> w
-    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    78:78:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     78:78:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1398 -> w
     79:79:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1398:1398 -> w
-    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    80:80:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     80:80:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1399 -> w
     81:81:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1399:1399 -> w
     82:85:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1397:1400 -> w
     86:93:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1395:1402 -> w
-    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    94:94:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     94:94:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1406 -> w
     95:95:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1406:1406 -> w
-    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    96:96:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     96:96:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1408 -> w
     97:97:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1408:1408 -> w
-    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    98:98:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     98:98:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1409 -> w
     99:99:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1409:1409 -> w
     100:103:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1407:1410 -> w
     104:104:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1405:1405 -> w
-    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    105:105:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     105:105:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1416 -> w
     106:106:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1416:1416 -> w
-    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    107:107:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     107:107:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1418 -> w
     108:108:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1418:1418 -> w
-    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    109:109:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     109:109:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1419 -> w
     110:110:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1419:1419 -> w
     111:114:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1417:1420 -> w
     115:123:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1415:1423 -> w
-    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     124:124:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1427 -> w
     125:125:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1427:1427 -> w
-    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    126:126:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     126:126:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1429 -> w
     127:127:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1429:1429 -> w
-    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    128:128:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     128:128:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1430 -> w
     129:129:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1430:1430 -> w
     130:133:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1428:1431 -> w
     134:134:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1426:1426 -> w
-    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    135:135:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     135:135:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1436 -> w
     136:136:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1436:1436 -> w
-    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     137:137:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1438 -> w
     138:138:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1438:1438 -> w
     139:141:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1437:1439 -> w
     142:142:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1435:1435 -> w
-    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    143:143:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     143:143:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1444 -> w
     144:144:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1444:1444 -> w
-    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    145:145:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     145:145:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1446 -> w
     146:146:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1446:1446 -> w
-    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w
+    147:147:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w
     147:147:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1447 -> w
     148:148:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1447:1447 -> w
     149:152:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1445:1448 -> w
     153:153:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1443:1443 -> w
     154:299:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1312:1457 -> w
     1:6:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4637:4642 -> w0
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4652 -> w0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4652:4652 -> w0
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4653 -> w0
     10:11:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4653:4654 -> w0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4651:4651 -> w0
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4663 -> w0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4663:4663 -> w0
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4664 -> w0
     16:17:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4664:4665 -> w0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4662:4662 -> w0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4670 -> w0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4670:4670 -> w0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672 -> w0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672:4672 -> w0
-    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672 -> w0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4672:4672 -> w0
     25:27:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4671:4673 -> w0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4669:4669 -> w0
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     29:29:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4681 -> w0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4681:4681 -> w0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> w0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> w0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4682 -> w0
     32:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4682:4683 -> w0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4680:4680 -> w0
     35:78:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4646:4689 -> w0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1461:1490 -> x
     1:7:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4693:4699 -> x0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4709 -> x0
     9:9:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4709:4709 -> x0
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     10:10:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4711 -> x0
     11:11:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4711:4711 -> x0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4712 -> x0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4712:4712 -> x0
     14:17:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4710:4713 -> x0
     18:18:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4708:4708 -> x0
-    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4721 -> x0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4721:4721 -> x0
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4722 -> x0
     22:23:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4722:4723 -> x0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4720:4720 -> x0
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4734 -> x0
     26:26:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4734:4734 -> x0
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     27:27:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4736 -> x0
     28:28:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4736:4736 -> x0
     29:31:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4735:4737 -> x0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4733:4733 -> x0
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4739 -> x0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4739:4739 -> x0
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     35:35:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4746 -> x0
     36:36:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4746:4746 -> x0
-    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     37:37:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4748 -> x0
     38:38:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4748:4748 -> x0
-    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    39:39:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     39:39:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4749 -> x0
     40:40:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4749:4749 -> x0
     41:44:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4747:4750 -> x0
     45:45:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4745:4745 -> x0
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> x0
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> x0
     46:46:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4752 -> x0
     47:47:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4752:4752 -> x0
     48:101:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4703:4756 -> x0
     1:16:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1494:1509 -> y
     1:5:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4760:4764 -> y0
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     6:6:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4774 -> y0
     7:7:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4774:4774 -> y0
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     8:8:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4775 -> y0
     9:10:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4775:4776 -> y0
     11:11:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4773:4773 -> y0
-    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    12:12:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     12:12:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4784 -> y0
     13:13:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4784:4784 -> y0
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     14:14:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4786 -> y0
     15:15:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4786:4786 -> y0
     16:18:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4785:4787 -> y0
     19:19:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4783:4783 -> y0
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     20:20:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4792 -> y0
     21:21:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4792:4792 -> y0
-    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    22:22:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     22:22:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4794 -> y0
     23:23:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4794:4794 -> y0
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     24:24:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4795 -> y0
     25:25:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4795:4795 -> y0
     26:29:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4793:4796 -> y0
     30:30:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4791:4791 -> y0
-    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    31:31:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     31:31:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4803 -> y0
     32:32:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4803:4803 -> y0
-    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> y0
+    33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> y0
     33:33:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4805 -> y0
     34:34:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4805:4805 -> y0
     35:37:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4804:4806 -> y0
     38:38:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4802:4802 -> y0
     39:82:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4768:4811 -> y0
     1:3:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1513:1515 -> z
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> z
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     4:4:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1526 -> z
     5:5:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1526:1526 -> z
-    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> z
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     6:6:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1528 -> z
     7:7:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1528:1528 -> z
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> z
+    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     8:8:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1529 -> z
     9:9:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1529:1529 -> z
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> z
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> z
     10:10:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1530 -> z
     11:11:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1530:1530 -> z
     12:16:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1527:1531 -> z
@@ -35021,7 +34998,7 @@
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void rewriteListOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:20 -> a
     2:5:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):35:38 -> a
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> a
+    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
     6:6: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):38 -> a
     7:9: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):39:41 -> a
     1:1:void rewriteMapOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):30:30 -> b
@@ -35034,11 +35011,11 @@
     7:8:byte[] com.android.tools.r8.utils.StreamUtils.StreamToByteArrayClose(java.io.InputStream):16:17 -> a
     9:13:boolean com.android.tools.r8.ir.optimize.ArgumentRemovalUtils.isPinned(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):16:20 -> a
     14:15:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):18:19 -> a
-    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> a
+    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
     16:16:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19 -> a
     17:18:void rewriteHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:21 -> a
     19:26:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:28 -> a
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):29 -> a
     28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26:26 -> a
     29:29:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -35055,32 +35032,30 @@
     34:34:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22 -> a
     35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.MainDexList.parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):22:22 -> a
     36:37:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable):22:23 -> a
-    38:39:int com.android.tools.r8.utils.ListUtils.lastIndexMatching(java.util.List,java.util.function.Predicate):24:25 -> a
-    40:40:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
-    41:43:java.util.List com.android.tools.r8.utils.ListUtils.map(java.util.Collection,java.util.function.Function):33:35 -> a
-    44:46:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
-    47:47:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
-    48:48:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
-    49:49:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
-    50:57:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
-    58:64:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:67 -> a
-    65:66:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:62 -> a
-    67:76:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:70 -> a
-    77:84:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:68 -> a
-    85:87:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:63 -> a
-    88:91:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:64 -> a
-    92:97:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:66 -> a
-    98:106:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:69 -> a
-    107:130:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):83:106 -> a
-    131:131:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):105:105 -> a
-    132:144:void com.android.tools.r8.utils.ZipUtils.writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,com.android.tools.r8.ByteDataView,int):83:95 -> a
-    145:152:boolean com.android.tools.r8.utils.ZipUtils.isClassFile(java.lang.String):104:111 -> a
+    38:38:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):28:28 -> a
+    39:41:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):38:40 -> a
+    42:42:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):57:57 -> a
+    43:43:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):56:56 -> a
+    44:44:void com.android.tools.r8.it.unimi.dsi.fastutil.Arrays.ensureFromTo(int,int,int):55:55 -> a
+    45:52:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:65 -> a
+    53:59:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:67 -> a
+    60:61:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:62 -> a
+    62:71:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:70 -> a
+    72:79:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:68 -> a
+    80:82:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:63 -> a
+    83:86:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:64 -> a
+    87:92:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:66 -> a
+    93:101:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):61:69 -> a
+    102:125:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):83:106 -> a
+    126:126:java.lang.Object[] com.android.tools.r8.utils.ArrayUtils.map(java.lang.Class,java.lang.Object[],java.util.function.Function):105:105 -> a
+    127:139:void com.android.tools.r8.utils.ZipUtils.writeToZipStream(java.util.zip.ZipOutputStream,java.lang.String,com.android.tools.r8.ByteDataView,int):83:95 -> a
+    140:147:boolean com.android.tools.r8.utils.ZipUtils.isClassFile(java.lang.String):104:111 -> 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:9:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteRequireNonNull(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):29:35 -> b
     10:11:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> b
     1:3:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19:21 -> c
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> c
+    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> c
     4:4: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):21 -> c
     5:7: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):22:24 -> c
 com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.D.d.f0.f:
@@ -35101,17 +35076,17 @@
     void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode) -> a
     1:4:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):30:33 -> a
     5:7:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):40:42 -> a
-    8:8:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    8:8:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     8:8:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):43 -> a
     9:33:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):44:68 -> a
     34:34:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):67:67 -> a
-    35:35:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    35:35:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     35:35:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):70 -> a
     36:36:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):72:72 -> a
-    37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     37:37:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):72 -> a
     38:42:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):77:81 -> a
-    43:43:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    43:43:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     43:43:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):81 -> a
     44:44:void insertAssumeNoneInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):82:82 -> a
     45:45:boolean lambda$insertAssumeNoneInstructionsInBlock$0(com.android.tools.r8.ir.code.Instruction):80:80 -> a
@@ -35131,7 +35106,7 @@
     7:7:void markUsersForRemoval(com.android.tools.r8.ir.code.Value):61 -> a
     8:22:void removeIfMarked(com.android.tools.r8.ir.code.Assume,com.android.tools.r8.ir.code.InstructionListIterator):69:83 -> a
     23:29:void removeMarkedInstructions(java.util.Set):88:94 -> a
-    30:30:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    30:30:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     30:30:void removeMarkedInstructions(java.util.Set):95 -> a
     31:32:void removeMarkedInstructions(java.util.Set):96:97 -> a
     33:34:void finish():105:106 -> a
@@ -35167,52 +35142,59 @@
     boolean $assertionsDisabled -> d
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode mode -> c
     1:1:void <clinit>():40:40 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):58:58 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView):55:62 -> <init>
-    1:6:void logResults():67:72 -> a
-    7:7:void logResults():71:71 -> a
-    8:33:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):80:105 -> a
-    34:50:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):103:119 -> a
-    51:57:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):118:124 -> a
-    58:80:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):132:154 -> a
-    81:90:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):161:170 -> a
-    91:91:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    91:91:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):171 -> a
-    92:100:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):172:180 -> a
-    101:101:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    101:101:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):184 -> a
-    102:112:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):185:195 -> a
-    113:113:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    113:113:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):195 -> a
-    114:124:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):196:206 -> a
-    125:125:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    125:125:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207 -> a
-    126:126:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):209:209 -> a
-    127:127:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    127:127:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):209 -> a
-    128:128:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):211:211 -> a
-    129:129:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    129:129:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):210 -> a
-    130:143:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):212:225 -> a
-    144:144:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    144:144:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):226 -> a
-    145:151:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):227:233 -> a
-    152:152:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    152:152:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):233 -> a
-    153:153:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):233:233 -> a
-    154:155:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241:242 -> a
-    156:156:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    156:156:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):243 -> a
-    157:166:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):243:252 -> a
-    167:167:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    167:167:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):243 -> a
-    168:178:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):256:266 -> a
-    179:186:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):265:272 -> a
-    187:187:java.lang.Object lambda$revisitMethods$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):268:268 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView):58:65 -> <init>
+    1:6:void logResults():70:75 -> a
+    7:7:void logResults():74:74 -> a
+    8:20:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):83:95 -> a
+    21:21:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1124:1124 -> a
+    21:21:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):96 -> a
+    22:31:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):97:106 -> a
+    32:32:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1124:1124 -> a
+    32:32:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106 -> a
+    33:33:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):108:108 -> a
+    34:50:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106:122 -> a
+    51:57:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):121:127 -> a
+    58:75:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):135:152 -> a
+    76:85:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):159:168 -> a
+    86:86:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    86:86:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):169 -> a
+    87:95:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):170:178 -> a
+    96:96:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    96:96:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):182 -> a
+    97:107:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):183:193 -> a
+    108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    108:108:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):193 -> a
+    109:119:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):194:204 -> a
+    120:120:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    120:120:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):205 -> a
+    121:121:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207:207 -> a
+    122:122:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    122:122:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207 -> a
+    123:123:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):209:209 -> a
+    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    124:124:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):208 -> a
+    125:138:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):210:223 -> a
+    139:139:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    139:139:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):224 -> a
+    140:146:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):225:231 -> a
+    147:147:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    147:147:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):231 -> a
+    148:148:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):231:231 -> a
+    149:150:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):239:240 -> a
+    151:151:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    151:151:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241 -> a
+    152:161:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241:250 -> a
+    162:162:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    162:162:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241 -> a
+    163:174:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):254:265 -> a
+    175:183:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):264:272 -> a
+    184:184:java.lang.Object lambda$revisitMethods$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):267:267 -> a
 com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode -> com.android.tools.r8.D.e.e:
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode COLLECT -> a
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode REVISIT -> b
-    1:3:void <clinit>():48:50 -> <clinit>
+    com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode FINISH -> c
+    1:5:void <clinit>():48:52 -> <clinit>
     1:1:void <init>(java.lang.String,int):47:47 -> <init>
 com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.D.e.h:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
@@ -35220,844 +35202,799 @@
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction waveDoneAction -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-    1:1:void <clinit>():61:61 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):100:100 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):98:103 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization):61:61 -> a
-    2:33:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):107:138 -> a
-    34:51:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):259:276 -> a
-    34:51:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    52:52:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
-    52:52:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    53:54:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282:283 -> a
-    53:54:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    55:61:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):287:293 -> a
-    55:61:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    55:61:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
+    1:1:void <clinit>():60:60 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):99:99 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):97:102 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization):60:60 -> a
+    2:33:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):106:137 -> a
+    34:51:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):258:275 -> a
+    34:51:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    52:52:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    52:52:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):281 -> a
+    52:52:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    53:54:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):281:282 -> a
+    53:54:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    55:61:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):286:292 -> a
+    55:61:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    55:61:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     62:62:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
-    62:62:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):293 -> a
-    62:62:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    62:62:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    63:92:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):294:323 -> a
-    63:92:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    63:92:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
+    62:62:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):292 -> a
+    62:62:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    62:62:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    63:92:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):293:322 -> a
+    63:92:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    63:92:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     93:93:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    93:93:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):323 -> a
-    93:93:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    93:93:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    94:94:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):323:323 -> a
-    94:94:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    94:94:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
+    93:93:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):322 -> a
+    93:93:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    93:93:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    94:94:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):322:322 -> a
+    94:94:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    94:94:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     95:95: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
-    95:95:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):323 -> a
-    95:95:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    95:95:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    96:98:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):323:325 -> a
-    96:98:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    96:98:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    99:99:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:138 -> a
-    100:100:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:325 -> a
-    100:100:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    100:100:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    101:109:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:147 -> a
+    95:95:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):322 -> a
+    95:95:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    95:95:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    96:98:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):322:324 -> a
+    96:98:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    96:98:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    99:99:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137:137 -> a
+    100:100:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):324:324 -> a
+    100:100:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    100:100:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    101:109:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:146 -> a
     110:110:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():72:72 -> a
-    110:110:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):148 -> a
-    111:127:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):148:164 -> a
-    128:160:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):140:172 -> a
-    161:161:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
-    161:161:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):176 -> a
-    162:188:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):177:203 -> a
-    189:189:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
-    189:189:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):204 -> a
-    190:190:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):204:204 -> a
-    191:191:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):95:95 -> a
-    191:191:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):204 -> a
-    192:231:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):210:249 -> a
+    110:110:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147 -> a
+    111:127:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147:163 -> a
+    128:160:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:171 -> a
+    161:161:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    161:161:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
+    162:188:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):176:202 -> a
+    189:189:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    189:189:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
+    190:190:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:203 -> a
+    191:191:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):84:84 -> a
+    191:191:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
+    192:231:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):209:248 -> a
     232:232:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    232:232:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):212 -> a
-    233:236:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):251:254 -> a
-    237:237:com.android.tools.r8.graph.DexField lambda$optimize$0(com.android.tools.r8.graph.DexEncodedField):222:222 -> a
-    238:239:void lambda$optimize$1():243:244 -> a
-    240:240:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):331:331 -> a
-    241:241:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    241:241:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):333 -> a
-    242:242:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    242:242:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):334 -> a
-    243:364:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):335:456 -> a
-    365:472:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):349:456 -> a
-    473:571:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):358:456 -> a
-    572:574:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):365:367 -> a
-    575:576:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):445:446 -> a
-    575:576:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):368 -> a
-    577:577:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):369:369 -> a
-    578:582:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():818:822 -> a
-    578:582:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):374 -> a
-    583:601:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):377:395 -> a
-    602:605:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):490:493 -> a
-    602:605:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):402 -> a
-    606:606:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    606:606:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):493 -> a
-    606:606:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):402 -> a
-    607:610:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):494:497 -> a
-    607:610:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):402 -> a
-    611:618:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):404:411 -> a
-    619:619:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    619:619:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):411 -> a
-    620:629:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):412:421 -> a
-    630:630:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    630:630:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):493 -> a
-    630:630:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):402 -> a
-    631:663:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):424:456 -> a
-    664:694:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):426:456 -> a
-    695:719:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):432:456 -> a
-    720:727:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):451:458 -> a
-    728:728:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):456:456 -> a
-    729:729:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$2(com.android.tools.r8.graph.DexField):420:420 -> a
-    730:731:java.util.Collection validateFinalFieldPuts(java.util.Map,java.util.Map):483:484 -> a
-    732:740:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):501:509 -> a
+    232:232:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):211 -> a
+    233:236:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):250:253 -> a
+    237:237:com.android.tools.r8.graph.DexField lambda$optimize$0(com.android.tools.r8.graph.DexEncodedField):221:221 -> a
+    238:239:void lambda$optimize$1():242:243 -> a
+    240:240:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$2(com.android.tools.r8.graph.DexField):417:417 -> a
+    241:242:java.util.Collection validateFinalFieldPuts(java.util.Map,java.util.Map):480:481 -> a
+    243:251:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):498:506 -> a
+    252:252:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    252:252:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):330 -> a
+    253:253:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    253:253:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):331 -> a
+    254:375:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):332:453 -> a
+    376:483:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):346:453 -> a
+    484:582:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):355:453 -> a
+    583:585:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):362:364 -> a
+    586:587:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):445:446 -> a
+    586:587:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):365 -> a
+    588:588:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):366:366 -> a
+    589:593:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():819:823 -> a
+    589:593:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):371 -> a
+    594:612:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):374:392 -> a
+    613:616:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):487:490 -> a
+    613:616:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
+    617:617:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    617:617:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):490 -> a
+    617:617:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
+    618:621:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):491:494 -> a
+    618:621:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
+    622:629:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):401:408 -> a
+    630:630:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    630:630:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):408 -> a
+    631:640:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):409:418 -> a
+    641:641:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    641:641:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):490 -> a
+    641:641:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
+    642:674:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):421:453 -> a
+    675:705:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):423:453 -> a
+    706:730:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):429:453 -> a
+    731:738:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):448:455 -> a
+    739:739:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):453:453 -> a
 com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.D.e.g:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization this$0 -> c
     java.util.Set noLongerWrittenFields -> b
-    1:3:void <init>(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization,java.util.Map,java.util.Set):70:72 -> <init>
-    1:2:void join(java.util.Map,java.util.Set):78:79 -> a
-    3:5:void execute():85:87 -> a
-    6:10:void execute():86:90 -> a
+    1:3:void <init>(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization,java.util.Map,java.util.Set):69:71 -> <init>
+    1:2:void join(java.util.Map,java.util.Set):77:78 -> a
+    3:5:void execute():84:86 -> a
+    6:10:void execute():85:89 -> a
     11:11:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    11:11:void execute():85 -> a
+    11:11:void execute():84 -> a
 com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.D.e.r:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.InternalOptions options -> d
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
-    1:1:void <clinit>():134:134 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):153:157 -> <init>
+    1:1:void <clinit>():131:131 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):150:154 -> <init>
     boolean lambda$computeConstantArrayValues$9(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):231:231 -> a
-    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):315:338 -> a
-    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):405:405 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1278:1278 -> a
-    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):405 -> a
-    28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():629:630 -> a
-    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):405 -> a
-    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):412:423 -> a
-    42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):423 -> a
+    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):228:228 -> a
+    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):312:335 -> a
+    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402:402 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1273:1273 -> a
+    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402 -> a
+    28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():625:626 -> a
+    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402 -> a
+    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):409:420 -> a
+    42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):420 -> a
     43:43:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode,int):126:126 -> a
-    43:43:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):424 -> a
-    44:49:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):426:431 -> a
-    50:86: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):583:619 -> a
-    87:87:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):447:447 -> a
-    87:87: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):620 -> a
-    88:102: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):621:635 -> a
-    103:103:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):447:447 -> a
-    103:103: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):636 -> a
-    104:113: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):637:646 -> a
-    114:127: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):696:709 -> a
-    128:128: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):706:706 -> a
-    129:140:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):719:730 -> a
-    141:148:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):735:742 -> a
-    149:149:int codeUnitMargin():749:749 -> a
-    150:150:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):911:911 -> a
-    151:151:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1088:1088 -> a
-    152:152:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1152:1152 -> a
+    43:43:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):421 -> a
+    44:49:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):423:428 -> a
+    50:86: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):580:616 -> a
+    87:87:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):444:444 -> a
+    87:87: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):617 -> a
+    88:102: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):618:632 -> a
+    103:103:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):444:444 -> a
+    103:103: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):633 -> a
+    104:113: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):634:643 -> a
+    114:127: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):693:706 -> a
+    128:128: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):703:703 -> a
+    129:140:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):716:727 -> a
+    141:148:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):732:739 -> a
+    149:149:int codeUnitMargin():746:746 -> a
+    150:150:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):908:908 -> a
+    151:151:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1082:1082 -> a
+    152:152:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1146:1146 -> a
     153:153:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    153:153:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1151 -> a
-    154:160:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1162:1168 -> a
-    154:160:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1155 -> a
-    161:161:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1155:1155 -> a
+    153:153:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1145 -> a
+    154:160:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1156:1162 -> a
+    154:160:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1149 -> a
+    161:161:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1149:1149 -> a
     162:162:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    162:162:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1154 -> a
-    163:165:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1156:1158 -> a
-    166:179:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1312:1325 -> a
-    180:180:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
-    180:180:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330 -> a
-    181:185:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1331:1335 -> a
-    186:186:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
-    186:186:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1336 -> a
-    187:199:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1336:1348 -> a
-    200:200:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
-    200:200:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1347 -> a
-    201:201:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1346:1346 -> a
-    202:209:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1491:1498 -> a
+    162:162:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1148 -> a
+    163:165:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1150:1152 -> a
+    166:179:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1306:1319 -> a
+    180:180:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    180:180:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1324 -> a
+    181:185:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1325:1329 -> a
+    186:186:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    186:186:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330 -> a
+    187:199:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330:1342 -> a
+    200:200:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    200:200:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1341 -> a
+    201:201:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1340:1340 -> a
+    202:209:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1482:1489 -> a
     210:210:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    210:210:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1498 -> a
-    211:211:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    211:211:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1499 -> a
-    212:212:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1501:1501 -> a
+    210:210:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1489 -> a
+    211:211:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    211:211:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1490 -> a
+    212:212:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1492:1492 -> a
     213:213:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    213:213:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1502 -> a
-    214:215:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1503:1504 -> a
+    213:213:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1493 -> a
+    214:215:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1494:1495 -> a
     216:216:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    216:216:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1504 -> a
-    217:234:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1505:1522 -> a
-    235:254:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1521:1540 -> a
-    255:255:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    255:255:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1541 -> a
-    256:257:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1542:1543 -> a
-    258:258:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    258:258:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1544 -> a
-    259:272:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1545:1558 -> a
-    273:273:boolean lambda$removeInstanceOfInstructionIfTrivial$3(com.android.tools.r8.ir.code.Value):1533:1533 -> a
-    274:279:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1565:1570 -> a
-    280:290: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):1575:1585 -> a
-    291:292:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1751:1752 -> a
-    293:294:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1815:1816 -> a
-    295:295:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    295:295:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1817 -> a
-    296:318:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1818:1840 -> a
-    319:319:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    319:319:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1841 -> a
-    320:333:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1842:1855 -> a
-    334:334:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    334:334:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1860 -> a
-    335:378:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1864:1907 -> a
-    379:389:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1912:1922 -> a
-    390:390:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    390:390:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1922 -> a
-    391:391:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1923:1923 -> a
-    392:392:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    392:392:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1924 -> a
-    393:395:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1918:1920 -> a
-    396:396:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1239:1239 -> a
-    396:396:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1921 -> a
-    397:397:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1921:1921 -> a
-    398:445:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):1959:2006 -> a
-    446:451:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2334:2339 -> a
-    452:452:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2355:2355 -> a
-    453:459:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2343:2349 -> a
-    453:459:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2356 -> a
-    460:462:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2358:2360 -> a
-    463:463:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
-    463:463:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2360 -> a
-    464:470:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2361:2367 -> a
-    471:471:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    471:471:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2368 -> a
-    472:477:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2369:2374 -> a
-    478:487:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2321:2330 -> a
-    478:487:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2375 -> a
-    488:503:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2376:2391 -> a
-    504:505: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):2541:2542 -> a
-    506:506:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2707:2707 -> a
-    507:507:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> a
-    507:507:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2707 -> a
-    508:509:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2707:2708 -> a
-    510:537:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2718:2745 -> a
-    538:538:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> a
-    538:538:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2749 -> a
-    539:553:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2764:2778 -> a
-    554:579:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):2952:2977 -> a
-    580:584: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):2988:2992 -> a
-    585:605:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3149:3169 -> a
-    606:606:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
-    606:606:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3169 -> a
-    607:623:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3169:3185 -> a
-    624:624:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    624:624:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3184 -> a
-    625:625:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    625:625:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3183 -> a
-    626:637:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3183:3194 -> a
-    638:660:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3205:3227 -> a
-    661:661: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
-    661:661:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3227 -> a
-    662:662:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3228:3228 -> a
-    663:697: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):3265:3299 -> a
-    663:697:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3232 -> a
-    698:704:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3233:3239 -> a
-    705:705:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    705:705:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3240 -> a
-    706:720:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3241:3255 -> a
-    721:721: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
-    721:721:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3255 -> a
-    722:726:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3310:3314 -> a
-    727:727: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
-    727:727:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3314 -> a
-    728:732:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3315:3319 -> a
-    733:733:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3372:3372 -> a
-    734:743:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3378:3387 -> a
-    734:743:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    744:744:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3384:3384 -> a
-    744:744:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    745:745:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    745:745:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3384 -> a
-    745:745:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    746:746:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3384:3384 -> a
-    746:746:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    747:748: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):3393:3394 -> a
-    749:749:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    749:749: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):3395 -> a
-    750:750: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):3397:3397 -> a
-    751:751:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    751:751: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):3397 -> a
-    752:753: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):3397:3398 -> a
-    754:763:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3408:3417 -> a
-    764:764:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    764:764:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3418 -> a
-    765:765:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
-    765:765:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3419 -> a
-    766:766:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    766:766:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3420 -> a
-    767:768:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3423:3424 -> a
-    769:769:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    769:769:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3424 -> a
-    770:770:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3425:3425 -> a
-    771:771:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    771:771:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3425 -> a
-    772:772:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3428:3428 -> a
-    773:773:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    773:773:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3428 -> a
-    774:774:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    774:774:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3427 -> a
-    775:776:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3430:3431 -> a
-    777:777:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> a
-    777:777:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3431 -> a
-    778:778:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3432:3432 -> a
-    779:779:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> a
-    779:779:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3432 -> a
-    780:780:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3434:3434 -> a
-    781:781:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1262:1262 -> a
-    781:781:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3436 -> a
-    782:782:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3436:3436 -> a
-    783:783:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    783:783:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3434 -> a
-    784:785:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3438:3439 -> a
-    786:786:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    786:786:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3439 -> a
-    787:788:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3441:3442 -> a
-    789:789:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    789:789:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3442 -> a
-    790:798:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3444:3452 -> a
-    799:799:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    799:799:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3452 -> a
-    800:819:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3453:3472 -> a
-    820:823:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
-    820:823:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3472 -> a
-    824:843:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3473:3492 -> a
-    844:844:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    844:844:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3492 -> a
-    845:847:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3493:3495 -> a
-    848:848:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    848:848:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3495 -> a
-    849:850:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3496:3497 -> a
-    851:851:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    851:851:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3496 -> a
-    852:852:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3498:3498 -> a
-    853:853:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    853:853:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3498 -> a
-    854:857:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3501:3504 -> a
-    858:858:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    858:858:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3504 -> a
-    859:859:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3506:3506 -> a
-    860:860:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    860:860:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3506 -> a
-    861:861:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3511:3511 -> a
-    862:869:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3515:3522 -> a
-    870:880:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3535:3545 -> a
-    870:880:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    881:881:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3523:3523 -> a
-    882:907:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3568:3593 -> a
-    882:907:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3523 -> a
-    908:912:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3524:3528 -> a
-    913:913:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3525:3525 -> a
+    216:216:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1495 -> a
+    217:234:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1496:1513 -> a
+    235:250:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1512:1527 -> a
+    251:251:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    251:251:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1528 -> a
+    252:253:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1529:1530 -> a
+    254:254:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    254:254:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1531 -> a
+    255:268:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1532:1545 -> a
+    269:269:boolean lambda$removeInstanceOfInstructionIfTrivial$3(com.android.tools.r8.ir.code.Value):1524:1524 -> a
+    270:275:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1552:1557 -> a
+    276:286: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):1562:1572 -> a
+    287:288:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1738:1739 -> a
+    289:290:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1802:1803 -> a
+    291:291:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    291:291:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1804 -> a
+    292:314:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1805:1827 -> a
+    315:315:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    315:315:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1828 -> a
+    316:329:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1829:1842 -> a
+    330:330:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    330:330:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1847 -> a
+    331:374:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1851:1894 -> a
+    375:385:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1899:1909 -> a
+    386:386:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    386:386:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1909 -> a
+    387:387:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1910:1910 -> a
+    388:388:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    388:388:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1911 -> a
+    389:391:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1905:1907 -> a
+    392:392:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1234:1234 -> a
+    392:392:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1908 -> a
+    393:393:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1908:1908 -> a
+    394:441:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):1946:1993 -> a
+    442:447:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2321:2326 -> a
+    448:448:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2342:2342 -> a
+    449:455:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2330:2336 -> a
+    449:455:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2343 -> a
+    456:458:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2345:2347 -> a
+    459:459:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
+    459:459:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2347 -> a
+    460:466:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2348:2354 -> a
+    467:467:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    467:467:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2355 -> a
+    468:473:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2356:2361 -> a
+    474:483:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2308:2317 -> a
+    474:483:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2362 -> a
+    484:499:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2363:2378 -> a
+    500:501: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):2509:2510 -> a
+    502:502:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675:2675 -> a
+    503:503:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> a
+    503:503:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675 -> a
+    504:505:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675:2676 -> a
+    506:533:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2686:2713 -> a
+    534:534:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> a
+    534:534:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2717 -> a
+    535:549:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2732:2746 -> a
+    550:575:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):2920:2945 -> a
+    576:580: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):2956:2960 -> a
+    581:601:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3117:3137 -> a
+    602:602: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):40:40 -> a
+    602:602:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3137 -> a
+    603:619:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3137:3153 -> a
+    620:620:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    620:620:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3152 -> a
+    621:621:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    621:621:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3151 -> a
+    622:633:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3151:3162 -> a
+    634:656:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3173:3195 -> a
+    657:657: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
+    657:657:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3195 -> a
+    658:658:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3196:3196 -> a
+    659:693: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):3233:3267 -> a
+    659:693:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3200 -> a
+    694:700:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3201:3207 -> a
+    701:701:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    701:701:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3208 -> a
+    702:716:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3209:3223 -> a
+    717:717: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
+    717:717:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3223 -> a
+    718:722:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3278:3282 -> a
+    723:723: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
+    723:723:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3282 -> a
+    724:728:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3283:3287 -> a
+    729:729:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3340:3340 -> a
+    730:739:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3346:3355 -> a
+    730:739:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    740:740:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352:3352 -> a
+    740:740:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    741:741:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    741:741:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352 -> a
+    741:741:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    742:742:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352:3352 -> a
+    742:742:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    743:744: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):3361:3362 -> a
+    745:745:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    745:745: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):3363 -> a
+    746:746: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):3365:3365 -> a
+    747:747:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    747:747: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):3365 -> a
+    748:749: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):3365:3366 -> a
+    750:759:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3376:3385 -> a
+    760:760:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    760:760:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3386 -> a
+    761:761:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.InstructionListIterator.split(com.android.tools.r8.ir.code.IRCode):99:99 -> a
+    761:761:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3387 -> a
+    762:762:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    762:762:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3388 -> a
+    763:764:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3391:3392 -> a
+    765:765:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    765:765:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3392 -> a
+    766:766:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3393:3393 -> a
+    767:767:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    767:767:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3393 -> a
+    768:768:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3396:3396 -> a
+    769:769:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    769:769:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3396 -> a
+    770:770:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    770:770:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3395 -> a
+    771:772:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3398:3399 -> a
+    773:773:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    773:773:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3399 -> a
+    774:774:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3400:3400 -> a
+    775:775:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    775:775:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3400 -> a
+    776:776:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3402:3402 -> a
+    777:777:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
+    777:777:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3404 -> a
+    778:778:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3404:3404 -> a
+    779:779:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    779:779:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3402 -> a
+    780:781:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3406:3407 -> a
+    782:782:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    782:782:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3407 -> a
+    783:784:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3409:3410 -> a
+    785:785:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    785:785:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3410 -> a
+    786:794:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3412:3420 -> a
+    795:795:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    795:795:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3420 -> a
+    796:815:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3421:3440 -> a
+    816:819:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
+    816:819:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3440 -> a
+    820:839:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3441:3460 -> a
+    840:840:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    840:840:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3460 -> a
+    841:843:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3461:3463 -> a
+    844:844:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    844:844:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3463 -> a
+    845:846:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3464:3465 -> a
+    847:847:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    847:847:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3464 -> a
+    848:848:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3466:3466 -> a
+    849:849:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    849:849:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3466 -> a
+    850:853:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3469:3472 -> a
+    854:854:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    854:854:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3472 -> a
+    855:855:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3474:3474 -> a
+    856:856:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    856:856:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3474 -> a
+    857:857:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3479:3479 -> a
+    858:865:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3483:3490 -> a
+    866:876:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3503:3513 -> a
+    866:876:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    877:877:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3491:3491 -> a
+    878:903:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3536:3561 -> a
+    878:903:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3491 -> a
+    904:908:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3492:3496 -> a
+    909:909:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493:3493 -> a
+    910:910:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    910:910:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493 -> a
+    911:911:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    911:911:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    911:911:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493 -> a
+    912:912:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493:3493 -> a
+    913:913:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511:3511 -> a
+    913:913:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
     914:914:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    914:914:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3525 -> a
+    914:914:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511 -> a
+    914:914:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
     915:915:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     915:915:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    915:915:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3525 -> a
-    916:916:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3525:3525 -> a
-    917:917:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3543:3543 -> a
-    917:917:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
+    915:915:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511 -> a
+    915:915:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    916:916:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511:3511 -> a
+    916:916:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    917:917:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507:3507 -> a
+    917:917:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
     918:918:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    918:918:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3543 -> a
-    918:918:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
+    918:918:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507 -> a
+    918:918:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
     919:919:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     919:919:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    919:919:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3543 -> a
-    919:919:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    920:920:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3543:3543 -> a
-    920:920:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    921:921:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3539:3539 -> a
-    921:921:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    922:922:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    922:922:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3539 -> a
-    922:922:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    923:923:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    923:923:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    923:923:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3539 -> a
-    923:923:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    924:924:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3539:3539 -> a
-    924:924:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    925:931:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3549:3555 -> a
-    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):303:304 -> b
-    3:12:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):343:352 -> b
-    13:13:boolean lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.ConstInstruction):1760:1760 -> b
-    14:25:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2789:2800 -> b
-    26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> b
-    26:26:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2801 -> b
-    27:45:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2802:2820 -> b
-    46:46:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> b
-    46:46:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2828 -> b
-    47:53:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2829:2835 -> b
-    54:55:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1059:1060 -> b
-    54:55:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2835 -> b
-    56:57:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2836:2837 -> b
-    58:58:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> b
-    58:58:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2837 -> b
-    59:59:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2840:2840 -> b
-    60:60:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> b
-    60:60:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2841 -> b
-    61:62:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2842:2843 -> b
+    919:919:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507 -> a
+    919:919:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    920:920:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507:3507 -> a
+    920:920:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    921:927:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3517:3523 -> a
+    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):300:301 -> b
+    3:12:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):340:349 -> b
+    13:13:boolean lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.ConstInstruction):1747:1747 -> b
+    14:25:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2757:2768 -> b
+    26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> b
+    26:26:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2769 -> b
+    27:45:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2770:2788 -> b
+    46:46:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> b
+    46:46:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2796 -> b
+    47:53:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2797:2803 -> b
+    54:55:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1056 -> b
+    54:55:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2803 -> b
+    56:57:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2804:2805 -> b
+    58:58:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
+    58:58:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2805 -> b
+    59:59:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2808:2808 -> b
+    60:60:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> b
+    60:60:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2809 -> b
+    61:62:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2810:2811 -> b
     63:63:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> b
-    63:63:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2808 -> b
-    64:65:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2846:2847 -> b
-    66:66:boolean lambda$logArgumentTypes$12(com.android.tools.r8.ir.code.Instruction):3417:3417 -> b
-    67:69:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3656:3658 -> b
-    70:70:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3656:3656 -> b
-    1:4:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1673:1676 -> c
-    5:13:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1691:1699 -> c
-    5:13:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
+    63:63:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2776 -> b
+    64:65:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2814:2815 -> b
+    66:66:boolean lambda$logArgumentTypes$12(com.android.tools.r8.ir.code.Instruction):3385:3385 -> b
+    67:69:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3624:3626 -> b
+    70:70:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3624:3624 -> b
+    1:4:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1660:1663 -> c
+    5:13:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1678:1686 -> c
+    5:13:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
     14:14:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
-    14:14:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1699 -> c
-    14:14:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
-    15:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1699:1701 -> c
-    15:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
-    18:25:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1722:1729 -> c
-    18:25:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1702 -> c
-    18:25:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
-    26:27:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1707:1708 -> c
-    26:27:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
-    28:28:java.util.List lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):1901:1901 -> c
-    29:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2567:2617 -> c
-    80:80:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> c
-    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2618 -> c
-    81:90:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2620:2629 -> c
-    91:91:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2628:2628 -> c
-    92:92:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> c
-    92:92:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2635 -> c
-    93:93:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2638:2638 -> c
-    94:107:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2637:2650 -> c
-    108:108:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2649:2649 -> c
-    109:109:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> c
-    109:109:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2656 -> c
-    110:110:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2659:2659 -> c
-    111:130:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2658:2677 -> c
-    1:1:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):170:170 -> d
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> d
-    2:2:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):172 -> d
-    3:25:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):174:196 -> d
-    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> d
-    26:26:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):208 -> d
-    27:28:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):211:212 -> d
+    14:14:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1686 -> c
+    14:14:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    15:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1686:1688 -> c
+    15:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    18:25:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1709:1716 -> c
+    18:25:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1689 -> c
+    18:25:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    26:27:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1694:1695 -> c
+    26:27:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    28:28:java.util.List lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):1888:1888 -> c
+    29:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2535:2585 -> c
+    80:80:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2586 -> c
+    81:90:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2588:2597 -> c
+    91:91:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2596:2596 -> c
+    92:92:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    92:92:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2603 -> c
+    93:93:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2606:2606 -> c
+    94:107:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2605:2618 -> c
+    108:108:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2617:2617 -> c
+    109:109:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    109:109:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2624 -> c
+    110:110:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2627:2627 -> c
+    111:130:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2626:2645 -> c
+    1:1:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):167:167 -> d
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> d
+    2:2:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):169 -> d
+    3:25:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):171:193 -> d
+    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1089:1089 -> d
+    26:26:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):205 -> d
+    27:28:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):208:209 -> d
     29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> d
-    29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):212 -> d
-    30:33:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):212:215 -> d
-    1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1055:1060 -> e
+    29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):209 -> d
+    30:33:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):209:212 -> d
+    1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1049:1054 -> e
     7:45:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):63:101 -> e
-    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1060 -> e
-    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1062:1069 -> e
+    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1054 -> e
+    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1056:1063 -> e
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> e
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> e
-    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1069 -> e
-    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1070:1081 -> e
+    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1063 -> e
+    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1064:1075 -> e
     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):282:282 -> e
-    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1083 -> e
-    68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1086:1094 -> e
+    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1077 -> e
+    68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1080:1088 -> e
     77:77:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> e
-    77:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1060 -> e
-    1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1360:1386 -> f
+    77:77:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1054 -> e
+    1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1354:1380 -> f
     28:28:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> f
-    28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1386 -> f
-    29:29:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1387:1387 -> f
-    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> f
-    30:30:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1388 -> f
-    31:36:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1390:1395 -> f
-    37: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):1427:1440 -> f
-    37:50:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    51:51:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtCheckCastVerifierBug():1406:1406 -> f
-    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):1440 -> f
-    51:51:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    52:54: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):1441:1443 -> f
-    52:54:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
+    28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1380 -> f
+    29:29:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1381:1381 -> f
+    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> f
+    30:30:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1382 -> f
+    31:36:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1384:1389 -> f
+    37: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):1418:1431 -> f
+    37:50:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    51:51:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtCheckCastVerifierBug():1401:1401 -> f
+    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):1431 -> f
+    51:51:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    52:54: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):1432:1434 -> f
+    52:54:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     55:55:boolean com.android.tools.r8.graph.DexType.isFloatType():216:216 -> f
-    55:55: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):1443 -> f
-    55:55:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    56:63: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):1444:1451 -> f
-    56:63:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
+    55:55: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):1434 -> f
+    55:55:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    56:63: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):1435:1442 -> f
+    56:63:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     64:64:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> f
-    64:64: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):1451 -> f
-    64:64:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    65:93: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):1453:1481 -> f
-    65:93:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
+    64:64:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult removeCheckCastInstructionIfTrivial(com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1442 -> f
+    64:64:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    65:93: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):1444:1472 -> f
+    65:93:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     94:94:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> f
-    94:94: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):1481 -> f
-    94:94:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    95:97: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):1481:1483 -> f
-    95:97:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    98:106:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1396:1404 -> f
-    107:107:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> f
-    107:107:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1416 -> f
-    108:112:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1417:1421 -> f
-    1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3043:3043 -> g
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> g
-    2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3047 -> g
-    3:18:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3048:3063 -> g
-    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> g
-    19:19:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3063 -> g
-    20:61:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3064:3105 -> g
-    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> g
-    62:62:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3063 -> g
-    63:63:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3110:3110 -> g
-    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> h
-    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3114 -> h
-    2:13:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3115:3126 -> h
-    14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> h
-    14:14:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3126 -> h
-    15:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3127:3139 -> h
-    28:28:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> h
-    28:28:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3140 -> h
-    29:29:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3141:3141 -> h
-    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> h
-    30:30:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3126 -> h
-    31:31:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3145:3145 -> h
-    1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1173:1173 -> i
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> i
-    2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1173 -> i
-    3:14:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1176:1187 -> i
-    15:15:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> i
-    15:15:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1188 -> i
-    16:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1189:1209 -> i
-    37:72:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1208:1243 -> i
+    94:94: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):1472 -> f
+    94:94:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    95:97: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):1472:1474 -> f
+    95:97:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    98:120:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1390:1412 -> f
+    1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3011:3011 -> g
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> g
+    2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3015 -> g
+    3:18:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3016:3031 -> g
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> g
+    19:19:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3031 -> g
+    20:61:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3032:3073 -> g
+    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> g
+    62:62:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3031 -> g
+    63:63:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3078:3078 -> g
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> h
+    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3082 -> h
+    2:13:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3083:3094 -> h
+    14:14:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> h
+    14:14:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3094 -> h
+    15:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3095:3107 -> h
+    28:28:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> h
+    28:28:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3108 -> h
+    29:29:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3109:3109 -> h
+    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> h
+    30:30:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3094 -> h
+    31:31:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3113:3113 -> h
+    1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1167:1167 -> i
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> i
+    2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1167 -> i
+    3:14:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1170:1181 -> i
+    15:15:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> i
+    15:15:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1182 -> i
+    16:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1183:1203 -> i
+    37:72:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1202:1237 -> i
     73:73:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> i
-    73:73:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1226 -> i
-    74:76:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1252:1254 -> i
-    77:77:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):479:479 -> i
-    77:77:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1255 -> i
-    78:78:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> i
-    78:78:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256 -> i
-    79:80:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1257:1258 -> i
-    81:81:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> i
-    81:81:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1259 -> i
-    82:83:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1261:1262 -> i
-    84:84:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> i
-    84:84:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1262 -> i
-    85:87:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1262:1264 -> i
-    1:3:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):242:244 -> j
-    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> j
-    4:4:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):245 -> j
-    5:10:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):248:253 -> j
-    11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> j
-    11:11:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):254 -> j
-    12:19:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):258:265 -> j
-    20:20:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> j
-    20:20:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):266 -> j
-    21:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):269:283 -> j
-    36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> j
-    36:36:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):284 -> j
-    37:37:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):285:285 -> j
-    38:38:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> j
-    38:38:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):286 -> j
-    39:39:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):287:287 -> j
-    40:40:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> j
-    40:40:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):289 -> j
-    41:41:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> j
-    41:41:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):290 -> j
-    42:42:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):299:299 -> j
-    1:5:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3329:3333 -> k
-    6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> k
-    6:6:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3334 -> k
-    7:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3335:3345 -> k
-    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> k
-    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3352 -> k
-    19:20:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3353:3354 -> k
-    21:21:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> k
-    21:21:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3355 -> k
-    22:22:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> k
-    22:22:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3356 -> k
-    23:23:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> k
-    23:23:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3359 -> k
-    24:32:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3360:3368 -> k
-    1:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1737:1791 -> l
-    56:56:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> l
-    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1791 -> l
-    57:57:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> l
-    57:57:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1792 -> l
-    58:60:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1793:1795 -> l
-    61:87:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1780:1806 -> l
-    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2036:2036 -> m
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> m
-    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2036 -> m
-    3:9:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2039:2045 -> m
-    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> m
-    10:10:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2046 -> m
-    11:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2047:2047 -> m
-    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2012:2028 -> m
-    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2048 -> m
-    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2051:2067 -> m
-    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2066:2083 -> m
-    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):1932:1948 -> m
-    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2084 -> m
-    81:87:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2088:2094 -> m
-    88:88:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> m
-    88:88:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2095 -> m
-    89:99:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2096:2106 -> m
-    100:100:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> m
-    100:100:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2107 -> m
-    101:115:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2108:2122 -> m
-    116:116:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> m
-    116:116:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2123 -> m
-    117:122:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2129:2134 -> m
-    1:1:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2395:2395 -> n
-    2:7:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401:2406 -> n
-    2:7:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    8:24:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3022:3038 -> n
-    8:24:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2407 -> n
-    8:24:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    25:36:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2996:3007 -> n
-    25:36:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    25:36:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    37:50:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> n
-    37:50:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    37:50:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    37:50:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    51:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> n
-    51:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    51:51:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    51:51:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> n
-    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    52:52:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    52:52:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> n
-    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    53:53:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    53:53:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    54:54:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> n
-    54:54:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    54:54:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    54:54:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    55:63:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007:3015 -> n
-    55:63:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    55:63:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    64:66:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2881:2883 -> n
-    64:66:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    64:66:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    67:67:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> n
-    67:67:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2883 -> n
-    67:67:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    67:67:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    68:102:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2884:2918 -> n
-    68:102:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    68:102:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    103:103:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> n
-    103:103:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2919 -> n
-    103:103:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    103:103:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    104:125:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2921:2942 -> n
-    104:125:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    104:125:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    126:149:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2415:2438 -> n
-    126:149:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    150:150:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    150:150:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2439 -> n
-    150:150:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    151:165:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2442:2456 -> n
-    151:165:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    166:166:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    166:166:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2457 -> n
-    166:166:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    167:167:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2448:2448 -> n
-    167:167:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    168:168:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    168:168:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2449 -> n
-    168:168:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    169:179:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2464:2474 -> n
-    169:179:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    180:180:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    180:180:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2475 -> n
-    180:180:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    181:196:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2478:2493 -> n
-    181:196:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    197:197:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    197:197:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2494 -> n
-    197:197:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    198:198:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2484:2484 -> n
-    198:198:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    199:199:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    199:199:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2485 -> n
-    199:199:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    200:204:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2504:2508 -> n
-    200:204:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    205:205:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    205:205:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2509 -> n
-    205:205:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    206:206:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2511:2511 -> n
-    206:206:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    207:207:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> n
-    207:207:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2511 -> n
-    207:207:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    208:208:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    208:208:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2512 -> n
-    208:208:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    209:211:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2517:2519 -> n
-    209:211:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    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):2546:2546 -> n
-    212:212:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2521 -> n
-    212:212:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    213:213:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    213:213:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2523 -> n
-    213:213:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    214:216:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2530:2532 -> n
-    214:216:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    217:217:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> n
-    217:217:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2532 -> n
-    217:217:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    218:221:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2532:2535 -> n
-    218:221:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2171:2176 -> o
-    7:9:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2215:2217 -> o
-    7:9:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2176 -> o
-    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> o
-    10:10:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2218 -> o
-    10:10:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2176 -> o
-    11:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2219:2233 -> o
-    11:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2176 -> o
-    26:28:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2181:2183 -> o
-    29:29:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> o
-    29:29:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2184 -> o
-    30:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2185:2191 -> o
-    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2140:2162 -> o
-    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2193 -> o
-    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2194:2207 -> o
-    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2167:2167 -> o
-    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2193 -> o
-    1:3:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1593:1595 -> p
-    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> p
-    4:4:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1596 -> p
-    5:6:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1597:1598 -> p
-    7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> p
-    7:7:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1599 -> p
-    8:16:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1600:1608 -> p
-    17:17:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> p
-    17:17:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1609 -> p
-    18:23:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1610:1615 -> p
-    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> p
-    24:24:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1618 -> p
-    25:25:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1622:1622 -> p
-    1:3:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1633:1635 -> q
-    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> q
-    4:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1636 -> q
-    5:23:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1637:1655 -> q
-    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> q
-    24:24:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1656 -> q
-    25:25:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> q
-    25:25:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1657 -> q
-    26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> q
-    26:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1658 -> q
-    27:45:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1646:1664 -> q
-    1:35:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3655:3689 -> r
-    36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> r
-    36:36:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3689 -> r
-    37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> r
-    37:37:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3690 -> r
-    38:45:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3693:3700 -> r
-    1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1107:1121 -> s
-    16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):358:376 -> s
-    16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1122 -> s
-    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1124:1124 -> s
-    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):382:395 -> s
-    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1125 -> s
-    50:50:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):479:479 -> s
-    50:50:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1129 -> s
-    51:58:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1131:1138 -> s
-    59:59:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):479:479 -> s
-    59:59:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1142 -> s
-    60:61:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1144:1145 -> s
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2683:2683 -> t
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2578 -> t
-    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.<init>():119:119 -> t
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2683 -> t
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2578 -> t
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2686:2699 -> t
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2578 -> t
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2579:2579 -> u
-    2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> u
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2579 -> u
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1738:1738 -> v
+    73:73:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1220 -> i
+    74:76:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1246:1248 -> i
+    77:77:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> i
+    77:77:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1249 -> i
+    78:84:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1250:1256 -> i
+    85:85:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> i
+    85:85:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256 -> i
+    86:88:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256:1258 -> i
+    1:10:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):843:852 -> j
+    11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
+    11:11:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):853 -> j
+    12:14:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):854:856 -> j
+    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1001:1008 -> j
+    15:22:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1027:1029 -> j
+    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1012 -> j
+    23:25:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1013:1021 -> j
+    26:34:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    35:35:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):860:860 -> j
+    36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> j
+    36:36:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):864 -> j
+    37:37:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
+    37:37:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):865 -> j
+    38:56:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):866:884 -> j
+    57:57:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> j
+    57:57:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):884 -> j
+    58:58:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):885:885 -> j
+    59:59:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> j
+    59:59:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):886 -> j
+    60:60:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> j
+    60:60:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):887 -> j
+    61:61:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
+    61:61:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):888 -> j
+    62:85:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):889:912 -> j
+    86:86:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    86:86:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):912 -> j
+    87:101:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):913:927 -> j
+    102:102:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    102:102:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):927 -> j
+    103:139:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):929:965 -> j
+    140:140:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    140:140:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):965 -> j
+    141:141:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):967:967 -> j
+    142:156:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):751:765 -> j
+    142:156:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    157:157:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
+    157:157:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):765 -> j
+    157:157:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    158:169:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):771:782 -> j
+    158:169:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    170:170:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    170:170:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):782 -> j
+    170:170:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    171:220:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):783:832 -> j
+    171:220:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    221:221:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
+    221:221:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):833 -> j
+    221:221:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    222:222:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):838:838 -> j
+    222:222:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    223:247:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):972:996 -> j
+    1:3:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):239:241 -> k
+    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> k
+    4:4:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):242 -> k
+    5:10:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):245:250 -> k
+    11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> k
+    11:11:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):251 -> k
+    12:19:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):255:262 -> k
+    20:20:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> k
+    20:20:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):263 -> k
+    21:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):266:280 -> k
+    36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> k
+    36:36:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):281 -> k
+    37:37:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):282:282 -> k
+    38:38:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> k
+    38:38:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):283 -> k
+    39:39:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):284:284 -> k
+    40:40:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> k
+    40:40:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):286 -> k
+    41:41:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> k
+    41:41:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):287 -> k
+    42:42:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):296:296 -> k
+    1:5:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3297:3301 -> l
+    6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> l
+    6:6:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3302 -> l
+    7:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3303:3313 -> l
+    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> l
+    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3320 -> l
+    19:20:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3321:3322 -> l
+    21:21:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> l
+    21:21:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3323 -> l
+    22:22:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> l
+    22:22:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3324 -> l
+    23:23:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> l
+    23:23:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3327 -> l
+    24:32:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3328:3336 -> l
+    1:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1724:1778 -> m
+    56:56:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> m
+    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1778 -> m
+    57:57:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> m
+    57:57:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1779 -> m
+    58:60:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1780:1782 -> m
+    61:87:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1767:1793 -> m
+    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2023:2023 -> n
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> n
+    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2023 -> n
+    3:9:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2026:2032 -> n
+    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> n
+    10:10:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2033 -> n
+    11:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2034:2034 -> n
+    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):1999:2015 -> n
+    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2035 -> n
+    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2038:2054 -> n
+    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2053:2070 -> n
+    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):1919:1935 -> n
+    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2071 -> n
+    81:87:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2075:2081 -> n
+    88:88:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> n
+    88:88:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2082 -> n
+    89:99:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2083:2093 -> n
+    100:100:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> n
+    100:100:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2094 -> n
+    101:115:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2095:2109 -> n
+    116:116:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> n
+    116:116:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2110 -> n
+    117:122:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2116:2121 -> n
+    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2158:2163 -> o
+    7:9:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2202:2204 -> o
+    7:9:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
+    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> o
+    10:10:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2205 -> o
+    10:10:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
+    11:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2206:2220 -> o
+    11:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
+    26:28:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2168:2170 -> o
+    29:29:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> o
+    29:29:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2171 -> o
+    30:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2172:2178 -> o
+    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2127:2149 -> o
+    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2180 -> o
+    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2181:2194 -> o
+    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2154:2154 -> o
+    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2180 -> o
+    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2382:2387 -> p
+    7:23:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2990:3006 -> p
+    7:23:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2388 -> p
+    24:35:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2964:2975 -> p
+    24:35:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    36:49:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> p
+    36:49:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    36:49:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    50:50:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> p
+    50:50:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    50:50:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    51:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> p
+    51:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    51:51:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> p
+    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    52:52:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> p
+    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    53:53:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    54:62:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975:2983 -> p
+    54:62:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    63:65:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2849:2851 -> p
+    63:65:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    66:66:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> p
+    66:66:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2851 -> p
+    66:66:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    67:101:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2852:2886 -> p
+    67:101:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    102:102:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> p
+    102:102:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2887 -> p
+    102:102:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    103:124:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2889:2910 -> p
+    103:124:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    125:149:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2396:2420 -> p
+    150:150:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    150:150:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2421 -> p
+    151:165:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2424:2438 -> p
+    166:166:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    166:166:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2439 -> p
+    167:167:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2430:2430 -> p
+    168:168:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    168:168:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2431 -> p
+    169:179:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2446:2456 -> p
+    180:180:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    180:180:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2457 -> p
+    181:196:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2460:2475 -> p
+    197:197:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    197:197:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2476 -> p
+    198:198:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2466:2466 -> p
+    199:199:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    199:199:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2467 -> p
+    200:203:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2486:2489 -> p
+    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):2514:2514 -> p
+    204:204:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2490 -> p
+    205:205:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2492:2492 -> p
+    206:206:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> p
+    206:206:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2492 -> p
+    207:207:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    207:207:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2493 -> p
+    208:210:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2499:2501 -> p
+    211:211:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> p
+    211:211:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2501 -> p
+    212:214:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2501:2503 -> p
+    1:3:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1580:1582 -> q
+    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> q
+    4:4:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1583 -> q
+    5:6:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1584:1585 -> q
+    7:7:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> q
+    7:7:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1586 -> q
+    8:16:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1587:1595 -> q
+    17:17:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> q
+    17:17:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1596 -> q
+    18:23:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1597:1602 -> q
+    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> q
+    24:24:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1605 -> q
+    25:25:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1609:1609 -> q
+    1:3:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1620:1622 -> r
+    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> r
+    4:4:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1623 -> r
+    5:23:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1624:1642 -> r
+    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> r
+    24:24:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1643 -> r
+    25:25:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> r
+    25:25:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1644 -> r
+    26:26:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> r
+    26:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1645 -> r
+    27:45:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1633:1651 -> r
+    1:35:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3623:3657 -> s
+    36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> s
+    36:36:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3657 -> s
+    37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> s
+    37:37:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3658 -> s
+    38:45:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3661:3668 -> s
+    1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1101:1115 -> t
+    16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):355:373 -> t
+    16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1116 -> t
+    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1118:1118 -> t
+    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):379:392 -> t
+    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1119 -> t
+    50:50:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> t
+    50:50:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1123 -> t
+    51:58:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1125:1132 -> t
+    59:59:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> t
+    59:59:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1136 -> t
+    60:61:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1138:1139 -> t
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2651:2651 -> u
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.<init>():119:119 -> u
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2651 -> u
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2654:2667 -> u
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2547:2547 -> v
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> v
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1738 -> v
-    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):219:231 -> w
-    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):228:234 -> w
-    1:10:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):846:855 -> x
-    11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> x
-    11:11:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):856 -> x
-    12:14:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):857:859 -> x
-    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1007:1014 -> x
-    15:22:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):861 -> x
-    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1033:1035 -> x
-    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1018 -> x
-    23:25:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):861 -> x
-    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1019:1027 -> x
-    26:34:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):861 -> x
-    35:35:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):863:863 -> x
-    36:36:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> x
-    36:36:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):867 -> x
-    37:37:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> x
-    37:37:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):868 -> x
-    38:56:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):869:887 -> x
-    57:57:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> x
-    57:57:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):887 -> x
-    58:58:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):888:888 -> x
-    59:59:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> x
-    59:59:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):889 -> x
-    60:60:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> x
-    60:60:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):890 -> x
-    61:61:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> x
-    61:61:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):891 -> x
-    62:85:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):892:915 -> x
-    86:86:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> x
-    86:86:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):915 -> x
-    87:101:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):916:930 -> x
-    102:102:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> x
-    102:102:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):930 -> x
-    103:139:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):932:968 -> x
-    140:140:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> x
-    140:140:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> x
-    141:141:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):970:970 -> x
-    142:173:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):754:785 -> x
-    142:173:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):971 -> x
-    174:174:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> x
-    174:174:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):785 -> x
-    174:174:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):971 -> x
-    175:230:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):786:841 -> x
-    175:230:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):971 -> x
-    231:255:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):975:999 -> x
-    256:256:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> x
-    256:256:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):999 -> x
-    257:260:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):999:1002 -> x
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2547 -> v
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1725:1725 -> w
+    2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> w
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1725 -> w
+    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):216:228 -> x
+    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):225:231 -> x
 com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.D.e.i:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
-    1:1:void <clinit>():2442:2442 -> <clinit>
+    1:1:void <clinit>():2424:2424 -> <clinit>
 com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.D.e.j:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():2237:2237 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2237:2237 -> <init>
-    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2241:2242 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2237:2237 -> a
-    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2250:2250 -> a
-    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2237 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1211:1211 -> a
-    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2250 -> a
-    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2237 -> a
-    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2254:2269 -> a
-    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2237 -> a
-    20:20:int doHash(java.lang.Object):2237:2237 -> a
-    21:35:int doHash(com.android.tools.r8.ir.code.Instruction):2280:2294 -> a
-    21:35:int doHash(java.lang.Object):2237 -> a
-    36:41:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2301:2306 -> a
-    42:46:int getHashCode(com.android.tools.r8.ir.code.Value):2312:2316 -> a
+    1:1:void <clinit>():2224:2224 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2224:2224 -> <init>
+    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2228:2229 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2224:2224 -> a
+    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2237:2237 -> a
+    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> a
+    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2237 -> a
+    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> a
+    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2241:2256 -> a
+    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> a
+    20:20:int doHash(java.lang.Object):2224:2224 -> a
+    21:35:int doHash(com.android.tools.r8.ir.code.Instruction):2267:2281 -> a
+    21:35:int doHash(java.lang.Object):2224 -> a
+    36:41:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2288:2293 -> a
+    42:46:int getHashCode(com.android.tools.r8.ir.code.Value):2299:2303 -> a
 com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.D.e.k:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
@@ -36065,59 +36002,59 @@
     com.android.tools.r8.ir.code.IRCode code -> c
     boolean $assertionsDisabled -> h
     int right -> e
-    1:1:void <clinit>():512:512 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):520:521 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):530:530 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):535:535 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):545:545 -> a
-    4:9:com.android.tools.r8.ir.code.BasicBlock build():550:555 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
-    10:10:com.android.tools.r8.ir.code.BasicBlock build():555 -> a
-    11:16:com.android.tools.r8.ir.code.BasicBlock build():556:561 -> a
+    1:1:void <clinit>():509:509 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):517:518 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):527:527 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):532:532 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):542:542 -> a
+    4:9:com.android.tools.r8.ir.code.BasicBlock build():547:552 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock build():552 -> a
+    11:16:com.android.tools.r8.ir.code.BasicBlock build():553:558 -> a
     17:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
-    17:20:com.android.tools.r8.ir.code.BasicBlock build():561 -> a
-    21:23:com.android.tools.r8.ir.code.BasicBlock build():563:565 -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):540:540 -> b
+    17:20:com.android.tools.r8.ir.code.BasicBlock build():558 -> a
+    21:23:com.android.tools.r8.ir.code.BasicBlock build():560:562 -> a
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):537:537 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.D.e.l:
     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>():137:139 -> <clinit>
-    1:1:void <init>(java.lang.String,int):136:136 -> <init>
+    1:3:void <clinit>():134:136 -> <clinit>
+    1:1:void <init>(java.lang.String,int):133:133 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.D.e.m:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.Position):440:441 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position):437:438 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.D.e.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():649:649 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):653:653 -> <init>
-    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):651:657 -> <init>
-    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):670:670 -> a
-    2:2:int getMax():666:666 -> a
-    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):670 -> a
-    3:3:int getMin():662:662 -> a
-    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):670 -> a
-    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):670:671 -> a
-    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):687:687 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):649:649 -> b
-    2:2:int getMax():666:666 -> b
-    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):675 -> b
-    3:3:int getMin():662:662 -> b
-    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):675 -> b
-    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):676:676 -> b
+    1:1:void <clinit>():646:646 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):650:650 -> <init>
+    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):648:654 -> <init>
+    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667:667 -> a
+    2:2:int getMax():663:663 -> a
+    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667 -> a
+    3:3:int getMin():659:659 -> a
+    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667 -> a
+    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667:668 -> a
+    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):684:684 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):646:646 -> b
+    2:2:int getMax():663:663 -> b
+    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):672 -> b
+    3:3:int getMin():659:659 -> b
+    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):672 -> b
+    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):673:673 -> b
     5:5:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):114:114 -> b
-    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):680 -> b
-    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):680:680 -> b
+    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):677 -> b
+    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):677:677 -> b
     7:7:int com.android.tools.r8.ir.code.IntSwitch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):103:103 -> b
-    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):682 -> b
-    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):682:682 -> b
+    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):679 -> b
+    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):679:679 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.D.e.o:
     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>():1355:1356 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1354:1354 -> <init>
+    1:2:void <clinit>():1349:1350 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1348:1348 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.D.e.p:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
@@ -36126,26 +36063,26 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    1:1:void <clinit>():3600:3600 -> <clinit>
-    1:8:void <init>():3600:3607 -> <init>
-    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3600:3600 -> <init>
-    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3610:3612 -> a
-    1:33:void dfs(com.android.tools.r8.ir.code.Value):3616:3648 -> b
+    1:1:void <clinit>():3568:3568 -> <clinit>
+    1:8:void <init>():3568:3575 -> <init>
+    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3568:3568 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3578:3580 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):3584:3616 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.D.e.q:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap 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):458:458 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Position):454:454 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):467:467 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):472:472 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):477:477 -> a
-    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):483:504 -> a
+    1:1:void <init>(com.android.tools.r8.ir.code.Position):455:455 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Position):451:451 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):464:464 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):469:469 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):474:474 -> a
+    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):480:501 -> a
     26:29:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.IRMetadata):1422:1425 -> a
-    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):504 -> a
-    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):505:506 -> 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):495:495 -> 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):501:501 -> b
+    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):501 -> a
+    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):502:503 -> 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):492:492 -> 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):498:498 -> b
 com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.D.e.t:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> e
     boolean $assertionsDisabled -> f
@@ -36179,12 +36116,12 @@
     157:165:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):185:193 -> a
     166:171:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):206:211 -> a
     166:171:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):194 -> a
-    172:172:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    172:172:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     172:172:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):212 -> a
     172:172:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):194 -> a
     173:173:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):212:212 -> a
     173:173:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):194 -> a
-    174:174:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    174:174:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     174:174:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):213 -> a
     174:174:void lambda$canonicalize$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):194 -> a
     175:175:void insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstInstruction):217:217 -> a
@@ -36214,7 +36151,7 @@
     1:8:void run(com.android.tools.r8.ir.code.IRCode):35:42 -> a
     9:10:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):89:90 -> a
     9:10:void run(com.android.tools.r8.ir.code.IRCode):43 -> a
-    11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    11:11:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     11:11:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):91 -> a
     11:11:void run(com.android.tools.r8.ir.code.IRCode):43 -> a
     12:21:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):93:102 -> a
@@ -36247,107 +36184,113 @@
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isForcedInliningOracle() -> a
     1:29:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):94:122 -> a
-    1:29:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356 -> a
-    30:30:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:360 -> a
+    1:29:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    30:30:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):355:355 -> a
     31:49:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):130:148 -> a
-    31:49:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
+    31:49:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
     50:51:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):210:211 -> a
     50:51:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):150 -> a
-    50:51:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
+    50:51:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
     52:54:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):151:153 -> a
-    52:54:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
+    52:54:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
     55:55:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
     55:55:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):137 -> a
-    55:55:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
+    55:55:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
     56:56:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
     56:56:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):132 -> a
-    56:56:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
+    56:56:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
     57:58:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):133:134 -> a
-    57:58:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
-    59:60:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365:366 -> a
-    61:61:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365:365 -> a
+    57:58:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    59:60:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:361 -> a
+    61:61:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:360 -> a
     62:70:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):219:227 -> a
-    62:70:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370 -> a
-    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    62:70:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     71:71:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227 -> a
-    71:71:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370 -> a
-    72:146:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227:301 -> a
-    72:146:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370 -> a
-    147:147:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):300:300 -> a
-    147:147:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370 -> a
-    148:148:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):374:374 -> a
-    149:151:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:97 -> a
-    149:151:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356 -> a
-    152:167:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):169:184 -> a
-    168:188:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):180:200 -> a
-    189:189:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
-    189:189:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
-    190:190:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):204:204 -> a
-    191:191:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
-    191:191:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
-    192:192:java.lang.Boolean lambda$canInlineStaticInvoke$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):182:182 -> a
-    193:197:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):306:310 -> a
-    198:198:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):309:309 -> a
-    199:199:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):316:316 -> a
-    200:211:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):325:336 -> a
-    200:211:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):317 -> a
-    212:212:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):318:318 -> a
-    213:213:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):347:347 -> a
-    214:215:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):383:384 -> a
-    216:216:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    216:216:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):384 -> a
-    217:222:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):386:391 -> a
-    223:223:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    223:223:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):391 -> a
-    224:224:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):392:392 -> a
-    225:225:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    225:225:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):392 -> a
-    226:237:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):392:403 -> a
-    238:242:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):416:420 -> a
-    243:245:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):426:428 -> a
-    246:246:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    246:246:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):428 -> a
-    247:247:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):430:430 -> a
-    248:259:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):440:451 -> a
-    260:291:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):467:498 -> a
-    292:292:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    292:292:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):498 -> a
-    293:298:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):501:506 -> a
-    299:299:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    299:299:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):498 -> a
-    300:318:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):509:527 -> a
-    319:319:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    319:319:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):528 -> a
-    320:321:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):530:531 -> a
-    322:322:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    322:322:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):528 -> a
-    323:331:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):537:545 -> a
-    332:332:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    332:332:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):546 -> a
-    333:335:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):548:550 -> a
-    336:336:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    336:336:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):546 -> a
-    337:337:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):558:558 -> a
-    338:343:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):565:570 -> a
-    344:344: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):582:582 -> a
-    345:347:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):593:595 -> a
-    345: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):585 -> a
-    348:348: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):586:586 -> a
-    349:365: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):680:696 -> a
-    349:365: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):587 -> a
-    366:382: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):615:631 -> a
-    383:383:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    383:383: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):631 -> a
-    384:388: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):632:636 -> a
-    389:389:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    389:389: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):637 -> a
-    390:390: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):639:639 -> a
-    391:391:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    391:391: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):631 -> a
-    392:395: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):644:647 -> a
-    396:396:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):706:706 -> a
-    397:431:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):712:746 -> a
-    432:438:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):758:764 -> a
+    71:71:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    72:143:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227:298 -> a
+    72:143:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    144:146:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):297:299 -> a
+    144:146:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    147:147:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):369:369 -> a
+    148:150:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:97 -> a
+    148:150:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    151:166:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):169:184 -> a
+    167:187:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):180:200 -> a
+    188:188:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    188:188:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
+    189:189:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):204:204 -> a
+    190:190:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    190:190:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
+    191:191:java.lang.Boolean lambda$canInlineStaticInvoke$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):182:182 -> a
+    192:192:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):311:311 -> a
+    193:204:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):320:331 -> a
+    193:204:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):312 -> a
+    205:205:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):313:313 -> a
+    206:206:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):342:342 -> a
+    207:208:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):378:379 -> a
+    209:209:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    209:209:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):379 -> a
+    210:215:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):381:386 -> a
+    216:216:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    216:216:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):386 -> a
+    217:217:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387:387 -> a
+    218:218:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    218:218:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387 -> a
+    219:230:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387:398 -> a
+    231:235:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):411:415 -> a
+    236:238:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):421:423 -> a
+    239:239:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    239:239:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):423 -> a
+    240:240:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):425:425 -> a
+    241:272:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):443:474 -> a
+    273:273:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    273:273:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):474 -> a
+    274:279:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):477:482 -> a
+    280:280:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    280:280:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):474 -> a
+    281:299:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):485:503 -> a
+    300:300:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    300:300:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):504 -> a
+    301:302:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):506:507 -> a
+    303:303:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    303:303:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):504 -> a
+    304:312:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):513:521 -> a
+    313:313:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    313:313:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):522 -> a
+    314:316:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):524:526 -> a
+    317:317:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    317:317:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):522 -> a
+    318:318:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):534:534 -> a
+    319:319:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541:541 -> a
+    320:320:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    320:320:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541 -> a
+    321:323:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):544:546 -> a
+    324:324:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    324:324:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541 -> a
+    325:325: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
+    326:326:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    326:326: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 -> a
+    327:329:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):569:571 -> a
+    327:329: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):561 -> a
+    330:330: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):562:562 -> a
+    331:347: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):656:672 -> a
+    331: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):563 -> a
+    348:348:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    348:348: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 -> a
+    349:365: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):591:607 -> a
+    366:366:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    366:366:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):607 -> a
+    367:371: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):608:612 -> a
+    372:372:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    372:372: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):613 -> a
+    373:373: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):615:615 -> a
+    374:374:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    374:374:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):607 -> a
+    375:378: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):620:623 -> a
+    379:379:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):682:682 -> a
+    380:404:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):688:712 -> a
+    405:412:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):724:731 -> a
 com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.D.e.w:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
@@ -36357,25 +36300,25 @@
     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.DexType):48 -> a
     5:31:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):49:75 -> a
-    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Assume.getAliasForOutValue():199:199 -> a
+    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Assume.getAliasForOutValue():194:194 -> a
     32:32:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):75 -> a
     33:59:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):76:102 -> a
     60:108:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):101:149 -> a
     109:109:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     109:109:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):148 -> a
     110:124:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):153:167 -> a
-    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     125:125:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):174 -> a
     126:145:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):176:195 -> a
-    146:146:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    146:146:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     146:146:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):195 -> a
-    147:147:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    147:147:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     147:147:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):196 -> a
     148:148:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):198:198 -> a
     149:149:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
     149:149:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):198 -> a
     150:152:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):200:202 -> a
-    153:153:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    153:153:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     153:153:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):202 -> a
     154:164:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):205:215 -> a
     165:176:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):214:225 -> a
@@ -36391,25 +36334,25 @@
     1:3:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):42:44 -> a
     4:5:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):54:55 -> a
     4:5:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    6:6:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     6:6:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):56 -> a
     6:6:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    7:81:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):57:131 -> a
-    7:81:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    82:82:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):130:130 -> a
-    82:82:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    83:83:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    83:83:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):133 -> a
-    83:83:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    84:84:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):135:135 -> a
-    84:84:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    85:85:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    85:85:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):135 -> a
-    85:85:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    86:101:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):160:175 -> a
-    1:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):146:155 -> b
+    7:76:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):57:126 -> a
+    7:76:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
+    77:77:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):125:125 -> a
+    77:77:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
+    78:78:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    78:78:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):128 -> a
+    78:78:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
+    79:79:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):130:130 -> a
+    79:79:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
+    80:80:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    80:80:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):130 -> a
+    80:80:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
+    81:96:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):155:170 -> a
+    1:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):141:150 -> b
     11:13:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.join(java.lang.Iterable,com.android.tools.r8.graph.AppView):103:105 -> b
-    11:13:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):155 -> b
+    11:13:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):150 -> b
 com.android.tools.r8.ir.optimize.EnumInfoMapCollector -> com.android.tools.r8.D.e.y:
     java.util.Map valueInfoMaps -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -36426,7 +36369,6 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():23:23 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,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.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
     boolean isForcedInliningOracle() -> a
@@ -36437,7 +36379,7 @@
     1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):45:49 -> a
     6:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):62:72 -> a
     6:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):58 -> a
-    17:20:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):122:125 -> a
+    17:20:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):113:116 -> a
 com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.D.e.B:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -36460,12 +36402,12 @@
     34:40:boolean isIdempotentLibraryMethodInvoke(com.android.tools.r8.ir.code.InvokeMethod):256:262 -> a
     34:40:void canonicalize(com.android.tools.r8.ir.code.IRCode):130 -> a
     41:61:void canonicalize(com.android.tools.r8.ir.code.IRCode):131:151 -> a
-    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    62:62:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     62:62:void canonicalize(com.android.tools.r8.ir.code.IRCode):151 -> a
     63:63:void canonicalize(com.android.tools.r8.ir.code.IRCode):152:152 -> a
     64:64:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
     64:64:void canonicalize(com.android.tools.r8.ir.code.IRCode):152 -> a
-    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     65:65:void canonicalize(com.android.tools.r8.ir.code.IRCode):151 -> a
     66:66:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
     66:66:void canonicalize(com.android.tools.r8.ir.code.IRCode):138 -> a
@@ -36473,7 +36415,7 @@
     89:89:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():283:283 -> a
     89:89:void canonicalize(com.android.tools.r8.ir.code.IRCode):184 -> a
     90:139:void canonicalize(com.android.tools.r8.ir.code.IRCode):186:235 -> a
-    140:140:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    140:140:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     140:140:void canonicalize(com.android.tools.r8.ir.code.IRCode):236 -> a
     141:156:void canonicalize(com.android.tools.r8.ir.code.IRCode):237:252 -> a
     157:157:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.InvokeMethod):171:171 -> a
@@ -36486,22 +36428,22 @@
     181:184: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):220:223 -> a
     185:189:void insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):290:294 -> a
     185:189: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):225 -> a
-    190:190:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    190:190:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     190:190:void insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):295 -> a
     190:190: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):225 -> a
     191:191:void insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):295:295 -> a
     191:191: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):225 -> a
-    192:192:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    192:192:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     192:192:void insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):296 -> a
     192: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):225 -> a
     193:193:void insertCanonicalizedInvokeWithoutInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):300:300 -> a
     193:193: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):225 -> a
     194:195: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:228 -> a
     196:200:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):267:271 -> a
-    201:201:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    201:201:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     201:201:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):272 -> a
     202:209:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):273:280 -> a
-    210:210:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    210:210:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     210:210:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):285 -> a
     211:211:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):280:280 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):195:195 -> b
@@ -36516,80 +36458,71 @@
     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.D.e.I:
-    java.util.Set doubleInlineCallers -> g
-    com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> e
-    java.util.Set doubleInlineSelectedTargets -> h
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> c
+    java.util.Set doubleInlineSelectedTargets -> g
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> j
-    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> d
-    java.util.Map doubleInlineeCandidates -> i
-    boolean applyDoubleInlining -> f
+    boolean $assertionsDisabled -> i
+    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> c
+    java.util.Set doubleInlineCallers -> f
+    boolean applyDoubleInlining -> e
     java.util.Set blacklist -> b
-    1:1:void <clinit>():73:73 -> <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):91:91 -> <init>
-    2:17: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):82:97 -> <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.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):102:120 -> a
-    20:20:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):115:115 -> a
-    21:21:boolean isDoubleInliningEnabled():128:128 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):142:142 -> a
-    23:23:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1430 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):142 -> a
-    24:24:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1430:1430 -> a
-    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):142 -> a
-    25:30:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):1032:1037 -> a
-    25:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):143 -> a
-    31:43:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):144:156 -> a
-    44:46: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):134:136 -> a
-    44:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):157 -> a
-    47:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):158:163 -> a
-    53:58:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):185:190 -> a
-    59:69:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):194:204 -> a
-    70:71:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):209:210 -> a
-    72:79:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):245:252 -> a
-    80:93:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):251:264 -> a
-    94:98:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):254:258 -> a
-    99:105:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):254:260 -> a
-    106:130:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):784:808 -> a
-    131:132:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):833:834 -> a
-    133:141:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):843:851 -> a
-    142:142:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):862:862 -> a
-    142:142:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):845 -> a
-    143:143:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):852:852 -> a
-    144:144:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):862:862 -> a
-    145:161:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):879:895 -> a
-    162:162:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    162:162:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):896 -> a
-    163:186:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):897:920 -> a
-    187:198:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):919:930 -> a
-    199:206:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1020:1027 -> a
-    199:206:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):935 -> a
-    207:207:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1025:1025 -> a
-    207:207:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):935 -> a
-    208:208:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):935:935 -> a
-    209:241:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):931:963 -> a
-    242:242:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    242:242:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):967 -> a
-    243:244:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):968:969 -> a
-    245:254: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.DexEncodedMethod):1047:1056 -> a
-    245:254:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):975 -> a
-    255:288:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):969:1002 -> a
-    289:291:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):70:72 -> a
-    289:291:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1002 -> a
-    292:292:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1003:1003 -> a
-    293:293:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):76:76 -> a
-    293:293:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1002 -> a
-    294:302:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1005:1013 -> a
-    303:303:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):479:479 -> a
-    303:303:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1014 -> a
-    304:305:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1015:1016 -> a
-    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):169:175 -> b
-    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> b
-    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):175 -> b
-    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):227:238 -> b
-    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):215:221 -> c
+    com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> d
+    java.util.Map doubleInlineeCandidates -> h
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):85:85 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):77:90 -> <init>
+    1:19:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:113 -> a
+    20:20:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):108:108 -> a
+    21:21:boolean isDoubleInliningEnabled():121:121 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:135 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1425 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135 -> a
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1425:1425 -> a
+    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135 -> a
+    25:30:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):991:996 -> a
+    25:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):136 -> a
+    31:43:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):137:149 -> a
+    44:46: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):127:129 -> a
+    44:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):150 -> a
+    47:52:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):151:156 -> a
+    53:58:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):178:183 -> a
+    59:69:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):187:197 -> a
+    70:71:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):202:203 -> a
+    72:79:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):238:245 -> a
+    80:93:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):244:257 -> a
+    94:98:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:251 -> a
+    99:105:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:253 -> a
+    106:130:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):773:797 -> a
+    131:132:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):822:823 -> a
+    133:141:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):832:840 -> a
+    142:142:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):851:851 -> a
+    142:142:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):834 -> a
+    143:143:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):841:841 -> a
+    144:144:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):851:851 -> a
+    145:156:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):868:879 -> a
+    157:157:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    157:157:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):880 -> a
+    158:184:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):881:907 -> a
+    185:192:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):979:986 -> a
+    185:192:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912 -> a
+    193:193:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):984:984 -> a
+    193:193:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912 -> a
+    194:194:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912:912 -> a
+    195:223:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):908:936 -> a
+    224:224:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    224:224:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):941 -> a
+    225:226:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):942:943 -> a
+    227:236: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.DexEncodedMethod):1006:1015 -> a
+    227:236:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):949 -> a
+    237:266:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):943:972 -> a
+    267:267:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> a
+    267:267:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):973 -> a
+    268:269:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):974:975 -> a
+    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):162:168 -> b
+    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> b
+    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):168 -> b
+    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):220:231 -> b
+    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):208:214 -> c
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.D.e.C:
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> d
@@ -36600,110 +36533,106 @@
     com.android.tools.r8.ir.optimize.Inliner$Constraint ALWAYS -> g
     com.android.tools.r8.ir.optimize.Inliner$Constraint SUBCLASS -> f
     int value -> a
-    1:17:void <clinit>():274:290 -> <clinit>
-    18:47:void <clinit>():274:303 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):294:295 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():274:274 -> a
-    1:1:boolean isSet(int):307:307 -> b
+    1:17:void <clinit>():267:283 -> <clinit>
+    18:47:void <clinit>():267:296 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):287:288 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():267:267 -> a
+    1:1:boolean isSet(int):300:300 -> b
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.D.e.D:
     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>():325:333 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):335:338 -> <init>
-    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):341:345 -> <init>
-    1:24: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):368:391 -> a
-    25:36: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):397:408 -> a
-    37:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):413:463 -> a
-    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):537:547 -> a
-    88:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):463 -> a
-    99:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464:471 -> a
-    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):514:529 -> a
-    107:122:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):471 -> a
-    123:157: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):475:509 -> a
-    1:5:boolean equals(java.lang.Object):358:362 -> equals
-    1:4:int hashCode():350:353 -> hashCode
+    1:9:void <clinit>():318:326 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):328:331 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):334:338 -> <init>
+    1:24: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):361:384 -> a
+    25:36: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):390:401 -> a
+    37:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):406:456 -> a
+    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):530:540 -> a
+    88:98:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):456 -> a
+    99:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):457:464 -> a
+    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):507:522 -> a
+    107:122:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464 -> a
+    123:157: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):468:502 -> a
+    1:5:boolean equals(java.lang.Object):351:355 -> equals
+    1:4:int hashCode():343:346 -> hashCode
     5:5:int com.android.tools.r8.graph.DexType.computeHashCode():43:43 -> hashCode
-    5:5:int hashCode():353 -> hashCode
+    5:5:int hashCode():346 -> hashCode
 com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.D.e.E:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
     boolean shouldSynthesizeNullCheckForReceiver -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():572:572 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):580:583 -> <init>
-    1:1:void setShouldSynthesizeNullCheckForReceiver():587:587 -> a
-    2:17:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):597:612 -> a
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    18:18:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):612 -> a
-    19:50:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):613:644 -> a
-    51:51:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    51:51:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):645 -> a
-    52:62:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):646:656 -> a
+    1:1:void <clinit>():565:565 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):573:576 -> <init>
+    1:1:void setShouldSynthesizeNullCheckForReceiver():580:580 -> a
+    2:17:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):589:604 -> a
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    18:18:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):604 -> a
+    19:50:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):605:636 -> a
+    51:51:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    51:51:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):637 -> a
+    52:62:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):638:648 -> a
     63:63:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    63:63:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):655 -> a
-    64:85:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):658:679 -> a
-    86:91:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):678:683 -> a
-    92:92:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    92:92:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):685 -> a
-    93:93:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):685:685 -> a
-    94:94:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    94:94:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):683 -> a
-    95:101:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):686:692 -> 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.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):694 -> a
-    103:103:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):694:694 -> 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.TypeLatticeElement):1040:1040 -> a
-    104:104:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):696 -> a
-    105:106:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):697:698 -> a
-    107:107:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):131:131 -> a
-    107:107:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):700 -> a
-    108:110:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):704:706 -> a
-    111:111:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    111:111:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):706 -> a
-    112:124:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):707:719 -> a
-    125:125:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    125:125:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):719 -> a
-    126:139:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):720:733 -> a
+    63:63:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):647 -> a
+    64:85:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):650:671 -> a
+    86:91:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):670:675 -> a
+    92:92:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    92:92:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):677 -> a
+    93:93:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):677:677 -> a
+    94:94:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    94:94:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):675 -> a
+    95:103:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):678:686 -> 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.TypeLatticeElement):1036:1036 -> a
+    104:104:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):688 -> a
+    105:106:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):689:690 -> a
+    107:107:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    107:107:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):692 -> a
+    108:110:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):696:698 -> a
+    111:111:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    111:111:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):698 -> a
+    112:124:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):699:711 -> a
+    125:125:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    125:125:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):711 -> a
+    126:139:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):712:725 -> a
     140:140:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    140:140:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):732 -> a
-    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    141:141:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):731 -> a
-    142:142:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):734:734 -> a
-    143:143:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    143:143:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):734 -> a
-    144:148:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):736:740 -> a
-    149:149:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    149:149:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):740 -> a
-    150:150:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    150:150:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):741 -> a
-    151:151:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):742:742 -> a
-    152:152:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    152:152:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):742 -> a
-    153:165:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):743:755 -> a
-    166:166:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    166:166:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):755 -> a
-    167:174:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):760:767 -> a
-    175:175:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):699:699 -> a
+    140:140:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):724 -> a
+    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    141:141:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):723 -> a
+    142:142:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):726:726 -> a
+    143:143:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    143:143:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):726 -> a
+    144:148:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):728:732 -> a
+    149:149:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    149:149:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):732 -> a
+    150:150:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    150:150:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):733 -> a
+    151:151:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):734:734 -> a
+    152:152:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    152:152:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):734 -> a
+    153:165:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):735:747 -> a
+    166:166:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    166:166:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):747 -> a
+    167:171:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):752:756 -> a
+    172:172:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):691:691 -> a
 com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.D.e.F:
     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):776:778 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):765:767 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.D.e.G:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.graph.DexType receiverType -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):822:824 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):811:813 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.D.e.H:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     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:5:void <clinit>():560:564 -> <clinit>
-    1:1:void <init>(java.lang.String,int):559:559 -> <init>
-    1:1:boolean mustBeInlined():568:568 -> a
+    1:5:void <clinit>():553:557 -> <clinit>
+    1:1:void <init>(java.lang.String,int):552:552 -> <init>
 com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.D.e.J:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
@@ -36766,7 +36695,6 @@
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType) -> a
 com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.D.e.L:
-    boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
@@ -36817,97 +36745,97 @@
     java.util.Set warnedFields -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.Reporter reporter -> b
-    1:3:void <clinit>():46:48 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):87:87 -> <init>
-    2:37:void <init>(com.android.tools.r8.graph.AppView):54:89 -> <init>
-    1:5:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedField):93:97 -> a
-    6:13:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup lookupMemberRule(com.android.tools.r8.graph.DexDefinition):112:119 -> a
-    14:17:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):181:184 -> a
-    18:20:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):183:185 -> a
-    21:21: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):222:222 -> a
-    22:32:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):126:136 -> a
-    22:32: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):222 -> a
-    33:40:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):135:142 -> a
-    33:40: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):222 -> a
+    1:3:void <clinit>():43:45 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):84:84 -> <init>
+    2:37:void <init>(com.android.tools.r8.graph.AppView):51:86 -> <init>
+    1:5:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedField):90:94 -> a
+    6:13:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup lookupMemberRule(com.android.tools.r8.graph.DexDefinition):109:116 -> a
+    14:17:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):178:181 -> a
+    18:20:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):180:182 -> a
+    21:21: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):218:218 -> a
+    22:32:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):123:133 -> a
+    22:32: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):218 -> a
+    33:40:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):132:139 -> a
+    33:40: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):218 -> a
     41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    41:41:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):142 -> a
-    41:41: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):222 -> a
-    42:51:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):141:150 -> a
-    42:51: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):222 -> a
-    52:70:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):147:165 -> a
-    52:70: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):222 -> a
-    71:82:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):160:171 -> a
-    71:82: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):222 -> a
-    83:83: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):225:225 -> a
-    84:86:void setValueRangeFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.Value):209:211 -> a
-    84:86: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):225 -> a
-    87:98: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):228:239 -> a
-    99:99:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    99:99: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):239 -> a
-    100:100: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):241:241 -> a
-    101:108:void rewriteStaticGetWithConstantValues(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.StaticGet):345:352 -> a
-    109:144:void rewriteStaticGetWithConstantValues(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.StaticGet):351:386 -> a
-    145:145:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    145:145:void rewriteStaticGetWithConstantValues(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.StaticGet):386 -> a
-    146:154:void rewriteStaticGetWithConstantValues(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.StaticGet):388:396 -> a
-    155:155:java.lang.Boolean lambda$rewriteStaticGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):352:352 -> a
-    156:166:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):436:446 -> a
-    167:167:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    167:167:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447 -> a
-    168:170:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):448:450 -> a
-    171:220:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):254:303 -> a
-    171:220:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    221:225:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):101:105 -> a
-    221:225:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):307 -> a
-    221:225:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    226:232:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):310:316 -> a
-    226:232:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    233:240:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):315:322 -> a
-    233:240:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    241:245:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):193:197 -> a
-    241:245:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321 -> a
-    241:245:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    246:249:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):195:198 -> a
-    246:249:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321 -> a
-    246:249:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    250:260:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):194:204 -> a
-    250:260:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321 -> a
-    250:260:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    261:267:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):325:331 -> a
-    261:267:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    268:268:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    268:268:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):331 -> a
-    268:268:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    269:269:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    269:269:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):333 -> a
-    269:269:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    270:270:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):335:335 -> a
-    270:270:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    271:277:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):451:457 -> a
-    278:286:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):452:460 -> a
-    287:287:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):405:405 -> a
-    287:287:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):459 -> a
-    288:288:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
-    288:288:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):405 -> a
-    288:288:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):459 -> a
-    289:306:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):409:426 -> a
-    289:306:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):459 -> a
-    307:308:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):464:465 -> a
-    309:309:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    309:309:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):465 -> a
-    310:312:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):465:467 -> a
+    41:41:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):139 -> a
+    41:41: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):218 -> a
+    42:51:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):138:147 -> a
+    42:51: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):218 -> a
+    52:70:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):144:162 -> a
+    52:70: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):218 -> a
+    71:82:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):157:168 -> a
+    71:82: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):218 -> a
+    83:83: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):221:221 -> a
+    84:86:void setValueRangeFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.Value):205:207 -> a
+    84:86: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):221 -> a
+    87:98: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):224:235 -> a
+    99:99:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    99:99: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):235 -> a
+    100:100: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):237:237 -> a
+    101:108:void rewriteStaticGetWithConstantValues(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.StaticGet):341:348 -> a
+    109:144:void rewriteStaticGetWithConstantValues(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.StaticGet):347:382 -> a
+    145:145:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    145:145:void rewriteStaticGetWithConstantValues(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.StaticGet):382 -> a
+    146:154:void rewriteStaticGetWithConstantValues(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.StaticGet):384:392 -> a
+    155:155:java.lang.Boolean lambda$rewriteStaticGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):348:348 -> a
+    156:166:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):432:442 -> a
+    167:167:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    167:167:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):443 -> a
+    168:170:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):444:446 -> a
+    171:220:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):250:299 -> a
+    171:220:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    221:225:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):98:102 -> a
+    221:225:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):303 -> a
+    221:225:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    226:232:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):306:312 -> a
+    226:232:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    233:240:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):311:318 -> a
+    233:240:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    241:245:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):190:194 -> a
+    241:245:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    241:245:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    246:249:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):192:195 -> a
+    246:249:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    246:249:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    250:259:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):191:200 -> a
+    250:259:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    250:259:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    260:266:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321:327 -> a
+    260:266:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    267:267:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    267:267:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):327 -> a
+    267:267:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    268:268:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    268:268:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
+    268:268:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    269:269:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):331:331 -> a
+    269:269:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    270:276:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447:453 -> a
+    277:285:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):448:456 -> a
+    286:286:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):401:401 -> a
+    286:286:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    287:287:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
+    287:287:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):401 -> a
+    287:287:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    288:305:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):405:422 -> a
+    288:305:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    306:307:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):460:461 -> a
+    308:308:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    308:308:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):461 -> a
+    309:311:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):461:463 -> a
 com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.D.e.O:
     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):67:69 -> <init>
-    1:5:boolean equals(java.lang.Object):74:78 -> equals
-    1:1:int hashCode():83:83 -> hashCode
+    1:3:void <init>(com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType,com.android.tools.r8.shaking.ProguardMemberRule):64:66 -> <init>
+    1:5:boolean equals(java.lang.Object):71:75 -> equals
+    1:1:int hashCode():80:80 -> hashCode
 com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.D.e.P:
     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>():57:59 -> <clinit>
-    1:1:void <init>(java.lang.String,int):56:56 -> <init>
+    1:3:void <clinit>():54:56 -> <clinit>
+    1:1:void <init>(java.lang.String,int):53:53 -> <init>
 com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.D.e.S:
     java.util.Map com.android.tools.r8.ir.optimize.MemberPoolCollection.memberPools -> c
     com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.MemberPoolCollection.appView -> b
@@ -36938,16 +36866,16 @@
     12:13:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submitAll(java.lang.Iterable,java.util.List,java.util.concurrent.ExecutorService):98:99 -> a
     14:14:void com.android.tools.r8.ir.optimize.MemberPoolCollection.submit(com.android.tools.r8.graph.DexClass,java.util.List,java.util.concurrent.ExecutorService):104:104 -> a
     15:18:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):135:138 -> a
-    19:19:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
+    19:19:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     19:19:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):139 -> a
     20:21:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):141:142 -> a
-    22:22:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):583:583 -> a
+    22:22:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):581:581 -> a
     22:22:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):143 -> a
     23:30:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):145:152 -> a
-    31:31:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
+    31:31:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     31:31:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):153 -> a
     32:33:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):155:156 -> a
-    34:34:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):583:583 -> a
+    34:34:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):581:581 -> a
     34:34:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):157 -> a
     35:35:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):140:140 -> a
     36:36:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):234:234 -> a
@@ -37029,7 +36957,7 @@
     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():932:932 -> a
+    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> 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:31:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):47:62 -> a
     32:36:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):61:65 -> a
@@ -37046,7 +36974,7 @@
     void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode) -> a
     boolean lambda$addNonNullForValues$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:15:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):66:80 -> a
-    16:16:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    16:16:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     16:16:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):81 -> a
     17:73:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):82:138 -> a
     74:74:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
@@ -37065,12 +36993,12 @@
     99:100:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):153:154 -> a
     101:175:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):153:227 -> a
     176:184:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):225:233 -> a
-    185:185:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    185:185:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     185:185:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):233 -> a
     186:186:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):233:233 -> a
-    187:187:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    187:187:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     187:187:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):234 -> a
-    188:188:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    188:188:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     188:188:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):235 -> a
     189:198:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):236:245 -> a
     199:199:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
@@ -37078,7 +37006,7 @@
     200:200:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):245:245 -> a
     201:261: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):299:359 -> a
     262:272: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):357:367 -> a
-    273:273:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    273:273:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     273:273: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):367 -> a
     274:279: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):370:375 -> a
     280:285: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):383:388 -> a
@@ -37107,24 +37035,19 @@
     11:19:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1324:1332 -> a
     20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Outliner$Outline.buildMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):581:581 -> a
     20:20:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333 -> a
-    21:21:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.Outliner):106:106 -> 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):581 -> a
-    21:21:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333 -> a
-    22:22: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):581:581 -> a
-    22:22:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333 -> a
-    23:32:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1334:1343 -> a
-    33:33:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    33:33:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1343 -> a
-    34:42:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1344:1352 -> a
-    43:43:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    43:43:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1352 -> a
-    44:66:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1353:1375 -> a
-    67:67:void com.android.tools.r8.graph.DexProgramClass.<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):70:70 -> a
-    67:67:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1375 -> a
-    68:68:void com.android.tools.r8.graph.DexProgramClass.<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):52:52 -> a
-    68:68:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1375 -> a
-    69:75:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1392:1398 -> a
-    76:77:boolean checkAllOutlineSitesFoundAgain():1403:1404 -> a
+    21:30:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1334:1343 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    31:31:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1343 -> a
+    32:40:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1344:1352 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    41:41:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1352 -> a
+    42:64:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1353:1375 -> a
+    65:65:void com.android.tools.r8.graph.DexProgramClass.<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):70:70 -> a
+    65:65:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1375 -> a
+    66:66:void com.android.tools.r8.graph.DexProgramClass.<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):52:52 -> a
+    66:66:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1375 -> a
+    67:73:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1392:1398 -> a
+    74:75:boolean checkAllOutlineSitesFoundAgain():1403:1404 -> a
     1:1:com.android.tools.r8.ir.optimize.InliningConstraints access$100(com.android.tools.r8.ir.optimize.Outliner):106:106 -> b
     2:4:void identifyOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1294:1296 -> b
     5:5:java.util.Set getMethodsSelectedForOutlining():1316:1316 -> b
@@ -37303,7 +37226,7 @@
     4:6:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1266:1268 -> a
     4:6:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1202 -> a
     7:56:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1203:1252 -> a
-    57:57:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    57:57:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     57:57:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1252 -> a
     58:64:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1253:1259 -> a
 com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.D.e.g0:
@@ -37370,7 +37293,7 @@
     5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):767:772 -> 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():335:335 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> 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):945:951 -> a
     39:71:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):957:989 -> a
@@ -37389,14 +37312,14 @@
     105:113:void includeInstruction(com.android.tools.r8.ir.code.Instruction):997:1005 -> c
     105:113:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     105:113:void process():760 -> c
-    114:114:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> c
+    114:114:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     114:114:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006 -> c
     114:114:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     114:114:void process():760 -> c
     115:121:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006:1012 -> c
     115:121:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     115:121:void process():760 -> c
-    122:122:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> c
+    122:122:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     122:122:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1006 -> c
     122:122:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     122:122:void process():760 -> c
@@ -37406,7 +37329,7 @@
     132:137:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1023:1028 -> c
     132:137:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     132:137:void process():760 -> c
-    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> c
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     138:138:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1028 -> c
     138:138:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     138:138:void process():760 -> c
@@ -37419,7 +37342,7 @@
     164:172:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1034:1042 -> c
     164:172:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     164:172:void process():760 -> c
-    173:173:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> c
+    173:173:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> c
     173:173:void includeInstruction(com.android.tools.r8.ir.code.Instruction):1028 -> c
     173:173:void processInstruction(com.android.tools.r8.ir.code.Instruction):807 -> c
     173:173:void process():760 -> c
@@ -37440,7 +37363,7 @@
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):40:40 -> a
     2:9:void removeRedundantInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):489:496 -> a
     2:9:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):41 -> a
-    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     10:10:void removeRedundantInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):497 -> a
     10:10:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):41 -> a
     11:17:void removeRedundantInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):498:504 -> a
@@ -37534,19 +37457,19 @@
     1:2:boolean shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):71:72 -> a
     3:11:boolean couldBeVolatile(com.android.tools.r8.graph.DexField):101:109 -> a
     12:23:void run():113:124 -> a
-    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    24:24:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     24:24:void run():125 -> a
     25:39:void run():126:140 -> a
-    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     40:40:void run():140 -> a
     41:46:void run():141:146 -> a
-    47:47:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    47:47:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     47:47:void run():140 -> a
     48:54:void run():148:154 -> a
-    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     55:55:void run():154 -> a
     56:57:void run():155:156 -> a
-    58:58:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    58:58:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     58:58:void run():154 -> a
     59:127:void run():157:225 -> a
     128:154:void run():200:226 -> a
@@ -37556,14 +37479,14 @@
     164:166:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):297:299 -> a
     164:166:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     164:166:void run():229 -> a
-    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    167:167:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     167:167:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):299 -> a
     167:167:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     167:167:void run():229 -> a
     168:169:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):300:301 -> a
     168:169:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     168:169:void run():229 -> a
-    170:170:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    170:170:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     170:170:void killActiveFieldsForExceptionalExit(com.android.tools.r8.ir.code.FieldInstruction):299 -> a
     170:170:void propagateActiveFieldsFrom(com.android.tools.r8.ir.code.BasicBlock):245 -> a
     170:170:void run():229 -> a
@@ -37595,7 +37518,7 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:12:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:47 -> a
-    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    13:13:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     13:13:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):48 -> a
     14:19:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):49:54 -> a
     20:33: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):81:94 -> a
@@ -37608,17 +37531,17 @@
     59:61:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):55:57 -> a
     62:69: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):133:140 -> a
     62:69:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    70:70:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    70:70:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     70:70: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):140 -> a
     70:70:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     71:96: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):142:167 -> a
     71:96:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    97:97:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     97:97: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):170 -> a
     97:97:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     98:124: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):172:198 -> a
     98:124:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
-    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     125:125: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):140 -> a
     125:125:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     126:128:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):60:62 -> a
@@ -37641,29 +37564,29 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView):71:77 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():81:81 -> a
     2:2:void rewrite(com.android.tools.r8.ir.code.IRCode):85:85 -> a
-    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     3:3:void rewrite(com.android.tools.r8.ir.code.IRCode):86 -> a
     4:29:void rewrite(com.android.tools.r8.ir.code.IRCode):87:112 -> a
-    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     30:30:void rewrite(com.android.tools.r8.ir.code.IRCode):112 -> a
     31:56:void rewrite(com.android.tools.r8.ir.code.IRCode):113:138 -> a
-    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     57:57:void rewrite(com.android.tools.r8.ir.code.IRCode):138 -> a
     58:60:void rewrite(com.android.tools.r8.ir.code.IRCode):138:140 -> a
-    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    61:61:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     61:61:void rewrite(com.android.tools.r8.ir.code.IRCode):141 -> a
     62:65:void rewrite(com.android.tools.r8.ir.code.IRCode):142:145 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     66:66:void rewrite(com.android.tools.r8.ir.code.IRCode):141 -> a
-    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    67:67:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     67:67:void rewrite(com.android.tools.r8.ir.code.IRCode):138 -> a
     68:87:void rewrite(com.android.tools.r8.ir.code.IRCode):150:169 -> a
     88:99:void rewrite(com.android.tools.r8.ir.code.IRCode):168:179 -> a
-    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     100:100:void rewrite(com.android.tools.r8.ir.code.IRCode):112 -> a
     101:102:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):184:185 -> a
     101: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):171 -> a
-    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    103:103:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     103:103:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):185 -> a
     103:103:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     104:124:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):186:206 -> a
@@ -37676,7 +37599,7 @@
     126:126:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     127:137:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):206:216 -> a
     127:137:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
-    138:138:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> a
+    138:138:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
     138:138:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):213 -> a
     138:138:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     139:146:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):218:225 -> a
@@ -37708,7 +37631,7 @@
     251:252:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225:226 -> a
     251:252:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     253:253:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172:172 -> a
-    254:254:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    254:254:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     254:254:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172 -> a
     255:255:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):173:173 -> a
 com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.D.e.q0:
@@ -37770,9 +37693,14 @@
     1:7:com.android.tools.r8.shaking.AppInfoWithLiveness run():80:86 -> a
     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:74:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):103:160 -> a
-    75:75:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> a
-    76:78:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):165:167 -> a
+    17:18:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):103:104 -> a
+    19:19:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    19:19:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):105 -> a
+    20:56:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):107:143 -> a
+    57:57:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
+    57:57:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):105 -> a
+    58:58:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):107:107 -> a
+    59:61:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):148:150 -> a
 com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.D.e.u0:
 com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.D.e.v0:
     com.android.tools.r8.ir.code.Instruction arrayGet -> b
@@ -37823,7 +37751,7 @@
     220:230:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):360:370 -> a
     231:231:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription):369:369 -> a
     232:241:void rewrite(com.android.tools.r8.ir.code.IRCode):374:383 -> a
-    242:242:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    242:242:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     242:242:void rewrite(com.android.tools.r8.ir.code.IRCode):384 -> a
     243:245:void rewrite(com.android.tools.r8.ir.code.IRCode):385:387 -> a
     246:255: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):439:448 -> a
@@ -37834,23 +37762,22 @@
     289:297:void rewrite(com.android.tools.r8.ir.code.IRCode):408:416 -> a
     298:318: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,java.util.Set,java.util.Set):536:556 -> a
     298:318:void rewrite(com.android.tools.r8.ir.code.IRCode):415 -> a
-    319:319:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):479:479 -> a
-    319:319:void rewrite(com.android.tools.r8.ir.code.IRCode):425 -> a
-    320:320:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> a
-    320:320:void rewrite(com.android.tools.r8.ir.code.IRCode):426 -> a
-    321:323:void rewrite(com.android.tools.r8.ir.code.IRCode):427:429 -> a
-    324:324:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    324:324:void rewrite(com.android.tools.r8.ir.code.IRCode):429 -> a
-    325:327:void rewrite(com.android.tools.r8.ir.code.IRCode):429:431 -> a
-    328:332:void logResults():458:462 -> a
-    333:340:void logResults():459:466 -> a
-    341:346:void logResults():463:468 -> a
-    347:350:void logResults():467:470 -> a
-    351:354:void logResults():469:472 -> a
-    355:355:void logResults():471:471 -> a
-    356:393: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,java.util.Set):483:520 -> a
-    394:401:void replaceOutValueByNull(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):565:572 -> a
-    402:404:void replaceOutValueByNull(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):571:573 -> a
+    319:320:void rewrite(com.android.tools.r8.ir.code.IRCode):425:426 -> a
+    321:321:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    321:321:void rewrite(com.android.tools.r8.ir.code.IRCode):426 -> a
+    322:322:void rewrite(com.android.tools.r8.ir.code.IRCode):426:426 -> a
+    323:323:void com.android.tools.r8.ir.code.IRCode.removeBlocks(java.util.Collection):475:475 -> a
+    323:323:void rewrite(com.android.tools.r8.ir.code.IRCode):428 -> a
+    324:326:void rewrite(com.android.tools.r8.ir.code.IRCode):429:431 -> a
+    327:331:void logResults():458:462 -> a
+    332:339:void logResults():459:466 -> a
+    340:345:void logResults():463:468 -> a
+    346:349:void logResults():467:470 -> a
+    350:353:void logResults():469:472 -> a
+    354:354:void logResults():471:471 -> a
+    355:392: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,java.util.Set):483:520 -> a
+    393:400:void replaceOutValueByNull(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):565:572 -> a
+    401:403:void replaceOutValueByNull(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):571:573 -> a
     1:8:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):307:314 -> b
     9:9:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> b
     9:9:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):314 -> b
@@ -37890,41 +37817,41 @@
     38:38:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
     38:38:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> a
     38:38:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    39:49:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222:232 -> a
-    39:49:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    50:50:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
-    50:50:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):236 -> a
-    50:50:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    51:63:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):237:249 -> a
-    51:63:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    64:64:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    64:64:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> a
-    64:64:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    65:84:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):287:306 -> a
-    85:85:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    85:85:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):306 -> a
-    86:97:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):307:318 -> a
-    98:98:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
-    98:98:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):320 -> a
-    99:101:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):321:323 -> a
-    102:109:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):319:326 -> a
-    110:113:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):333:336 -> a
-    114:114:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    114:114:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):336 -> a
-    115:123:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):336:344 -> a
-    124:124:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
-    124:124:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):344 -> a
-    125:131:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):345:351 -> a
-    1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):255:272 -> b
-    19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):271:276 -> b
+    39:45:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222:228 -> a
+    39:45:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    46:46:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):275:275 -> a
+    46:46:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):229 -> a
+    46:46:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    47:59:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):230:242 -> a
+    47:59:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    60:60:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    60:60:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):222 -> a
+    60:60:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    61:80:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):280:299 -> a
+    81:81:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    81:81:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):299 -> a
+    82:93:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):300:311 -> a
+    94:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
+    94:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):313 -> a
+    95:97:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):314:316 -> a
+    98:105:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):312:319 -> a
+    106:109:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):326:329 -> a
+    110:110:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    110:110:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):329 -> a
+    111:119:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):329:337 -> a
+    120:120:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    120:120:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):337 -> a
+    121:127:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):338:344 -> a
+    1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):248:265 -> b
+    19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):264:269 -> b
     1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):217:217 -> c
 com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.D.e.z0:
 com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.D.e.A0:
     java.util.BitSet used -> a
-    1:3:void <init>():354:356 -> <init>
-    4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):354:354 -> <init>
-    1:1:java.util.BitSet getUsedArguments():359:359 -> a
-    2:2:boolean register(int):364:364 -> a
+    1:3:void <init>():347:349 -> <init>
+    4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):347:347 -> <init>
+    1:1:java.util.BitSet getUsedArguments():352:352 -> a
+    2:2:boolean register(int):357:357 -> a
 com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.D.e.B0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> b
     com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool methodPool -> a
@@ -37989,13 +37916,13 @@
     31:31:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):193 -> a
     32:33:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):265:266 -> a
     32:33:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):193 -> a
-    34:34:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
+    34:34:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     34:34: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):172 -> a
     35:81: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):172:218 -> a
     82:84:void logIneligibleUser(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionOrPhi):77:79 -> a
     82:84: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):218 -> a
     85:94: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):223:232 -> a
-    95:95:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> a
+    95:95:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1089:1089 -> a
     95:95: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):233 -> a
     96:97: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):234:235 -> a
     98:98:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
@@ -38039,18 +37966,18 @@
     29:45:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):101:117 -> a
     1:13:com.android.tools.r8.ir.code.Value getOrCreateOutValue(com.android.tools.r8.ir.code.BasicBlock):69:81 -> b
     14:24:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):123:133 -> b
-    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     25:25:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):133 -> b
     26:26:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):133:133 -> b
-    27:27:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    27:27:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     27:27:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):133 -> b
     28:38:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):142:152 -> b
     39:39:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> b
     39:39:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):152 -> b
-    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> b
+    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> b
     40:40:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151 -> b
     41:45:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151:155 -> b
-    46:46:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> b
+    46:46:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
     46:46:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):155 -> b
     47:50:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):157:160 -> b
 com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.D.e.F0.d:
@@ -38075,10 +38002,10 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):94:94 -> <init>
     2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):78:101 -> <init>
     1:1:int getEstimatedCombinedSizeForInlining():105:105 -> a
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     2:2:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):589 -> a
     3:3:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):589:589 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     4:4:boolean lambda$isEligibleConstructorCall$1(com.android.tools.r8.ir.code.Value):589 -> a
     5:34:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):262:291 -> a
     35:47:com.android.tools.r8.graph.DexEncodedMethod findSingleTarget(com.android.tools.r8.ir.code.InvokeMethod):962:974 -> a
@@ -38086,7 +38013,7 @@
     48:85:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):293:330 -> a
     86:93:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):800:807 -> a
     86:93:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     94:94:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807 -> a
     94:94:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     95:102:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807:814 -> a
@@ -38094,7 +38021,7 @@
     103:103:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isNullable():42:42 -> a
     103:103:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):814 -> a
     103:103:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    104:104:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    104:104:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     104:104:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):807 -> a
     104:104:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     105:105:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):819:819 -> a
@@ -38102,14 +38029,14 @@
     106:107:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):847:848 -> a
     106:107:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     106:107:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     108:108:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):848 -> a
     108:108:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     108:108:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
     109:116:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):849:856 -> a
     109:116:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     109:116:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
-    117:117:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    117:117:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     117:117:boolean isEligibleParameterUsages(com.android.tools.r8.ir.code.InvokeMethod,java.util.List,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):848 -> a
     117:117:boolean isExtraMethodCallEligible(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Supplier):822 -> a
     117:117:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):331 -> a
@@ -38118,14 +38045,14 @@
     130:133:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):340:343 -> a
     134:136:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):280:282 -> a
     137:137:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370:370 -> a
-    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     138:138:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
     139:139:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370:370 -> a
-    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     140:140:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370 -> a
     141:147:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):409:415 -> a
     141:147:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
-    148:148:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    148:148:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     148:148:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):415 -> a
     148:148:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
     149:154:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):416:421 -> a
@@ -38167,10 +38094,10 @@
     408:408:boolean lambda$isEligibleIndirectVirtualMethodCall$4(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):710:710 -> a
     409:445:com.android.tools.r8.ir.optimize.Inliner$InliningInfo isEligibleVirtualMethodCall(boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):720:756 -> a
     446:451:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):760:765 -> a
-    452:452:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    452:452:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     452:452:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):765 -> a
     453:453:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):765:765 -> a
-    454:454:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    454:454:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     454:454:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):765 -> a
     455:458:boolean isExtraMethodCall(com.android.tools.r8.ir.code.InvokeMethod):769:772 -> a
     459:489:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):869:899 -> a
@@ -38184,10 +38111,10 @@
     540:541:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1008:1009 -> a
     1:103:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():148:250 -> b
     104:104:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():234:234 -> b
-    105:105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    105:105:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     105:105:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):696 -> b
     106:106:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):696:696 -> b
-    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     107:107:boolean lambda$isEligibleDirectVirtualMethodCall$2(com.android.tools.r8.ir.code.Value):696 -> b
     108:121:boolean exemptFromInstructionLimit(com.android.tools.r8.graph.DexEncodedMethod):939:952 -> b
     108:121:void markSizeForInlining(com.android.tools.r8.graph.DexEncodedMethod):956 -> b
@@ -38213,16 +38140,15 @@
     1:1:com.android.tools.r8.ir.optimize.info.DefaultCallSiteOptimizationInfo getInstance():16:16 -> d
 com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.D.e.G0.c:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
-    1:1:void <clinit>():12:12 -> <clinit>
-    1:1:void <init>():14:14 -> <init>
+    1:1:void <clinit>():11:11 -> <clinit>
+    1:1:void <init>():13:13 -> <init>
     boolean cannotBeKept() -> b
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType() -> c
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType() -> d
-    int getReadBits() -> e
-    boolean isDefaultFieldOptimizationInfo() -> f
-    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():22:22 -> h
-    boolean valueHasBeenPropagated() -> i
-    1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():17:17 -> j
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType() -> c
+    int getReadBits() -> d
+    boolean isDefaultFieldOptimizationInfo() -> e
+    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():21:21 -> g
+    boolean valueHasBeenPropagated() -> h
+    1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():16:16 -> i
 com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.D.e.G0.d:
     boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> m
     boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> p
@@ -38288,16 +38214,15 @@
     1:1:boolean mayHaveSideEffects():201:201 -> y
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():77:77 -> z
 com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.D.e.G0.e:
-    1:1:void <init>():10:10 -> <init>
+    1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
     boolean cannotBeKept() -> b
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType() -> c
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType() -> d
-    int getReadBits() -> e
-    boolean isDefaultFieldOptimizationInfo() -> f
-    boolean isMutableFieldOptimizationInfo() -> g
-    com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> h
-    boolean valueHasBeenPropagated() -> i
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType() -> c
+    int getReadBits() -> d
+    boolean isDefaultFieldOptimizationInfo() -> e
+    boolean isMutableFieldOptimizationInfo() -> f
+    com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> g
+    boolean valueHasBeenPropagated() -> h
 com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.D.e.G0.g:
     long getReturnedConstantNumber() -> A
     com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility() -> B
@@ -38343,142 +38268,94 @@
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():63:63 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView):68:71 -> <init>
-    1:1: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):79:79 -> a
-    2:6:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):194:198 -> a
-    2: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):80 -> a
-    7:13:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage collectParameterUsages(int,com.android.tools.r8.ir.code.Value):214:220 -> a
-    7:13:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):201 -> a
-    7:13: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):80 -> a
-    14:21:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):203:210 -> a
-    14:21: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):80 -> a
-    22:22:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):206:206 -> a
-    22:22: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):80 -> a
-    23:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):225:242 -> a
-    23: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):81 -> a
-    41:41:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    41:41:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):245 -> a
-    41:41: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):81 -> a
-    42:61:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):246:265 -> a
-    42:61: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):81 -> a
-    62:64: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):82:84 -> a
-    65:68:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):476:479 -> a
-    65:68: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):84 -> a
-    69:75:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):478:484 -> a
-    69: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):84 -> a
-    76:76:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):483:483 -> 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):84 -> a
-    77:85: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):732:740 -> a
-    77:85: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):86 -> a
-    86:86:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
-    86:86: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):740 -> a
-    86:86: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):86 -> a
-    87:94: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):743:750 -> a
-    87:94: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):86 -> a
-    95:101:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):757:763 -> a
-    95:101: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):87 -> a
-    102:102:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    102:102:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):758 -> a
-    102:102: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):87 -> a
-    103:103: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):88:88 -> a
-    104:110:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):838:844 -> a
-    104:110: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):89 -> a
-    111:133:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):851:873 -> a
-    111:133: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):90 -> a
-    134:165:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):878:909 -> a
-    134:165: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):91 -> a
-    166:211: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):931:976 -> a
-    166:211:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):910 -> a
-    166:211: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):91 -> a
-    212:217:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):916:921 -> a
-    212:217: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):91 -> a
-    218:218:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
-    218:218:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):842 -> a
-    218:218: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):89 -> a
-    219:280:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):109:170 -> a
-    281:281:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):169:169 -> a
-    282:285:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):144:147 -> a
-    286:286:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    286:286:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):147 -> a
-    287:287:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):151:151 -> a
-    288:288:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    288:288:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):151 -> a
-    289:289:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    289:289:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):147 -> a
-    290:323:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):155:188 -> a
-    324:324:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    324:324:boolean lambda$identifyClassInlinerEligibility$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):170 -> a
-    325:325:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):496:496 -> a
-    326:342: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):499:515 -> a
-    343:401:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):527:585 -> a
-    402:441:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):546:585 -> a
-    442:454:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):573:585 -> a
-    455:455:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):596:596 -> a
-    456:460: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):599:603 -> a
-    461:476:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):679:694 -> a
-    461:476: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):605 -> a
-    477:496: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):606:625 -> a
-    497:502: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):624:629 -> a
-    503:510:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):713:720 -> a
-    503:510: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):629 -> a
-    511:531: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):630:650 -> a
-    532:534:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):702:704 -> a
-    535:546:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):771:782 -> a
-    547:558: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:53 -> a
-    547:558:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    559:559:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    559:559: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):53 -> a
-    559:559:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    560:563: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):54:57 -> a
-    560:563:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    564:564: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):539:539 -> a
-    564:564: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
-    564:564:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    565:573: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
-    565:573:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    574:574: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:59 -> a
-    574:574:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    575:575:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    575:575: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):53 -> a
-    575:575:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    576:589: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):72:85 -> a
-    576:589:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    590:645: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
-    590:645:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    646:646:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():32:32 -> a
-    646:646:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):784 -> a
-    647:648:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):785:786 -> a
-    649:649:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():28:28 -> a
-    649:649:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):787 -> a
-    650:650:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):788:788 -> a
-    651:651:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():32:32 -> a
-    651:651:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):784 -> a
-    652:655:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):793:796 -> a
-    656:664:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):815:823 -> a
-    656:664:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):796 -> a
-    665:669:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):804:808 -> a
-    670:670:boolean lambda$computeMayHaveSideEffects$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):805:805 -> a
-    1:24:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):271:294 -> b
-    25:25:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):394:394 -> b
-    25:25:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):294 -> b
-    26:26:boolean com.android.tools.r8.graph.DexClass.definesFinalizer(com.android.tools.r8.graph.DexItemFactory):801:801 -> b
-    26:26:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):394 -> b
-    26:26:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):294 -> b
-    27:100:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):398:471 -> b
-    27:100:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):294 -> b
-    101:161:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):307:367 -> b
-    101:161:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):295 -> b
-    162:223:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):313:374 -> b
-    162:223:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):295 -> b
-    224:224:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):291:291 -> b
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):67:70 -> <init>
+    1:57:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):109:165 -> a
+    58:101:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):140:183 -> a
+    102:105:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):445:448 -> a
+    106:112:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):447:453 -> a
+    113:113:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):452:452 -> a
+    114:114:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):465:465 -> a
+    115:131:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$0(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):468:484 -> a
+    132:190:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):496:554 -> a
+    191:230:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):515:554 -> a
+    231:243:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):542:554 -> a
+    244:244:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):565:565 -> a
+    245:249:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):568:572 -> a
+    250:265:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):648:663 -> a
+    250:265:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):574 -> a
+    266:285:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):575:594 -> a
+    286:291:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):593:598 -> a
+    292:299:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):682:689 -> a
+    292:299:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):598 -> a
+    300:320:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):599:619 -> a
+    321:323:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):671:673 -> a
+    324:332: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):701:709 -> a
+    333:333:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
+    333:333: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):709 -> a
+    334:341: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):712:719 -> a
+    342:348:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):726:732 -> a
+    349:349:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> a
+    349:349:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):727 -> a
+    350:350:boolean lambda$computeMayHaveSideEffects$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):774:774 -> a
+    351:382:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):847:878 -> a
+    383:428: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):900:945 -> a
+    383:428:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):879 -> a
+    429:434:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):885:890 -> a
+    1:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):216:255 -> b
+    41:52:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):740:751 -> b
+    53:62: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):41:50 -> b
+    53:62:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    63:63: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):50 -> b
+    63:63:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    64:67: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):51:54 -> b
+    64:67:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    68:68: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):539:539 -> b
+    68:68: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):55 -> b
+    68:68:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    69:77: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):55:63 -> b
+    69:77:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    78:78: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):56:56 -> b
+    78:78:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    79:79:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    79:79: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):50 -> b
+    79:79:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    80:93: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):69:82 -> b
+    80:93:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    94:149: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):75:130 -> b
+    94:149:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    150:150:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> b
+    150:150:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):753 -> b
+    151:152:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):754:755 -> b
+    153:153:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():27:27 -> b
+    153:153:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):756 -> b
+    154:154:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):757:757 -> b
+    155:155:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> b
+    155:155:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):753 -> b
+    156:159:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):762:765 -> b
+    160:168:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):784:792 -> b
+    160:168:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):765 -> b
+    169:173:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):773:777 -> b
+    1:17:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):261:277 -> c
+    18:87:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):371:440 -> c
+    18:87:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):277 -> c
+    88:144:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):290:346 -> c
+    88:144:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):278 -> c
+    145:202:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):296:353 -> c
+    145:202:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):278 -> c
+    203:203:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):274:274 -> c
+    204:226:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):820:842 -> c
+    1:7:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):807:813 -> d
+    8:8:com.android.tools.r8.graph.AppView com.android.tools.r8.graph.AppView.withLiveness():0:0 -> d
+    8:8:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):811 -> d
 com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.D.e.G0.h:
     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>():669:672 -> <clinit>
-    1:1:void <init>(java.lang.String,int):668:668 -> <init>
+    1:4:void <clinit>():638:641 -> <clinit>
+    1:1:void <init>(java.lang.String,int):637:637 -> <init>
 com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo -> com.android.tools.r8.D.e.G0.m:
     java.util.Map callSiteInfos -> b
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection cachedRepresentative -> c
@@ -38537,40 +38414,36 @@
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType(int):38:38 -> a
     1:1:int hashCode():43:43 -> hashCode
 com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.D.e.G0.n:
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicUpperBoundType -> e
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement dynamicLowerBoundType -> d
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicType -> d
     boolean cannotBeKept -> b
     boolean valueHasBeenPropagated -> c
     int readBits -> a
-    1:7:void <init>():21:27 -> <init>
+    1:6:void <init>():20:25 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
-    1:5:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):31:35 -> a
-    6:6:void joinReadBits(int):53:53 -> a
-    7:7:void setDynamicLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):71:71 -> a
-    8:8:void setDynamicUpperBoundType(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):80:80 -> a
-    1:1:boolean cannotBeKept():58:58 -> b
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():67:67 -> c
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType():76:76 -> d
-    1:1:int getReadBits():49:49 -> e
-    boolean isMutableFieldOptimizationInfo() -> g
-    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():41:41 -> h
-    2:2:boolean cannotBeKept():58:58 -> h
-    2:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():42 -> h
-    3:3:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():42:42 -> h
-    4:4:boolean valueHasBeenPropagated():85:85 -> h
-    4:4:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():43 -> h
-    5:5:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():43:43 -> h
-    1:1:boolean valueHasBeenPropagated():85:85 -> i
-    1:1:void markAsPropagated():89:89 -> j
-    1:1:void markCannotBeKept():62:62 -> k
+    1:2:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):29:30 -> a
+    3:3:void joinReadBits(int):48:48 -> a
+    4:4:void setDynamicType(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):66:66 -> a
+    1:1:boolean cannotBeKept():53:53 -> b
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType():62:62 -> c
+    1:1:int getReadBits():44:44 -> d
+    boolean isMutableFieldOptimizationInfo() -> f
+    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():36:36 -> g
+    2:2:boolean cannotBeKept():53:53 -> g
+    2:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():37 -> g
+    3:3:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():37:37 -> g
+    4:4:boolean valueHasBeenPropagated():71:71 -> g
+    4:4:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():38 -> g
+    5:5:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():38:38 -> g
+    1:1:boolean valueHasBeenPropagated():71:71 -> h
+    1:1:void markAsPropagated():75:75 -> i
+    1:1:void markCannotBeKept():57:57 -> j
 com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.D.e.G0.p:
     1:1:void <init>():20:20 -> <init>
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void com.android.tools.r8.ir.conversion.FieldOptimizationFeedback.markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField) -> a
     void com.android.tools.r8.ir.conversion.FieldOptimizationFeedback.markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
-    void com.android.tools.r8.ir.conversion.FieldOptimizationFeedback.markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement) -> a
-    void com.android.tools.r8.ir.conversion.FieldOptimizationFeedback.markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
+    void com.android.tools.r8.ir.conversion.FieldOptimizationFeedback.markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
     void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
@@ -38611,46 +38484,44 @@
     java.util.Map fieldOptimizationInfos -> a
     java.util.Map methodOptimizationInfos -> b
     java.util.Map processed -> c
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:8:void <init>():26:33 -> <init>
-    1:2:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):61:62 -> a
-    3:3:boolean lambda$updateVisibleOptimizationInfo$0(java.util.Map$Entry):70:70 -> a
-    4:9:boolean noUpdatesLeft():87:92 -> a
-    10:10:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):105:105 -> a
-    11:11:void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):111:111 -> a
-    12:12:void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):116:116 -> a
-    13:13:void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int):121:121 -> a
-    14:15:void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):144:145 -> a
-    16:16:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):150:150 -> a
-    17:17:void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long):155:155 -> a
-    18:18:void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):160:160 -> a
-    19:19:void methodReturnsObjectOfType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):166:166 -> a
-    20:20:void methodReturnsObjectWithLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):172:172 -> a
-    21:21:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):202:202 -> a
-    22:22:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):213:213 -> a
-    23:23:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):225:225 -> a
-    24:24:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):230:230 -> a
-    25:25:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):241:241 -> a
-    26:26:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):251:251 -> a
-    27:27:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):256:256 -> a
-    1:2:void updateVisibleOptimizationInfo():69:70 -> b
-    3:17:void updateVisibleOptimizationInfo():69:83 -> b
-    18:18:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):71:71 -> b
-    19:19:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):100:100 -> b
-    20:20:void markForceInline(com.android.tools.r8.graph.DexEncodedMethod):128:128 -> b
-    21:21:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):219:219 -> b
-    22:22:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):246:246 -> b
-    1:6:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getFieldOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedField):37:42 -> c
-    7:7:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):133:133 -> c
-    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):138:138 -> d
-    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):207:207 -> e
-    1:1:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):187:187 -> f
-    1:1:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):182:182 -> g
-    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):177:177 -> h
-    1:1:void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod):192:192 -> i
-    1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):235:235 -> j
-    1:6:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):48:53 -> k
+    1:8:void <init>():25:32 -> <init>
+    1:2:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):60:61 -> a
+    3:4:void updateVisibleOptimizationInfo():68:69 -> a
+    5:19:void updateVisibleOptimizationInfo():68:82 -> a
+    20:20:boolean lambda$updateVisibleOptimizationInfo$0(java.util.Map$Entry):69:69 -> a
+    21:21:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):94:94 -> a
+    22:22:void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):99:99 -> a
+    23:23:void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int):104:104 -> a
+    24:25:void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):127:128 -> a
+    26:26:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):133:133 -> a
+    27:27:void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long):138:138 -> a
+    28:28:void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):143:143 -> a
+    29:29:void methodReturnsObjectOfType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):149:149 -> a
+    30:30:void methodReturnsObjectWithLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):155:155 -> a
+    31:31:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):185:185 -> a
+    32:32:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):196:196 -> a
+    33:33:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):208:208 -> a
+    34:34:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):213:213 -> a
+    35:35:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):224:224 -> a
+    36:36:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):234:234 -> a
+    37:37:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):239:239 -> a
+    1:1:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):70:70 -> b
+    2:2:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):89:89 -> b
+    3:3:void markForceInline(com.android.tools.r8.graph.DexEncodedMethod):111:111 -> b
+    4:4:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):202:202 -> b
+    5:5:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):229:229 -> b
+    1:6:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getFieldOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedField):36:41 -> c
+    7:7:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):116:116 -> c
+    8:8:void com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo.markInlinedIntoSingleCallSite():0:0 -> c
+    8:8:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):116 -> c
+    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):121:121 -> d
+    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):190:190 -> e
+    1:1:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):170:170 -> f
+    1:1:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):165:165 -> g
+    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):160:160 -> h
+    1:1:void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> i
+    1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):218:218 -> j
+    1:6:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):47:52 -> k
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.D.e.G0.s:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
@@ -38659,8 +38530,7 @@
     void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField) -> a
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
-    void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement) -> a
-    void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
+    void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
     void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
@@ -38694,8 +38564,7 @@
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
-    void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement) -> a
-    void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
+    void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
     void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int) -> a
     void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long) -> a
@@ -38708,46 +38577,39 @@
     void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer) -> a
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple getInstance():27:27 -> a
     2:2:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):39:39 -> a
-    3:3:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):136:136 -> a
+    3:3:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):130:130 -> a
     void markForceInline(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
     void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> b
     1:1:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):34:34 -> b
-    1:1:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):67:67 -> c
-    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> d
-    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):141:141 -> e
+    1:1:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):61:61 -> c
+    2:2:void com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo.markInlinedIntoSingleCallSite():0:0 -> c
+    2:2:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):61 -> c
+    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):66:66 -> d
+    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):135:135 -> e
     void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> f
     void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> g
     void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> h
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> i
-    1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):167:167 -> j
+    1:1:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):161:161 -> j
 com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.D.e.G0.w:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> a
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:5:void <init>(java.util.List):32:36 -> <init>
-    6:6:void <init>(java.util.List):35:35 -> <init>
-    1:1:java.lang.Integer lambda$new$0(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage):36:36 -> a
-    2:3:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsage(int):40:41 -> a
-    1:2:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):49:50 -> b
-    3:3:java.lang.Object com.android.tools.r8.utils.ListUtils.last(java.util.List):20:20 -> b
-    3:3:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):50 -> b
-    4:8:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):50:54 -> b
-    9:10:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage.copyAndShift(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,int):109:110 -> b
-    9:10:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):55 -> b
-    11:24:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):55:68 -> b
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:5:void <init>(java.util.List):31:35 -> <init>
+    6:6:void <init>(java.util.List):34:34 -> <init>
+    1:1:java.lang.Integer lambda$new$0(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage):35:35 -> a
+    2:3:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsage(int):39:40 -> a
 com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.D.e.G0.u:
     java.util.List callsReceiver -> c
     boolean hasFieldRead -> e
     boolean isAssignedToField -> f
     boolean isReturned -> g
-    boolean $assertionsDisabled -> h
     java.util.Set ifZeroTest -> b
     int index -> a
     boolean hasFieldAssignment -> d
-    1:1:void <clinit>():71:71 -> <clinit>
-    1:10:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean):96:105 -> <init>
-    1:1:boolean notUsed():121:121 -> a
+    1:10:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean):72:81 -> <init>
+    1:1:boolean notUsed():85:85 -> a
 com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.D.e.G0.v:
     boolean $assertionsDisabled -> i
     java.util.Set ifZeroTestTypes -> c
@@ -38758,195 +38620,143 @@
     boolean isAssignedToField -> g
     boolean isReturned -> h
     int index -> a
-    1:1:void <clinit>():130:130 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,int):142:142 -> <init>
-    2:12:void <init>(com.android.tools.r8.ir.code.Value,int):134:144 -> <init>
-    1:6:boolean note(com.android.tools.r8.ir.code.Instruction):149:154 -> a
-    7:9:boolean note(com.android.tools.r8.ir.code.If):183:185 -> a
-    7:9:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    10:10:boolean note(com.android.tools.r8.ir.code.If):185 -> a
-    10:10:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    11:11:boolean note(com.android.tools.r8.ir.code.If):185:185 -> a
-    11:11:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    12:12:boolean note(com.android.tools.r8.ir.code.If):185 -> a
-    12:12:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    13:15:boolean note(com.android.tools.r8.ir.code.If):184:186 -> a
-    13:15:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    16:16:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.code.If.asIf():0:0 -> a
-    16:16:boolean note(com.android.tools.r8.ir.code.If):183 -> a
-    16:16:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    17:18:boolean note(com.android.tools.r8.ir.code.Instruction):156:157 -> a
-    19:20:boolean note(com.android.tools.r8.ir.code.InstanceGet):193:194 -> a
-    19:20:boolean note(com.android.tools.r8.ir.code.Instruction):157 -> a
-    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    21:21:boolean note(com.android.tools.r8.ir.code.InstanceGet):194 -> a
-    21:21:boolean note(com.android.tools.r8.ir.code.Instruction):157 -> a
-    22:23:boolean note(com.android.tools.r8.ir.code.InstanceGet):194:195 -> a
-    22:23:boolean note(com.android.tools.r8.ir.code.Instruction):157 -> a
-    24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    24:24:boolean note(com.android.tools.r8.ir.code.InstanceGet):194 -> a
-    24:24:boolean note(com.android.tools.r8.ir.code.Instruction):157 -> a
-    25:26:boolean note(com.android.tools.r8.ir.code.Instruction):159:160 -> a
-    27:28:boolean note(com.android.tools.r8.ir.code.InstancePut):202:203 -> a
-    27:28:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    29:29:boolean note(com.android.tools.r8.ir.code.InstancePut):203 -> a
-    29:29:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    30:32:boolean note(com.android.tools.r8.ir.code.InstancePut):203:205 -> a
-    30:32:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    33:33:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    33:33:boolean note(com.android.tools.r8.ir.code.InstancePut):205 -> a
-    33:33:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    34:34:boolean note(com.android.tools.r8.ir.code.InstancePut):205:205 -> a
-    34:34:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    35:35:boolean note(com.android.tools.r8.ir.code.InstancePut):205 -> a
-    35:35:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    36:36:boolean note(com.android.tools.r8.ir.code.InstancePut):208:208 -> a
-    36:36:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    37:37:boolean note(com.android.tools.r8.ir.code.InstancePut):208 -> a
-    37:37:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    38:39:boolean note(com.android.tools.r8.ir.code.InstancePut):208:209 -> a
-    38:39:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    40:40:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    40:40:boolean note(com.android.tools.r8.ir.code.InstancePut):208 -> a
-    40:40:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    41:41:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    41:41:boolean note(com.android.tools.r8.ir.code.InstancePut):203 -> a
-    41:41:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    42:46:boolean note(com.android.tools.r8.ir.code.Instruction):162:166 -> a
-    47:48:boolean note(com.android.tools.r8.ir.code.Return):228:229 -> a
-    47:48:boolean note(com.android.tools.r8.ir.code.Instruction):166 -> a
-    49:49:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    49:49:boolean note(com.android.tools.r8.ir.code.Return):229 -> a
-    49:49:boolean note(com.android.tools.r8.ir.code.Instruction):166 -> a
-    50:50:boolean note(com.android.tools.r8.ir.code.Return):229:229 -> a
-    50:50:boolean note(com.android.tools.r8.ir.code.Instruction):166 -> a
-    51:51:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    51:51:boolean note(com.android.tools.r8.ir.code.Return):229 -> a
-    51:51:boolean note(com.android.tools.r8.ir.code.Instruction):166 -> a
-    52:54:boolean note(com.android.tools.r8.ir.code.Return):228:230 -> a
-    52:54:boolean note(com.android.tools.r8.ir.code.Instruction):166 -> a
-    55:55:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage build():172:172 -> a
-    56:56:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):217:217 -> a
-    57:62:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):216:221 -> a
-    63:63:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):218:218 -> a
-    64:64:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    64:64:boolean lambda$note$0(com.android.tools.r8.ir.code.Value):217 -> a
-    65:65:boolean lambda$note$0(com.android.tools.r8.ir.code.Value):217:217 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    66:66:boolean lambda$note$0(com.android.tools.r8.ir.code.Value):217 -> a
+    1:1:void <clinit>():94:94 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,int):106:106 -> <init>
+    2:12:void <init>(com.android.tools.r8.ir.code.Value,int):98:108 -> <init>
+    1:2:boolean note(com.android.tools.r8.ir.code.Instruction):113:114 -> a
+    3:5:boolean note(com.android.tools.r8.ir.code.If):143:145 -> a
+    3:5:boolean note(com.android.tools.r8.ir.code.Instruction):114 -> a
+    6:6:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.code.If.asIf():0:0 -> a
+    6:6:boolean note(com.android.tools.r8.ir.code.If):143 -> a
+    6:6:boolean note(com.android.tools.r8.ir.code.Instruction):114 -> a
+    7:8:boolean note(com.android.tools.r8.ir.code.Instruction):116:117 -> a
+    9:11:boolean note(com.android.tools.r8.ir.code.InstanceGet):152:154 -> a
+    9:11:boolean note(com.android.tools.r8.ir.code.Instruction):117 -> a
+    12:13:boolean note(com.android.tools.r8.ir.code.Instruction):119:120 -> a
+    14:21:boolean note(com.android.tools.r8.ir.code.InstancePut):161:168 -> a
+    14:21:boolean note(com.android.tools.r8.ir.code.Instruction):120 -> a
+    22:23:boolean note(com.android.tools.r8.ir.code.Instruction):122:123 -> a
+    24:28:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):175:179 -> a
+    24:28:boolean note(com.android.tools.r8.ir.code.Instruction):123 -> a
+    29:29:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):176:176 -> a
+    29:29:boolean note(com.android.tools.r8.ir.code.Instruction):123 -> a
+    30:31:boolean note(com.android.tools.r8.ir.code.Instruction):125:126 -> a
+    32:33:boolean note(com.android.tools.r8.ir.code.Return):186:187 -> a
+    32:33:boolean note(com.android.tools.r8.ir.code.Instruction):126 -> a
+    34:34:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage build():132:132 -> a
 com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.D.e.G0.x:
-    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer trivialInitializerInfo -> u
-    long returnedConstantNumber -> k
-    boolean neverReturnsNormally -> i
-    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference inlining -> p
-    boolean useIdentifierNameString -> q
-    boolean triggersClassInitBeforeAnySideEffect -> s
-    java.util.BitSet nonNullParamOnNormalExits -> y
-    boolean mayHaveSideEffects -> f
-    boolean neverReturnsNull -> h
-    boolean returnValueHasBeenPropagated -> A
+    boolean returnsConstantNumber -> i
+    boolean returnsConstantString -> k
+    boolean initializerEnablingJavaAssertions -> u
+    int returnedArgument -> d
+    boolean checksNullReceiverBeforeAnySideEffect -> q
+    java.util.BitSet nonNullParamOrThrow -> w
+    java.util.Set initializedClassesOnNormalExit -> c
+    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility classInlinerEligibility -> s
+    boolean reachabilitySensitive -> y
+    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement returnsObjectWithLowerBoundType -> n
+    boolean returnValueOnlyDependsOnArguments -> f
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement returnsObjectOfType -> m
+    boolean neverReturnsNormally -> h
+    boolean $assertionsDisabled -> A
+    com.android.tools.r8.graph.DexString returnedConstantString -> l
     boolean classInitializerMayBePostponed -> b
-    boolean returnsConstantNumber -> j
-    boolean returnsConstantString -> l
-    boolean initializerEnablingJavaAssertions -> v
-    int returnedArgument -> e
-    boolean checksNullReceiverBeforeAnySideEffect -> r
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement returnsObjectWithLowerBoundType -> o
-    com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo parametersUsages -> w
-    java.util.BitSet nonNullParamOrThrow -> x
-    java.util.Set initializedClassesOnNormalExit -> d
-    boolean reachabilitySensitive -> z
-    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility classInlinerEligibility -> t
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement returnsObjectOfType -> n
-    boolean returnValueOnlyDependsOnArguments -> g
+    com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo parametersUsages -> v
+    long returnedConstantNumber -> j
+    boolean useIdentifierNameString -> p
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference inlining -> o
+    boolean triggersClassInitBeforeAnySideEffect -> r
+    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer trivialInitializerInfo -> t
+    java.util.BitSet nonNullParamOnNormalExits -> x
+    boolean returnValueHasBeenPropagated -> z
+    boolean mayHaveSideEffects -> e
+    boolean neverReturnsNull -> g
     boolean cannotBeKept -> a
-    boolean $assertionsDisabled -> B
-    com.android.tools.r8.graph.DexString returnedConstantString -> m
-    boolean hasBeenInlinedIntoSingleCallSite -> c
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:1:void <init>():81:81 -> <init>
-    2:59:void <init>():22:79 -> <init>
-    60:60:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):87:87 -> <init>
-    61:153:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):22:114 -> <init>
-    1:2:long getReturnedConstantNumber():255:256 -> A
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():250:250 -> B
-    1:1:java.util.Set getInitializedClassesOnNormalExit():174:174 -> C
-    1:1:boolean isInitializerEnablingJavaAssertions():267:267 -> D
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():179:179 -> E
-    1:1:java.util.BitSet getNonNullParamOrThrow():189:189 -> F
-    1:54:void adjustOptimizationInfoAfterRemovingThisParameter():455:508 -> G
-    1:1:void markAsPropagated():438:438 -> H
-    1:1:void markCannotBeKept():150:150 -> I
-    1:1:void markClassInitializerMayBePostponed():159:159 -> J
-    1:2:void markForceInline():405:406 -> K
-    1:1:void markInlinedIntoSingleCallSite():203:203 -> L
-    1:1:void markMayNotHaveSideEffects():344:344 -> M
-    1:2:void markNeverInline():419:420 -> N
-    1:1:void markNeverReturnsNormally():356:356 -> O
-    1:1:void markNeverReturnsNull():352:352 -> P
-    1:1:void markReturnValueOnlyDependsOnArguments():348:348 -> Q
-    1:1:void markUseIdentifierNameString():425:425 -> R
-    1:1:void setInitializerEnablingJavaAssertions():330:330 -> S
-    1:6:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):119:124 -> a
-    7:7:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):184:184 -> a
-    8:8:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):306:306 -> a
-    9:9:void setNonNullParamOnNormalExits(java.util.BitSet):314:314 -> a
-    10:10:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):322:322 -> a
-    11:11:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):326:326 -> a
-    12:12:void markInitializesClassesOnNormalExit(java.util.Set):334:334 -> a
-    13:17:void markReturnsConstantNumber(long):360:364 -> a
-    18:22:void markReturnsConstantString(com.android.tools.r8.graph.DexString):368:372 -> a
-    23:32:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):376:385 -> a
-    33:36:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):384:387 -> a
-    37:43:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):391:397 -> a
-    44:49:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):394:399 -> a
-    50:50:void markCheckNullReceiverBeforeAnySideEffect(boolean):429:429 -> a
-    51:52:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():448:449 -> a
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():194:194 -> b
-    2:2:void setNonNullParamOrThrow(java.util.BitSet):310:310 -> b
-    3:5:void markReturnsArgument(int):338:340 -> b
-    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):433:433 -> b
-    1:1:boolean cannotBeKept():145:145 -> c
-    2:2:void setReachabilitySensitive(boolean):318:318 -> c
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():287:287 -> d
-    1:1:boolean returnValueHasBeenPropagated():443:443 -> e
-    1:1:boolean classInitializerMayBePostponed():155:155 -> f
-    1:2:int getReturnedArgument():218:219 -> g
-    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():261:262 -> h
-    1:1:boolean returnValueOnlyDependsOnArguments():302:302 -> i
-    1:1:boolean neverInline():282:282 -> j
-    1:1:boolean neverReturnsNormally():229:229 -> k
-    1:2:boolean returnsConstant():234:235 -> l
-    1:1:boolean returnsConstantString():245:245 -> m
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicReturnType():164:164 -> n
-    1:1:boolean useIdentifierNameString():272:272 -> o
-    1:1:boolean triggersClassInitBeforeAnySideEffect():292:292 -> p
-    1:1:boolean returnsConstantNumber():240:240 -> q
-    1:1:boolean returnsArgument():213:213 -> r
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>():83:83 -> <init>
+    2:58:void <init>():25:81 -> <init>
+    59:59:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):87:87 -> <init>
+    60:143:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):25:108 -> <init>
+    1:2:long getReturnedConstantNumber():249:250 -> A
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():244:244 -> B
+    1:1:java.util.Set getInitializedClassesOnNormalExit():168:168 -> C
+    1:1:boolean isInitializerEnablingJavaAssertions():261:261 -> D
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():173:173 -> E
+    1:1:java.util.BitSet getNonNullParamOrThrow():183:183 -> F
+    1:41:void adjustOptimizationInfoAfterRemovingThisParameter():444:484 -> G
+    1:1:void markAsPropagated():427:427 -> H
+    1:1:void markCannotBeKept():144:144 -> I
+    1:1:void markClassInitializerMayBePostponed():153:153 -> J
+    1:2:void markForceInline():394:395 -> K
+    1:1:void markMayNotHaveSideEffects():338:338 -> L
+    1:2:void markNeverInline():408:409 -> M
+    1:1:void markNeverReturnsNormally():350:350 -> N
+    1:1:void markNeverReturnsNull():346:346 -> O
+    1:1:void markReturnValueOnlyDependsOnArguments():342:342 -> P
+    1:1:void markUseIdentifierNameString():414:414 -> Q
+    1:1:void setInitializerEnablingJavaAssertions():324:324 -> R
+    1:6:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):113:118 -> a
+    7:7:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):178:178 -> a
+    8:8:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):300:300 -> a
+    9:9:void setNonNullParamOnNormalExits(java.util.BitSet):308:308 -> a
+    10:10:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):316:316 -> a
+    11:11:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):320:320 -> a
+    12:12:void markInitializesClassesOnNormalExit(java.util.Set):328:328 -> a
+    13:17:void markReturnsConstantNumber(long):354:358 -> a
+    18:22:void markReturnsConstantString(com.android.tools.r8.graph.DexString):362:366 -> a
+    23:29:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):370:376 -> a
+    30:36:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):380:386 -> a
+    37:42:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):383:388 -> a
+    43:43:void markCheckNullReceiverBeforeAnySideEffect(boolean):418:418 -> a
+    44:45:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():437:438 -> a
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():188:188 -> b
+    2:2:void setNonNullParamOrThrow(java.util.BitSet):304:304 -> b
+    3:5:void markReturnsArgument(int):332:334 -> b
+    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):422:422 -> b
+    1:1:boolean cannotBeKept():139:139 -> c
+    2:2:void setReachabilitySensitive(boolean):312:312 -> c
+    1:1:boolean checksNullReceiverBeforeAnySideEffect():281:281 -> d
+    1:1:boolean returnValueHasBeenPropagated():432:432 -> e
+    1:1:boolean classInitializerMayBePostponed():149:149 -> f
+    1:2:int getReturnedArgument():212:213 -> g
+    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():255:256 -> h
+    1:1:boolean returnValueOnlyDependsOnArguments():296:296 -> i
+    1:1:boolean neverInline():276:276 -> j
+    1:1:boolean neverReturnsNormally():223:223 -> k
+    1:2:boolean returnsConstant():228:229 -> l
+    1:1:boolean returnsConstantString():239:239 -> m
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicReturnType():158:158 -> n
+    1:1:boolean useIdentifierNameString():266:266 -> o
+    1:1:boolean triggersClassInitBeforeAnySideEffect():286:286 -> p
+    1:1:boolean returnsConstantNumber():234:234 -> q
+    1:1:boolean returnsArgument():207:207 -> r
     boolean isUpdatableMethodOptimizationInfo() -> s
-    1:1:boolean neverReturnsNull():224:224 -> t
-    1:1:boolean isReachabilitySensitive():208:208 -> u
+    1:1:boolean neverReturnsNull():218:218 -> t
+    1:1:boolean isReachabilitySensitive():202:202 -> u
     com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> v
-    1:1:boolean forceInline():277:277 -> w
+    1:1:boolean forceInline():271:271 -> w
     boolean isDefaultMethodOptimizationInfo() -> x
-    1:1:boolean mayHaveSideEffects():297:297 -> y
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():169:169 -> z
+    1:1:boolean mayHaveSideEffects():291:291 -> y
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():163:163 -> z
 com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.D.e.H0.a:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:3:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):20:22 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     4:4:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):22 -> a
     5:5:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):23:23 -> a
-    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     6:6:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):22 -> a
-    7:11:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:36 -> a
-    12:12:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):34:34 -> a
+    7:7:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:32 -> a
+    8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    8:8:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():243 -> a
+    8:8:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32 -> a
+    9:9:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:32 -> a
+    10:10:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    10:10:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():243 -> a
+    10:10:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32 -> a
+    11:14:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):33:36 -> a
+    15:15: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.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.H0.b:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -38963,9 +38773,8 @@
     void reportCallerNotSameNest() -> c
     void reportWillExceedInstructionBudget(int,int) -> c
     void reportCallerNotSamePackage() -> d
-    void reportWillExceedMaxInliningDepth(int,int) -> d
+    void reportWillExceedMonitorEnterValuesBudget(int,int) -> d
     void reportCallerNotSubtype() -> e
-    void reportWillExceedMonitorEnterValuesBudget(int,int) -> e
     void reportClasspathMethod() -> f
     void reportInaccessible() -> g
     void reportInlineeDoesNotHaveCode() -> h
@@ -38986,7 +38795,7 @@
     void reportReceiverMaybeNull() -> w
     void reportRecursiveMethod() -> x
     void reportUnknownTarget() -> y
-    boolean unsetReasonHasBeenReportedFlag() -> z
+    boolean verifyReasonHasBeenReported() -> z
 com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.D.e.H0.c:
     1:1:void <init>():18:18 -> <init>
     void reportBlacklisted() -> a
@@ -39002,9 +38811,8 @@
     void reportCallerNotSameNest() -> c
     void reportWillExceedInstructionBudget(int,int) -> c
     void reportCallerNotSamePackage() -> d
-    void reportWillExceedMaxInliningDepth(int,int) -> d
+    void reportWillExceedMonitorEnterValuesBudget(int,int) -> d
     void reportCallerNotSubtype() -> e
-    void reportWillExceedMonitorEnterValuesBudget(int,int) -> e
     void reportClasspathMethod() -> f
     void reportInaccessible() -> g
     void reportInlineeDoesNotHaveCode() -> h
@@ -39025,7 +38833,7 @@
     void reportReceiverMaybeNull() -> w
     void reportRecursiveMethod() -> x
     void reportUnknownTarget() -> y
-    boolean unsetReasonHasBeenReportedFlag() -> z
+    boolean verifyReasonHasBeenReported() -> z
 com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.D.e.H0.d:
     com.android.tools.r8.graph.DexEncodedMethod callee -> a
     boolean $assertionsDisabled -> e
@@ -39051,9 +38859,8 @@
     1:1:void reportCallerNotSameNest():62:62 -> c
     2:2:void reportWillExceedInstructionBudget(int,int):242:242 -> c
     1:1:void reportCallerNotSamePackage():67:67 -> d
-    2:2:void reportWillExceedMaxInliningDepth(int,int):251:251 -> d
+    2:2:void reportWillExceedMonitorEnterValuesBudget(int,int):252:252 -> d
     1:1:void reportCallerNotSubtype():74:74 -> e
-    2:2:void reportWillExceedMonitorEnterValuesBudget(int,int):261:261 -> e
     1:1:void reportClasspathMethod():82:82 -> f
     1:1:void reportInaccessible():87:87 -> g
     1:1:void reportInlineeDoesNotHaveCode():102:102 -> h
@@ -39074,7 +38881,7 @@
     1:1:void reportReceiverMaybeNull():204:204 -> w
     1:1:void reportRecursiveMethod():209:209 -> x
     1:1:void reportUnknownTarget():214:214 -> y
-    1:2:boolean unsetReasonHasBeenReportedFlag():270:271 -> z
+    1:1:boolean verifyReasonHasBeenReported():261:261 -> z
 com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.D.e.I0.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
@@ -39099,84 +38906,56 @@
 com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.D.e.I0.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.graph.DexEncodedMethod context -> j
+    com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy NoOp -> j
+    boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.IRCode code -> g
     com.android.tools.r8.ir.code.InstructionListIterator instructions -> i
-    com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy NoOp -> k
-    boolean $assertionsDisabled -> l
     java.util.function.Function strategyProvider -> d
     com.android.tools.r8.kotlin.Kotlin kotlin -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaChecker -> e
     java.util.ListIterator blocks -> h
     com.android.tools.r8.graph.DexEncodedMethod method -> f
-    1:29:void <clinit>():47:75 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):160:160 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):169:178 -> <init>
+    1:29:void <clinit>():46:74 -> <clinit>
+    1:9:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):155:163 -> <init>
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut) -> a
-    1:2:com.android.tools.r8.ir.code.InstructionListIterator instructions():182:183 -> a
-    3:3:boolean shouldRewrite(com.android.tools.r8.graph.DexType):206:206 -> a
-    4:23:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):211:230 -> a
-    4:23:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):47 -> a
-    24:24:boolean shouldRewrite(com.android.tools.r8.graph.DexMethod):201:201 -> a
-    24:24:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):230 -> a
-    24:24:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):47 -> a
-    25:34:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):231:240 -> a
-    25:34:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):47 -> a
-    35:39:java.lang.Void visit(com.android.tools.r8.ir.code.NewInstance):246:250 -> a
-    35:39:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):47 -> a
-    40:40:java.lang.Void visit(com.android.tools.r8.ir.code.CheckCast):258:258 -> a
-    40:40:java.lang.Object visit(com.android.tools.r8.ir.code.CheckCast):47 -> a
-    41:41:java.lang.Void visit(com.android.tools.r8.ir.code.NewArrayEmpty):264:264 -> a
-    41:41:java.lang.Object visit(com.android.tools.r8.ir.code.NewArrayEmpty):47 -> a
-    42:42:java.lang.Void visit(com.android.tools.r8.ir.code.ConstClass):270:270 -> a
-    42:42:java.lang.Object visit(com.android.tools.r8.ir.code.ConstClass):47 -> a
-    43:43:java.lang.Void visit(com.android.tools.r8.ir.code.ConstMethodType):276:276 -> a
-    43:43:java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodType):47 -> a
-    44:44:java.lang.Void visit(com.android.tools.r8.ir.code.ConstMethodHandle):282:282 -> a
-    44:44:java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodHandle):47 -> a
-    45:47:java.lang.Void visit(com.android.tools.r8.ir.code.InstanceGet):288:290 -> a
-    45:47:java.lang.Object visit(com.android.tools.r8.ir.code.InstanceGet):47 -> a
-    48:48:boolean shouldRewrite(com.android.tools.r8.graph.DexField):197:197 -> a
-    48:48:java.lang.Void visit(com.android.tools.r8.ir.code.InstanceGet):291 -> a
-    48:48:java.lang.Object visit(com.android.tools.r8.ir.code.InstanceGet):47 -> a
-    49:57:java.lang.Void visit(com.android.tools.r8.ir.code.InstanceGet):293:301 -> a
-    49:57:java.lang.Object visit(com.android.tools.r8.ir.code.InstanceGet):47 -> a
-    58:60:java.lang.Void visit(com.android.tools.r8.ir.code.InstancePut):307:309 -> a
-    58:60:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):47 -> a
-    61:61:boolean shouldRewrite(com.android.tools.r8.graph.DexField):197:197 -> a
-    61:61:java.lang.Void visit(com.android.tools.r8.ir.code.InstancePut):310 -> a
-    61:61:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):47 -> a
-    62:70:java.lang.Void visit(com.android.tools.r8.ir.code.InstancePut):312:320 -> a
-    62:70:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):47 -> a
-    71:73:java.lang.Void visit(com.android.tools.r8.ir.code.StaticGet):326:328 -> a
-    71:73:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):47 -> a
-    74:74:boolean shouldRewrite(com.android.tools.r8.graph.DexField):197:197 -> a
-    74:74:java.lang.Void visit(com.android.tools.r8.ir.code.StaticGet):329 -> a
-    74:74:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):47 -> a
-    75:79:java.lang.Void visit(com.android.tools.r8.ir.code.StaticGet):331:335 -> a
-    75:79:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):47 -> a
-    80:82:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):342:344 -> a
-    80:82:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):47 -> a
-    83:83:boolean shouldRewrite(com.android.tools.r8.graph.DexField):197:197 -> a
-    83:83:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):345 -> a
-    83:83:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):47 -> a
-    84:88:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):347:351 -> a
-    84:88:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):47 -> a
-    1:5:void processCode():187:191 -> b
+    1:2:com.android.tools.r8.ir.code.InstructionListIterator instructions():167:168 -> a
+    3:32:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):183:212 -> a
+    3:32:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):46 -> a
+    33:37:java.lang.Void visit(com.android.tools.r8.ir.code.NewInstance):218:222 -> a
+    33:37:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):46 -> a
+    38:38:java.lang.Void visit(com.android.tools.r8.ir.code.CheckCast):230:230 -> a
+    38:38:java.lang.Object visit(com.android.tools.r8.ir.code.CheckCast):46 -> a
+    39:39:java.lang.Void visit(com.android.tools.r8.ir.code.NewArrayEmpty):236:236 -> a
+    39:39:java.lang.Object visit(com.android.tools.r8.ir.code.NewArrayEmpty):46 -> a
+    40:40:java.lang.Void visit(com.android.tools.r8.ir.code.ConstClass):242:242 -> a
+    40:40:java.lang.Object visit(com.android.tools.r8.ir.code.ConstClass):46 -> a
+    41:41:java.lang.Void visit(com.android.tools.r8.ir.code.ConstMethodType):248:248 -> a
+    41:41:java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodType):46 -> a
+    42:42:java.lang.Void visit(com.android.tools.r8.ir.code.ConstMethodHandle):254:254 -> a
+    42:42:java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodHandle):46 -> a
+    43:56:java.lang.Void visit(com.android.tools.r8.ir.code.InstanceGet):260:273 -> a
+    43:56:java.lang.Object visit(com.android.tools.r8.ir.code.InstanceGet):46 -> a
+    57:70:java.lang.Void visit(com.android.tools.r8.ir.code.InstancePut):279:292 -> a
+    57:70:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):46 -> a
+    71:80:java.lang.Void visit(com.android.tools.r8.ir.code.StaticGet):298:307 -> a
+    71:80:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):46 -> a
+    81:90:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):314:323 -> a
+    81:90:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):46 -> a
+    1:5:void processCode():172:176 -> b
 com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.D.e.I0.b:
-    1:1:void <init>():76:76 -> <init>
+    1:1:void <init>():75:75 -> <init>
     boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
     boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
-    1:1:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):114:114 -> a
-    2:2:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):119:119 -> a
-    3:3:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InstanceGet):124:124 -> a
-    4:4:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):129:129 -> a
+    1:1:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):113:113 -> a
+    2:2:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):118:118 -> a
+    3:3:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InstanceGet):123:123 -> a
+    4:4:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):128:128 -> a
     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
@@ -39216,7 +38995,7 @@
     11:24:java.lang.String createHash(java.util.List):182:195 -> b
     11:24:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):174 -> b
     25:25:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):174:174 -> b
-    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
+    26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     26:26:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):173 -> b
     27:29:com.android.tools.r8.graph.DexProgramClass synthesizeClass(com.android.tools.r8.graph.DexItemFactory):173:175 -> b
     30:30:java.lang.String createHash(java.util.List):197:197 -> b
@@ -39258,7 +39037,7 @@
     23:23:com.android.tools.r8.graph.DexProgramClass synthesizeClass():55 -> k
 com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.D.e.I0.i:
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup() -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.D.e.I0.q:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.D.e.I0.n:
     java.util.Map lambdas -> a
     java.util.Map groups -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> g
@@ -39267,136 +39046,119 @@
     java.util.Set methodsToReprocess -> d
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.AppView appView -> e
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode mode -> i
     com.android.tools.r8.DiagnosticsHandler reporter -> h
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaInvalidator -> j
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaChecker -> k
-    1:1:void <clinit>():85:85 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):159:159 -> <init>
-    2:44:void <init>(com.android.tools.r8.graph.AppView):125:167 -> <init>
+    java.util.function.BiFunction strategyFactory -> i
+    1:1:void <clinit>():86:86 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):123:123 -> <init>
+    2:44:void <init>(com.android.tools.r8.graph.AppView):89:131 -> <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):85 -> a
-    2:2:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):182:182 -> a
-    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):475 -> 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):85 -> a
-    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):476:476 -> 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):85 -> a
-    4:4:com.android.tools.r8.graph.AppView access$400(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):85:85 -> a
-    5:5:void invalidateLambda(com.android.tools.r8.graph.DexType):174:174 -> a
-    6:6:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):186:186 -> a
-    6:6:void access$600(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):85 -> a
-    7:40:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication):194:227 -> a
-    41:41:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):202:202 -> a
-    42:43:void analyzeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241:242 -> a
-    44:45:void rewriteCodeForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):268:269 -> a
-    46:55:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):280:289 -> a
-    56:76:java.util.Map finalizeLambdaGroups():380:400 -> a
-    56:76:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):293 -> a
-    77:112:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):296:331 -> a
-    113:127:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):330:344 -> a
-    128:128:void lambda$applyLambdaClassMapping$5(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):297:297 -> a
-    129:129:void lambda$applyLambdaClassMapping$7(com.android.tools.r8.graph.DexEncodedMethod):325:325 -> a
-    130:130:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):333:333 -> a
-    131:133:boolean lambda$applyLambdaClassMapping$8(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):335:337 -> a
-    134:138:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):349:353 -> a
-    139:158:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):357:376 -> a
-    159:159:void lambda$analyzeLambdaClassesStructure$12(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):362:362 -> a
-    160:165:void lambda$analyzeLambdaClassesStructure$11(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):364:369 -> a
-    166:171:void lambda$analyzeLambdaClassesStructure$11(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):367:372 -> a
-    172:172:void invalidateLambda(com.android.tools.r8.graph.DexType):174:174 -> a
-    172:172:void lambda$analyzeLambdaClassesStructure$11(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):372 -> a
-    173:179:void removeTrivialLambdaGroups():406:412 -> a
-    180:190:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):420:430 -> a
-    191:204:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):429:442 -> a
-    205:209:java.lang.Object lambda$rewriteLambdaReferences$15(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):432:436 -> a
-    210:216:java.lang.Object lambda$rewriteLambdaReferences$15(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):432:438 -> a
-    217:218:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):446:447 -> a
-    217:218:void lambda$analyzeReferencesInProgramClasses$10(com.android.tools.r8.graph.DexProgramClass):351 -> a
-    219:220:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:109 -> a
-    219:220:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):447 -> a
-    219:220:void lambda$analyzeReferencesInProgramClasses$10(com.android.tools.r8.graph.DexProgramClass):351 -> a
-    221:243:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):448:470 -> a
-    221:243:void lambda$analyzeReferencesInProgramClasses$10(com.android.tools.r8.graph.DexProgramClass):351 -> a
-    244:244:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:108 -> a
-    244:244:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):447 -> a
-    244:244:void lambda$analyzeReferencesInProgramClasses$10(com.android.tools.r8.graph.DexProgramClass):351 -> a
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):85:85 -> b
-    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):178:178 -> b
-    3:4:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):257:258 -> b
-    5:5:com.android.tools.r8.graph.DexType lambda$applyLambdaClassMapping$6(com.android.tools.r8.graph.DexProgramClass):308:308 -> b
-    6:6:void lambda$removeTrivialLambdaGroups$13(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):412:412 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteLambdaReferences$14(com.android.tools.r8.graph.DexEncodedMethod):425:425 -> b
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$800(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):85:85 -> c
-    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):169:169 -> c
-    3:3:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.DexProgramClass):195:195 -> c
-    1:1:java.util.Map access$900(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):85:85 -> d
-    2:4:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):198:200 -> d
-    5:5:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> d
-    5:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):200 -> d
-    6:7:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):200:201 -> d
-    1:13:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):206:218 -> e
-    14:14:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):213:213 -> e
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):146:146 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):408 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):409:409 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    4:4:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> a
+    5:5:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    6:6:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):150:150 -> a
+    6:6:void access$200(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):86 -> a
+    7:40:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):159:192 -> a
+    41:41:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
+    42:42:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):167:167 -> a
+    43:44:void processMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:204 -> a
+    45:54:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):215:224 -> a
+    55:75:java.util.Map finalizeLambdaGroups():313:333 -> a
+    55:75:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):228 -> a
+    76:109:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):231:264 -> a
+    110:124:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):263:277 -> a
+    125:125:void lambda$applyLambdaClassMapping$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):232:232 -> a
+    126:126:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$applyLambdaClassMapping$7(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    127:127:void lambda$applyLambdaClassMapping$8(com.android.tools.r8.graph.DexEncodedMethod):258:258 -> a
+    128:128:boolean lambda$applyLambdaClassMapping$10(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):266:266 -> a
+    129:131:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):268:270 -> a
+    132:136:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):282:286 -> a
+    137:156:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):290:309 -> a
+    157:157:void lambda$analyzeLambdaClassesStructure$13(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):295:295 -> a
+    158:163:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):297:302 -> a
+    164:169:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):300:305 -> a
+    170:170:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    170:170:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):305 -> a
+    171:177:void removeTrivialLambdaGroups():339:345 -> a
+    178:188:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):353:363 -> a
+    189:202:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):362:375 -> a
+    203:207:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:369 -> a
+    208:214:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:371 -> a
+    215:216:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):379:380 -> a
+    215:216:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    217:218:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:109 -> a
+    217:218:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    217:218:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    219:241:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381:403 -> a
+    219:241:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    242:242:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:108 -> a
+    242:242:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    242:242:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$100(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> b
+    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):142:142 -> b
+    3:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):163:165 -> b
+    6:6:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
+    6:6:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165 -> b
+    7:8:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165:166 -> b
+    9:21:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):171:183 -> b
+    22:22:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):178:178 -> b
+    23:23:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$collectGroupCandidates$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):192:192 -> b
+    24:24:void lambda$removeTrivialLambdaGroups$14(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):345:345 -> b
+    25:25:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteLambdaReferences$15(com.android.tools.r8.graph.DexEncodedMethod):358:358 -> b
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$400(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> c
+    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):133:133 -> c
+    1:1:java.util.Map access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> d
 com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.D.e.I0.j:
 com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.D.e.I0.k:
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> m
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):479:479 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):480:484 -> <init>
-    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):481:481 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):483:483 -> a
-    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):491:491 -> a
-    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):496:496 -> a
-    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):501:501 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):506:506 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):511:511 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):516:516 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.D.e.I0.l:
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> a
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):94:94 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):94:94 -> <init>
-    1:1:void analyzeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):98:98 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.D.e.I0.m:
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> c
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> b
-    java.util.Set lambdaGroupsClasses -> a
-    1:3:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Set,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):108:110 -> <init>
-    1:5:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):115:119 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.D.e.I0.n:
-    boolean $assertionsDisabled -> o
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> m
-    java.util.Set typeAffectedValues -> n
-    1:1:void <clinit>():520:520 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):520:520 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):532:534 -> <init>
-    5:5:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):531:531 -> <init>
-    6:20:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):524:538 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):533:533 -> a
-    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):542:544 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):602:602 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):607:607 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):614:614 -> a
-    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):619:619 -> a
-    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):626:626 -> a
-    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):631:631 -> a
-    1:28:void processCode():551:578 -> b
-    29:45:void processCode():577:593 -> b
-    46:46:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):597:597 -> b
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.D.e.I0.o:
+    com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> l
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):412:412 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413:417 -> <init>
+    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):414:414 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):416:416 -> a
+    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):424:424 -> a
+    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):429:429 -> a
+    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):434:434 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):439:439 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):444:444 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):449:449 -> a
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.D.e.I0.l:
+    boolean $assertionsDisabled -> n
+    com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> l
+    java.util.Set typeAffectedValues -> m
+    1:1:void <clinit>():453:453 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):453:453 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):464:466 -> <init>
+    5:5:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):463:463 -> <init>
+    6:18:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):457:469 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):465:465 -> a
+    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):473:475 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):533:533 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):538:538 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):545:545 -> a
+    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):550:550 -> a
+    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):557:557 -> a
+    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):562:562 -> a
+    1:28:void processCode():482:509 -> b
+    29:45:void processCode():508:524 -> b
+    46:46:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):528:528 -> b
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.D.e.I0.m:
     java.util.Map lambdaGroupsClasses -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():635:635 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):640:641 -> <init>
-    1:5:void fixup(com.android.tools.r8.graph.DexEncodedField):658:662 -> a
-    6:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod):668:674 -> a
-    1:1:java.lang.Object apply(java.lang.Object):635:635 -> apply
-    2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):646:650 -> apply
-    2:6:java.lang.Object apply(java.lang.Object):635 -> apply
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.D.e.I0.p:
-    1:1:void <init>():87:87 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):87:87 -> <init>
-    void analyzeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
-    void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.D.e.I0.r:
+    1:1:void <clinit>():566:566 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):571:572 -> <init>
+    1:5:void fixup(com.android.tools.r8.graph.DexEncodedField):589:593 -> a
+    6:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod):599:605 -> a
+    1:1:java.lang.Object apply(java.lang.Object):566:566 -> apply
+    2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):577:581 -> apply
+    2:6:java.lang.Object apply(java.lang.Object):566 -> apply
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.D.e.I0.o:
     java.util.function.Consumer onLambdaType -> c
     java.util.function.Predicate isLambdaType -> b
     boolean $assertionsDisabled -> d
@@ -39434,7 +39196,7 @@
     63:63:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
     63:63:void accept(com.android.tools.r8.graph.DexMethodHandle):83 -> a
     64:65:void accept(com.android.tools.r8.graph.DexMethodHandle):83:84 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.D.e.I0.s.a:
+com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.a:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> m
     com.android.tools.r8.graph.DexItemFactory factory -> l
@@ -39447,35 +39209,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.D.e.I0.s.g:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.D.e.I0.p.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):104:104 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId):106:106 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):111:111 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):117:117 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.D.e.I0.s.b:
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.I0.s.c:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.D.e.I0.p.b:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.I0.p.c:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):180:180 -> <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):191:194 -> a
     5:5:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):195:195 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():185:185 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.I0.s.d:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.I0.p.d:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):152:152 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):157:157 -> a
     2:9:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):164:171 -> a
     10:10:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):167:167 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.I0.s.e:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.I0.p.e:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):130:130 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():145:145 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):135:135 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.s.f:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.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):213:214 -> <init>
     1:6:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:226 -> b
     7:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:221 -> b
     1:1:void prepareSuperConstructorCall(int):219:219 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.s.h:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.p.h:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -39522,29 +39284,29 @@
     32:32:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     33:33:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     33:33:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.D.e.I0.s.n:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.D.e.I0.p.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):110:110 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId):112:112 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):117:117 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):123:123 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.D.e.I0.s.i:
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.I0.s.j:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.D.e.I0.p.i:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.D.e.I0.p.j:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):191:191 -> <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):202:208 -> a
     8:8:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):206:206 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():196:196 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.I0.s.k:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.D.e.I0.p.k:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):158:158 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):163:163 -> a
     2:14:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):170:182 -> a
     15:15:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):178:178 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.I0.s.l:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.D.e.I0.p.l:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):136:136 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():151:151 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):141:141 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.s.m:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.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):227:230 -> <init>
@@ -39553,7 +39315,7 @@
     2:7:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:244 -> b
     8:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:239 -> b
     1:3:void prepareSuperConstructorCall(int):235:237 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.s.o:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.p.o:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -39607,7 +39369,7 @@
     36:36:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     37:37:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     37:37:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.s.p:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.D.e.I0.p.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>
@@ -39616,7 +39378,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.D.e.I0.s.q:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.D.e.I0.p.q:
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> a
@@ -39698,14 +39460,14 @@
     208:208:void accept(java.lang.Object):47 -> accept
     209:228:void accept(com.android.tools.r8.graph.DexClass):96:115 -> accept
     209:228:void accept(java.lang.Object):47 -> accept
-    229:229:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> accept
+    229:229:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> accept
     229:229:void accept(com.android.tools.r8.graph.DexClass):114 -> accept
     229:229:void accept(java.lang.Object):47 -> accept
     230:234:void accept(com.android.tools.r8.graph.DexClass):117:121 -> accept
     230:234:void accept(java.lang.Object):47 -> accept
     235:235:void accept(com.android.tools.r8.graph.DexClass):73:73 -> accept
     235:235:void accept(java.lang.Object):47 -> accept
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.D.e.I0.s.r:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.D.e.I0.p.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
@@ -39718,7 +39480,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.D.e.I0.s.s:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.D.e.I0.p.s:
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategy -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
@@ -39736,7 +39498,7 @@
     9:9:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> a
     9:9:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):78 -> a
     10:10:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):78:78 -> a
-    11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1262:1262 -> a
+    11:11:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
     11:11:com.android.tools.r8.graph.DexField getCaptureField(com.android.tools.r8.graph.DexItemFactory,int):77 -> a
     1:2:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:47 -> b
     3:3:com.android.tools.r8.graph.DexField getSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,int):46:46 -> b
@@ -39745,7 +39507,7 @@
     1:1:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57 -> c
     2:8:com.android.tools.r8.graph.DexProto createConstructorProto(com.android.tools.r8.graph.DexItemFactory):57:63 -> c
     1:1:com.android.tools.r8.graph.DexField getLambdaIdField(com.android.tools.r8.graph.DexItemFactory):67:67 -> d
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1262:1262 -> d
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexItemFactory.createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> d
     2:2:com.android.tools.r8.graph.DexField getLambdaIdField(com.android.tools.r8.graph.DexItemFactory):67 -> d
     1:1:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id():27:27 -> e
     1:1:java.lang.String getTypePackage():52 -> e
@@ -39756,7 +39518,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.D.e.I0.s.t:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.D.e.I0.p.t:
     boolean $assertionsDisabled -> p
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> o
     1:1:void <clinit>():36:36 -> <clinit>
@@ -39786,7 +39548,7 @@
     1:25:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():90:114 -> i
     26:44:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():109:127 -> i
     1:3:java.util.Map collectVirtualMethods():135:137 -> l
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.D.e.I0.s.u:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.D.e.I0.p.u:
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -39798,13 +39560,13 @@
     13:20:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):116:123 -> a
     21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     21:21:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):123 -> a
-    22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     22:22:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122 -> a
     23:28:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122:127 -> a
     29:31:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):132:134 -> a
     32:36:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):212:216 -> a
     32:36:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> 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.TypeLatticeElement):1012:1012 -> 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.TypeLatticeElement):1008:1008 -> a
     37:37:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):216 -> a
     37:37:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     38:47:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):217:226 -> a
@@ -39836,7 +39598,7 @@
     58:66:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     67:67:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):228:228 -> a
     67:67:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
-    68:68:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    68:68: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):40:40 -> a
     68:68:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):228 -> a
     68:68:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     69:69:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):228:228 -> a
@@ -39858,13 +39620,13 @@
     118:121:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):194:197 -> a
     122:122:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     122:122:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):197 -> a
-    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     123:123:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196 -> a
     124:130:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196:202 -> a
     131:134:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):234:237 -> a
     135:135:com.android.tools.r8.ir.analysis.type.TypeLatticeElement com.android.tools.r8.ir.analysis.type.TypeLatticeElement.fromDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):369:369 -> a
     135:135:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):237 -> a
-    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    136:136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     136:136:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):236 -> a
     1:5:boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):70:74 -> b
     6:15:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):96:105 -> b
@@ -39873,7 +39635,7 @@
     17:17:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):105:105 -> b
     1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):61:64 -> c
     1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):79:79 -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.D.e.I0.s.v:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.D.e.I0.p.v:
     com.android.tools.r8.graph.DexProto mainMethodProto -> g
     com.android.tools.r8.graph.ParameterAnnotationsList mainMethodParamAnnotations -> i
     int innerClassAccess -> k
@@ -39896,7 +39658,7 @@
     8:8:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> toString
     8:8:java.lang.String toString():119 -> toString
     9:23:java.lang.String toString():119:133 -> toString
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.s.w:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.D.e.I0.p.w:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -39989,7 +39751,7 @@
     11:11:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):61 -> c
     12:18:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):63:69 -> c
     19:24:boolean hasValidAnnotations(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):90:95 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.D.e.I0.s.x:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.D.e.I0.p.x:
     com.android.tools.r8.graph.DexItemFactory factory -> l
     java.util.List implMethods -> n
     com.android.tools.r8.graph.DexField idField -> m
@@ -40186,7 +39948,7 @@
     110:113:void lambda$collectCandidates$1(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexProgramClass):175:178 -> a
     114:127:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):223:236 -> a
     128:134:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):235:241 -> a
-    135:135:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
+    135:135:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     135:135:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246 -> a
     136:145:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):246:255 -> a
     146:154: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):341:349 -> a
@@ -40213,23 +39975,23 @@
     257:269:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo processStaticFieldRead(com.android.tools.r8.ir.code.StaticGet):472:484 -> a
     257:269:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):288 -> a
     270:302:void examineMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):290:322 -> a
-    303:303:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    303:303:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     303:303:boolean lambda$analyzeAllValueUsers$3(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):510 -> a
     304:322: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):428:446 -> a
-    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    323:323:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     323:323: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):446 -> a
     324:324: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):447:447 -> a
-    325:325:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    325:325:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     325:325: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):446 -> a
     326:327: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):452:453 -> a
     328:328: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):491:491 -> a
-    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    329:329:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     329:329: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):491 -> a
     330:375: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):491:536 -> a
     376:377:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):559:560 -> a
     378:381:void setFixupStrategy(java.util.function.BiConsumer):571:574 -> a
     382:385:void cleanFixupStrategy():578:581 -> a
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
     1:1:boolean lambda$isValidInitCall$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):438 -> b
     2:4:void fixupMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):564:566 -> b
 com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.D.e.K0.a:
@@ -40357,11 +40119,11 @@
     172:172:void finalEligibilityCheck():156 -> a
     173:183:void finalEligibilityCheck():156:166 -> a
     184:200:void finalEligibilityCheck():165:181 -> a
-    201:201:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
+    201:201:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     201:201:void finalEligibilityCheck():183 -> a
     202:213:void finalEligibilityCheck():183:194 -> a
     214:216:void finalEligibilityCheck():193:195 -> a
-    217:217:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> a
+    217:217:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> a
     217:217:void finalEligibilityCheck():183 -> a
     218:218:void finalEligibilityCheck():206:206 -> a
     219:219:boolean lambda$finalEligibilityCheck$0(com.android.tools.r8.graph.DexEncodedMethod):148:148 -> a
@@ -40384,28 +40146,28 @@
     280:280:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):278:278 -> a
     280:280:void lambda$rewriteReferences$5(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.StaticGet):326 -> a
     281:286:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):337:342 -> a
-    287:287:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    287:287:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     287:287:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):343 -> a
     288:289:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):344:345 -> a
-    290:290:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    290:290:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     290:290:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):343 -> a
     291:296:boolean testAndCollectPhisComposedOfThis(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.Value,java.util.Set):352:357 -> a
     297:297:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364:364 -> a
-    298:298:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    298:298:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     298:298:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364 -> a
     299:303:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):364:368 -> a
     304:321:void fixupStaticizedThisUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):367:384 -> a
     322:327:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):423:428 -> a
-    328:328:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    328:328:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     328:328:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):429 -> a
     329:335:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):430:436 -> a
-    336:336:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    336:336:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     336:336:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):429 -> a
     337:342:boolean testAndCollectPhisComposedOfSameFieldRead(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexField,java.util.Set):441:446 -> a
     343:348:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):454:459 -> a
     349:366:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):458:475 -> a
     367:376:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):479:488 -> a
-    377:377:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    377:377:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     377:377:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):488 -> a
     378:385:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):489:496 -> a
     386:386:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
@@ -40432,10 +40194,10 @@
     405:406: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):678:679 -> a
     407:407: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):677:677 -> a
     1:1:void removeReferencesToThis(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):304:304 -> b
-    1:1:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> c
+    1:1:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> c
     1:1:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310 -> c
     2:22:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310:330 -> c
-    23:23:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> c
+    23:23:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
     23:23:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):502 -> c
     23:23:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     24:37:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):503:516 -> c
@@ -40461,7 +40223,7 @@
     75:75:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     76:80:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):542:546 -> c
     76:80:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
-    81:81:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> c
+    81:81:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> c
     81:81:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310 -> c
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizationConfiguration -> com.android.tools.r8.D.e.L0.a:
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer -> com.android.tools.r8.D.e.L0.g:
@@ -40558,16 +40320,16 @@
     54:54:boolean com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration.isBuilderInit(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):801:801 -> a
     54:54: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):904 -> a
     55:56: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):939:940 -> a
-    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     57:57: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):940 -> a
     58:59: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):941:942 -> a
-    60:60:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    60:60:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     60:60: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):940 -> a
     61:62: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):945:946 -> a
-    63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    63:63:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     63:63: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):946 -> a
     64:65: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):947:948 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     66:66: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):946 -> a
     67:67: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):952:952 -> a
     68:68:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):882:882 -> a
@@ -40585,7 +40347,7 @@
     372:372:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.IRCode):206:206 -> <init>
     1:28:java.util.Set findAllLocalBuilders():217:244 -> a
     1:28:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
-    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     29:29:java.util.Set findAllLocalBuilders():244 -> a
     29:29:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
     30:32:java.util.Set collectAllLinkedBuilders(com.android.tools.r8.ir.code.Value):257:259 -> a
@@ -40593,7 +40355,7 @@
     30:32:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
     33:36:java.util.Set findAllLocalBuilders():245:248 -> a
     33:36:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
-    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    37:37:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     37:37:java.util.Set findAllLocalBuilders():244 -> a
     37:37:java.util.Set access$000(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis):191 -> a
     38:38:java.util.Set findAllLocalBuilders():253:253 -> a
@@ -40609,20 +40371,20 @@
     89:91: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
     92:93:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):362:363 -> a
     92:93: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
-    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    94:94:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     94:94:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):363 -> a
     94:94: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
     95:99:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):364:368 -> a
     95:99: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
-    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    100:100:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     100:100:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):368 -> a
     100:100:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis access$100(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis,java.util.Set):191 -> a
     101:110:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):369:378 -> a
     101:110: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
-    111:111:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    111:111:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     111:111:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):368 -> a
     111:111: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
-    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    112:112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     112:112:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):363 -> a
     112:112: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
     113:113:boolean com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$DefaultStringBuilderOptimizationConfiguration.isBuilderInitWithInitialValue(com.android.tools.r8.ir.code.InvokeMethod):813:813 -> a
@@ -40630,30 +40392,30 @@
     113:113: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
     114:120:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):383:389 -> a
     114:120: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
-    121:121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    121:121:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     121:121:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):389 -> a
     121:121: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
     122:125:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):392:395 -> a
     122:125: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
-    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     126:126:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):395 -> a
     126:126: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
     127:136:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):396:405 -> a
     127:136: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
-    137:137:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    137:137:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     137:137:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):395 -> a
     137:137: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
-    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     138:138:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):389 -> a
     138:138: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
     139:140:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):408:409 -> a
     139:140: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
-    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     141:141:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):409 -> a
     141:141: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
     142:151:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):412:421 -> a
     142:151: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
-    152:152:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    152:152:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     152:152:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis buildBuilderStateGraph(java.util.Set):409 -> a
     152: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):432:461 -> a
@@ -40662,10 +40424,10 @@
     211:227:void logHistogramOfChains(java.util.List,boolean):548:564 -> a
     228:228:void logHistogramOfChains(java.util.List,boolean):559:559 -> a
     229:230:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):575:576 -> a
-    231:231:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    231:231:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     231:231:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     232:239:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):577:584 -> a
-    240:240:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    240:240:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     240:240:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):584 -> a
     241:269:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):585:613 -> a
     270:275:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):611:616 -> a
@@ -40673,22 +40435,22 @@
     280:284:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):588:592 -> a
     285:289:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):590:594 -> a
     290:298:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):593:601 -> a
-    299:299:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    299:299:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     299:299:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):584 -> a
     300:301:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):621:622 -> a
     302:302:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     302:302:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622 -> a
     303:303:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622:622 -> a
-    304:304:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    304:304:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     304:304:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     305:314:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):628:637 -> a
     305:314:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
-    315:315:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    315:315:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     315:315:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):637 -> a
     315:315:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
     316:332:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):638:654 -> a
     316:332:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
-    333:333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    333:333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     333:333:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):637 -> a
     333:333:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
     334:379:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):666:711 -> a
@@ -40696,44 +40458,44 @@
     380:383:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):712 -> a
     384:384:java.lang.String toCompileTimeString(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$BuilderState):713:713 -> a
     385:391:void removeTrivialBuilders():728:734 -> a
-    392:392:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    392:392:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     392:392:void removeTrivialBuilders():734 -> a
     393:399:void removeTrivialBuilders():735:741 -> a
-    400:400:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    400:400:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     400:400:void removeTrivialBuilders():741 -> a
     401:402:void removeTrivialBuilders():741:742 -> a
-    403:403:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    403:403:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     403:403:void removeTrivialBuilders():741 -> a
     404:404:void removeTrivialBuilders():747:747 -> a
-    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    405:405:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     405:405:void removeTrivialBuilders():747 -> a
     406:412:void removeTrivialBuilders():748:754 -> a
-    413:413:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    413:413:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     413:413:void removeTrivialBuilders():754 -> a
     414:415:void removeTrivialBuilders():754:755 -> a
-    416:416:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    416:416:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     416:416:void removeTrivialBuilders():754 -> a
     417:421:void removeTrivialBuilders():758:762 -> a
-    422:422:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    422:422:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     422:422:void removeTrivialBuilders():762 -> a
     423:424:void removeTrivialBuilders():762:763 -> a
-    425:425:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    425:425:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     425:425:void removeTrivialBuilders():762 -> a
     426:426:void removeTrivialBuilders():767:767 -> a
-    427:427:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    427:427:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     427:427:void removeTrivialBuilders():767 -> a
     428:433:void removeTrivialBuilders():767:772 -> a
-    434:434:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    434:434:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     434:434:void removeTrivialBuilders():767 -> a
     435:435:void removeTrivialBuilders():777:777 -> a
-    436:436:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    436:436:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     436:436:void removeTrivialBuilders():777 -> a
     437:446:void removeTrivialBuilders():778:787 -> a
-    447:447:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    447:447:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     447:447:void removeTrivialBuilders():777 -> a
-    448:448:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    448:448:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     448:448:void removeTrivialBuilders():747 -> a
-    449:449:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    449:449:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     449:449:void removeTrivialBuilders():734 -> 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):469:507 -> b
@@ -40761,58 +40523,58 @@
     38:39:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:101 -> a
     40: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
-    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     45:45:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):137 -> a
     46:58:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):138:150 -> a
-    59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    59:59:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     59:59:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):150 -> a
     60:65:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):151:156 -> a
-    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    66:66:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     66:66:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):156 -> a
     67:75:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):157:165 -> a
-    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     76:76:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):165 -> a
     77:79:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):166:168 -> a
-    80:80:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    80:80:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     80:80:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):165 -> a
     81:96:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):172:187 -> a
     97:102:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):185:190 -> a
     103:105:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):189:191 -> a
-    106:106:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    106:106:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     106:106:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):156 -> a
-    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    107:107:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     107:107:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):150 -> a
     108:109:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):195:196 -> a
-    110:110:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    110:110:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     110:110:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):196 -> a
     111:119:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):197:205 -> a
     120:125:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):203:208 -> a
-    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    126:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     126:126:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):196 -> a
     127:167:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):215:255 -> a
-    168:168:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    168:168:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     168:168:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):255 -> a
     169:180:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):256:267 -> a
-    181:181:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
+    181:181:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
     181:181:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):268 -> a
     182:183:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):270:271 -> a
-    184:184:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    184:184:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     184:184:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):271 -> a
     185:190:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):272:277 -> a
-    191:191:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
+    191:191:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
     191:191:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):278 -> a
-    192:192:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    192:192:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     192:192:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):271 -> a
     193:195:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):280:282 -> a
-    196:196:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    196:196:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     196:196:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):282 -> a
     197:202:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):283:288 -> a
-    203:203:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
+    203:203:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
     203:203:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):289 -> a
     204:205:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):292:293 -> a
-    206:206:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    206:206:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     206:206:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):282 -> a
-    207:207:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    207:207:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     207:207:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):255 -> a
     208:209:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):296:297 -> a
     210:210:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
@@ -40822,10 +40584,10 @@
     216:216:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):235:235 -> a
     217:217:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):241:241 -> a
     218:221:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):304:307 -> a
-    222:222:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    222:222:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     222:222:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):309 -> a
     223:252:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):310:339 -> a
-    253:253:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    253:253:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     253:253:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):339 -> a
     254:283:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):340:369 -> a
     284:284:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
@@ -40846,7 +40608,7 @@
     394:395:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):453:454 -> a
     396:404:void logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):501:509 -> a
     396:404:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):456 -> a
-    405:405:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    405:405:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     405:405:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):339 -> a
     406:407:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):461:462 -> a
     408:408:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
@@ -40862,7 +40624,7 @@
     9:9:java.lang.Integer lambda$computeTrivialOperationsOnConstString$15(com.android.tools.r8.graph.DexString,java.lang.Integer):245:245 -> b
     10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):470:475 -> b
     16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):517:517 -> b
-    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> b
+    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> b
     17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):518 -> b
     18:38:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):519:539 -> b
     39:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):537:580 -> b
@@ -40884,16 +40646,16 @@
     1:1:void <init>():590:590 -> <init>
     1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():593:593 -> a
     2:17: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):602:617 -> a
-    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    18:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     18:18: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):617 -> a
     19:19: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):618:618 -> a
-    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     20:20: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):617 -> a
     21:22:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexMethod):620:621 -> a
-    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    23:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     23:23: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):621 -> a
     24:24: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):622:622 -> a
-    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
+    25:25:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
     25:25: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):621 -> a
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator -> com.android.tools.r8.D.f.c:
     com.android.tools.r8.graph.AppView appView -> a
@@ -40914,541 +40676,541 @@
     java.util.List inactive -> l
     int firstParallelMoveTemporary -> p
     java.util.List active -> k
-    1:1:void <clinit>():87:87 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):189:189 -> <init>
-    2:57:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):143:198 -> <init>
+    1:1:void <clinit>():85:85 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):187:187 -> <init>
+    2:57:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):141:196 -> <init>
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
     boolean longHalfOverlappingLong(int,int) -> a
-    1:19:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):249:267 -> a
-    20:46:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):265:291 -> a
-    47:47:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    47:47:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):292 -> a
-    48:52:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):293:297 -> a
-    53:53:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    53:53:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):300 -> a
-    54:62:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):302:310 -> a
-    63:63:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    63:63:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):310 -> a
-    64:89:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):311:336 -> a
-    90:90:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
-    90:90:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):336 -> a
-    91:93:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):337:339 -> a
-    94:102:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):461:469 -> a
-    94:102:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    103:103:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
-    103:103:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):469 -> a
-    103:103:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    104:124:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):471:491 -> a
-    104:124:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    125:125:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    125:125:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):494 -> a
-    125:125:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    126:126:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):494:494 -> a
-    126:126:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    127:127:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    127:127:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):496 -> a
-    127:127:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    128:130:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):462:464 -> a
-    128:130:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    131:131: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
-    131:131:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):464 -> a
-    131:131:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    132:132:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):464:464 -> a
-    132:132:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    133:133:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):347:347 -> a
-    134:134:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    134:134:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):348 -> a
-    135:156:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):349:370 -> a
-    157:157:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    157:157:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):371 -> a
-    158:197:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):372:411 -> a
-    198:198:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    198:198:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):414 -> a
-    199:200:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):417:418 -> a
-    201:201:int lambda$computeDebugInfo$0(com.android.tools.r8.ir.regalloc.LiveRange):261:261 -> a
-    202:203:boolean lambda$computeDebugInfo$2(java.util.Set,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):319:320 -> a
-    204:204:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):425:425 -> a
-    205:206:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):430:431 -> a
-    205:206:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):425 -> a
-    207:208:boolean usesValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):436:437 -> a
-    207:208:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):432 -> a
-    207:208:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):425 -> a
-    209:215:boolean valuesContain(com.android.tools.r8.ir.code.Value,java.util.Collection):441:447 -> a
-    216:239:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):504:527 -> a
-    240:259:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):510:529 -> a
-    260:264:void addRegisterIfUsed(java.util.Set,com.android.tools.r8.ir.regalloc.LiveIntervals):576:580 -> a
-    265:277:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):600:612 -> a
-    278:279:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):797:798 -> a
-    278:279:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):614 -> a
-    280:282:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):605:607 -> a
-    283:283:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    283:283:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    283:283:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):607 -> a
-    284:284:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):607:607 -> a
-    285:285:com.android.tools.r8.utils.InternalOptions options():627:627 -> a
-    286:286:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):645:645 -> a
-    287:298:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):778:789 -> a
-    287:298:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):648 -> a
-    299:299:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):649:649 -> a
-    300:308:void pinArgumentRegisters():2946:2954 -> a
-    300:308:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):652 -> a
-    309:309:void pinArgumentRegisters():2951:2951 -> a
-    309:309:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):652 -> a
-    310:371:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):826:887 -> a
-    310:371:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    372:372:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    372:372:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):888 -> a
-    372:372:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    373:394:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):893:914 -> a
-    373:394:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    395:401:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1054:1060 -> a
-    395:401:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> a
-    395:401:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    402:402:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    402:402:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1060 -> a
-    402:402:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> a
-    402:402:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    403:404:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1061:1062 -> a
-    403:404:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> a
-    403:404:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    405:411:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1073:1079 -> a
-    405:411:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
-    405:411:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    412:412:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    412:412:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1079 -> a
-    412:412:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
-    412:412:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    413:418:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1080:1085 -> a
-    413:418:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
-    413: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):340:340 -> a
-    419:419:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1085 -> 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:420:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1086:1086 -> a
-    420:420:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
-    420:420:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    421:486:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1101:1166 -> a
-    421:486:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):922 -> a
-    421:486:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    487:536:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):923:972 -> a
-    487:536:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    537:549:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1608:1620 -> a
-    537:549:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    537:549:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    550:552:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    550:552:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1621 -> a
-    550:552:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    550:552:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    553:562:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1626:1635 -> a
-    553:562:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    553:562:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    563:563:com.android.tools.r8.utils.InternalOptions options():627:627 -> a
-    563:563:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1637 -> a
-    563:563:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    563:563:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    564:609:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1637:1682 -> a
-    564:609:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    564:609:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    610:610:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    610:610:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1683 -> a
-    610:610:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    610:610:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    611:615:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1684:1688 -> a
-    611:615:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    611:615:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    616:616:int toInstructionPosition(int):1390:1390 -> a
-    616:616:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1688 -> a
-    616:616:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    616:616:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    617:628:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1693:1704 -> a
-    617:628:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    617:628:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    629:637:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1027:1035 -> a
-    629:637:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1704 -> a
-    629:637:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    629:637:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    638:668:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1783:1813 -> a
-    638:668:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1707 -> a
-    638:668:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    638:668:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    669:697:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1713:1741 -> a
-    669:697:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    669:697:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    698:700:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    698:700:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
-    698:700:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    698:700:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    701:701:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1743:1743 -> a
-    701:701:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    701:701:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    702:720:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1982:2000 -> a
-    702:720:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    702:720:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    702:720:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    721:730:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1999:2008 -> a
-    721:730:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    721:730:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    721:730:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    731:731:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    731:731:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2009 -> a
-    731:731:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    731:731:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    731:731:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    732:804:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2010:2082 -> a
-    732:804:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    732:804:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    732:804:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    805:812:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1255:1262 -> a
-    805:812:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2084 -> a
-    805:812:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    805:812:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    805:812:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    813:813:void increaseCapacity(int):2960:2960 -> a
-    813:813:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1262 -> a
-    813:813:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2084 -> a
-    813:813:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    813:813:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    813:813:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    814:816:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    814:816:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2085 -> a
-    814:816:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    814:816:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    814:816:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    817:823:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2086:2092 -> a
-    817:823:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    817:823:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    817:823:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    824:824:void increaseCapacity(int):2960:2960 -> a
-    824:824:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2093 -> a
-    824:824:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    824:824:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    824:824:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    825:832:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2096:2103 -> a
-    825:832:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    825:832:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    825:832:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    833:834:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1750:1751 -> a
-    833:834:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    833:834:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    835:835:void increaseCapacity(int):2960:2960 -> a
-    835:835:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1752 -> a
-    835:835:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    835:835:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    836:836:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1755:1755 -> a
-    836:836:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    836:836:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    837:839:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    837:839:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1757 -> a
-    837:839:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    837:839:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    840:848:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1759:1767 -> a
-    840:848:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    840:848:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    849:851:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    849:851:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1768 -> a
-    849:851:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    849: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):1769:1769 -> 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:898:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):656:701 -> a
-    899:909:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674:684 -> a
-    910:910:com.android.tools.r8.utils.InternalOptions options():627:627 -> a
-    910:910:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):685 -> a
-    911:914:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):685:688 -> a
-    915:915:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):662:662 -> a
-    916:916:com.android.tools.r8.utils.InternalOptions options():627:627 -> a
-    916:916:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):663 -> a
-    917:923:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):663:669 -> a
-    924:964:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):666:706 -> a
-    965:968:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):705:708 -> a
-    969:969:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):707:707 -> a
-    970:977:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):764:771 -> a
-    978:982:int realRegisterNumberFromAllocated(int):816:820 -> a
-    983:1021:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode) -> a
-    1022:1023:void lambda$invariantsHold$3(java.util.TreeSet,int):991:992 -> a
-    1024:1030:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1175:1181 -> a
-    1031:1031:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1031:1031:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1182 -> a
-    1032:1032:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1183:1183 -> a
-    1033:1043:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1180:1190 -> a
-    1044:1047:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1238:1241 -> a
-    1044:1047:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
-    1048:1048:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1048:1048:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1245 -> a
-    1048:1048:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
-    1049:1049:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1244:1244 -> a
-    1049:1049:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
-    1050:1050:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1194:1194 -> a
-    1051:1064:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1192:1205 -> a
-    1065:1065:int getFreeConsecutiveRegisters(int):2973:2973 -> a
-    1065:1065:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
-    1066:1067:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1208:1209 -> a
-    1068:1073:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1043:1048 -> a
-    1068:1073:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    1074:1074:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1047:1047 -> a
-    1074:1074:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    1075:1075:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1046:1046 -> a
-    1075:1075:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    1076:1089:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1211:1224 -> a
-    1090:1114:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1207:1231 -> a
-    1115:1134:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1267:1286 -> a
-    1135:1142:boolean registersAreFreeAndConsecutive(int,boolean):3029:3036 -> a
-    1135:1142:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1286 -> a
-    1143:1168:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1287:1312 -> a
-    1169:1199:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1328:1358 -> a
-    1200:1200:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1200:1200:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1359 -> a
-    1201:1217:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1366:1382 -> a
-    1218:1224:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1833:1839 -> a
-    1225:1237:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1538:1550 -> a
-    1225:1237:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1840 -> a
-    1238:1238:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1844:1844 -> a
-    1239:1243:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1432:1436 -> a
-    1239:1243:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1845 -> a
-    1244:1246:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    1244:1246:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1848 -> a
-    1247:1248:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1856:1857 -> a
-    1249:1278:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1862:1891 -> a
-    1249:1278:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1858 -> a
-    1279:1291:int getLargestCandidate(int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1912:1924 -> a
-    1292:1297: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):1942:1947 -> a
-    1298:1310: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):1962:1974 -> a
-    1311:1313:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2110:2112 -> a
-    1314:1318:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2120:2124 -> a
-    1319:1323:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2132:2136 -> a
-    1319:1323:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2127 -> a
-    1324:1324:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1324:1324:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2137 -> a
-    1324:1324:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2127 -> a
-    1325:1351:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2138:2164 -> a
-    1325:1351:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2127 -> a
-    1352:1354: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):2328:2330 -> a
-    1355:1355:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1355:1355: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 -> a
-    1356:1363: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):2332:2339 -> a
-    1364:1399: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):2447:2482 -> a
-    1400:1400:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    1400:1400:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2654 -> a
-    1400:1400: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):2482 -> a
-    1401:1407: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):2482:2488 -> a
-    1408:1459:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2521:2572 -> a
-    1460:1466:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2569:2575 -> a
-    1467:1467:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    1467:1467:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2575 -> a
-    1468:1475:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2575:2582 -> a
-    1476:1476:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    1476:1476:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2654 -> a
-    1476:1476:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2582 -> a
-    1477:1514:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2582:2619 -> a
-    1515:1516:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2646:2647 -> a
-    1515:1516:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2623 -> a
-    1517:1534:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2620:2637 -> a
-    1535:1557:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2723:2745 -> a
-    1558:1558:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2767:2767 -> a
-    1559:1563:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2872:2876 -> a
-    1559:1563:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2767 -> a
-    1564:1597:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2768:2801 -> a
-    1598:1599:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():744:745 -> a
-    1598:1599:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2803 -> a
-    1600:1600:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2804:2804 -> a
-    1601:1602:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2752:2753 -> a
-    1601:1602:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2804 -> a
-    1603:1604:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2805:2806 -> a
-    1605:1608:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2758:2761 -> a
-    1605:1608:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2807 -> a
-    1609:1633:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2809:2833 -> a
-    1634:1660:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2841:2867 -> a
-    1634:1660:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2834 -> a
-    1661:1661:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2775:2775 -> a
-    1662:1706:int getFreeConsecutiveRegisters(int,boolean):2977:3021 -> a
-    1707:1718:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):2983:2994 -> a
-    1719:1722:int getNextFreeRegister(java.util.Iterator):3045:3048 -> a
-    1723:1735:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3052:3064 -> a
-    1736:1747:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3070:3081 -> a
-    1748:1748:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3176:3176 -> a
+    1:19:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):247:265 -> a
+    20:45:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):263:288 -> a
+    46:46:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    46:46:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):289 -> a
+    47:51:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):290:294 -> a
+    52:52:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    52:52:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):297 -> a
+    53:61:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):299:307 -> a
+    62:62:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    62:62:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):307 -> a
+    63:88:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):308:333 -> a
+    89:89:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
+    89:89:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):333 -> a
+    90:92:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):334:336 -> a
+    93:101:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):458:466 -> a
+    93:101:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    102:102:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
+    102:102:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):466 -> a
+    102:102:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    103:123:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):468:488 -> a
+    103:123:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    124:124:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    124:124:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491 -> a
+    124:124:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    125:125:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491:491 -> a
+    125:125:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    126:126:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    126:126:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):493 -> a
+    126:126:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    127:129:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):459:461 -> a
+    127:129:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    130:130: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
+    130:130:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):461 -> a
+    130:130:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    131:131:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):461:461 -> a
+    131:131:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    132:132:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344:344 -> a
+    133:133:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    133:133:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):345 -> a
+    134:155:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):346:367 -> a
+    156:156:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    156:156:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):368 -> a
+    157:196:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):369:408 -> a
+    197:197:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    197:197:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):411 -> a
+    198:199:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):414:415 -> a
+    200:200:int lambda$computeDebugInfo$0(com.android.tools.r8.ir.regalloc.LiveRange):259:259 -> a
+    201:202:boolean lambda$computeDebugInfo$2(java.util.Set,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):316:317 -> a
+    203:203:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):422:422 -> a
+    204:205:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):427:428 -> a
+    204:205:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):422 -> a
+    206:207:boolean usesValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):433:434 -> a
+    206:207:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):429 -> a
+    206:207:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):422 -> a
+    208:214:boolean valuesContain(com.android.tools.r8.ir.code.Value,java.util.Collection):438:444 -> a
+    215:238:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):501:524 -> a
+    239:258:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):507:526 -> a
+    259:263:void addRegisterIfUsed(java.util.Set,com.android.tools.r8.ir.regalloc.LiveIntervals):573:577 -> a
+    264:276:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):597:609 -> a
+    277:278:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):794:795 -> a
+    277:278:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):611 -> a
+    279:281:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):602:604 -> a
+    282:282:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    282:282:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    282:282:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):604 -> a
+    283:283:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):604:604 -> a
+    284:284:com.android.tools.r8.utils.InternalOptions options():624:624 -> a
+    285:285:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):642:642 -> a
+    286:297:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):775:786 -> a
+    286:297:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):645 -> a
+    298:298:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):646:646 -> a
+    299:307:void pinArgumentRegisters():2943:2951 -> a
+    299:307:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):649 -> a
+    308:308:void pinArgumentRegisters():2948:2948 -> a
+    308:308:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):649 -> a
+    309:370:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):823:884 -> a
+    309:370:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    371:371:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    371:371:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):885 -> a
+    371:371:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    372:393:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):890:911 -> a
+    372:393:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    394:400:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1051:1057 -> a
+    394:400:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):913 -> a
+    394:400:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    401:401:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    401:401:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1057 -> a
+    401:401:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):913 -> a
+    401:401:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    402:403:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1058:1059 -> a
+    402:403:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):913 -> a
+    402:403:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    404:410:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1070:1076 -> a
+    404:410:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    404:410:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    411:411:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    411:411:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1076 -> a
+    411:411:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    411:411:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    412:417:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1077:1082 -> a
+    412:417:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    412:417:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    418:418:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    418:418:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1082 -> a
+    418:418:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    418:418:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    419:419:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1083:1083 -> a
+    419:419:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    419:419:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    420:485:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1098:1163 -> a
+    420:485:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):919 -> a
+    420:485:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    486:535:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):920:969 -> a
+    486:535:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    536:548:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1605:1617 -> a
+    536:548:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    536:548:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    549:551:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    549:551:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1618 -> a
+    549:551:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    549:551:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    552:561:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1623:1632 -> a
+    552:561:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    552:561:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    562:562:com.android.tools.r8.utils.InternalOptions options():624:624 -> a
+    562:562:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1634 -> a
+    562:562:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    562:562:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    563:608:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1634:1679 -> a
+    563:608:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    563:608:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    609:609:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    609:609:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1680 -> a
+    609:609:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    609:609:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    610:614:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1681:1685 -> a
+    610:614:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    610:614:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    615:615:int toInstructionPosition(int):1387:1387 -> a
+    615:615:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1685 -> a
+    615:615:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    615:615:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    616:627:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1690:1701 -> a
+    616:627:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    616:627:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    628:636:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1024:1032 -> a
+    628:636:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1701 -> a
+    628:636:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    628:636:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    637:667:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1780:1810 -> a
+    637:667:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1704 -> a
+    637:667:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    637:667:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    668:696:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1710:1738 -> a
+    668:696:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    668:696:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    697:699:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    697:699:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1739 -> a
+    697:699:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    697:699:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    700:700:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1740:1740 -> a
+    700:700:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    700:700:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    701:719:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1979:1997 -> a
+    701:719:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    701:719:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    701:719:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    720:729:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1996:2005 -> a
+    720:729:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    720:729:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    720:729:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    730:730:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    730:730:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2006 -> a
+    730:730:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    730:730:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    730:730:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    731:803:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2007:2079 -> a
+    731:803:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    731:803:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    731:803:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    804:811:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1252:1259 -> a
+    804:811:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2081 -> a
+    804:811:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    804:811:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    804:811:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    812:812:void increaseCapacity(int):2957:2957 -> a
+    812:812:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1259 -> a
+    812:812:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2081 -> a
+    812:812:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    812:812:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    812:812:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    813:815:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    813:815:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2082 -> a
+    813:815:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    813:815:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    813:815:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    816:822:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2083:2089 -> a
+    816:822:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    816:822:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    816:822:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    823:823:void increaseCapacity(int):2957:2957 -> a
+    823:823:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2090 -> a
+    823:823:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    823:823:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    823:823:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    824:831:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2093:2100 -> a
+    824:831:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    824:831:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    824:831:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    832:833:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1747:1748 -> a
+    832:833:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    832:833:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    834:834:void increaseCapacity(int):2957:2957 -> a
+    834:834:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1749 -> a
+    834:834:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    834:834:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    835:835:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1752:1752 -> a
+    835:835:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    835:835:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    836:838:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    836:838:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> a
+    836:838:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    836:838:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    839:847:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1756:1764 -> a
+    839:847:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    839:847:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    848:850:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    848:850:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1765 -> a
+    848:850:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    848:850:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    851:851:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766:1766 -> a
+    851:851:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    851:851:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    852:897:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):653:698 -> a
+    898:908:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):671:681 -> a
+    909:909:com.android.tools.r8.utils.InternalOptions options():624:624 -> a
+    909:909:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):682 -> a
+    910:913:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):682:685 -> a
+    914:914:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):659:659 -> a
+    915:915:com.android.tools.r8.utils.InternalOptions options():624:624 -> a
+    915:915:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):660 -> a
+    916:922:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):660:666 -> a
+    923:963:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):663:703 -> a
+    964:967:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):702:705 -> a
+    968:968:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):704:704 -> a
+    969:976:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):761:768 -> a
+    977:981:int realRegisterNumberFromAllocated(int):813:817 -> a
+    982:1020:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):980:1018 -> a
+    1021:1022:void lambda$invariantsHold$3(java.util.TreeSet,int):988:989 -> a
+    1023:1029:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1172:1178 -> a
+    1030:1030:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1030:1030:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1179 -> a
+    1031:1031:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1180:1180 -> a
+    1032:1042:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1177:1187 -> a
+    1043:1046:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1235:1238 -> a
+    1043:1046:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1190 -> a
+    1047:1047:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1047:1047:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1242 -> a
+    1047:1047:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1190 -> a
+    1048:1048:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1241:1241 -> a
+    1048:1048:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1190 -> a
+    1049:1049:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1191:1191 -> a
+    1050:1063:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1189:1202 -> a
+    1064:1064:int getFreeConsecutiveRegisters(int):2970:2970 -> a
+    1064:1064:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1203 -> a
+    1065:1066:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1205:1206 -> a
+    1067:1072:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1040:1045 -> a
+    1067:1072:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
+    1073:1073:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1044:1044 -> a
+    1073:1073:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
+    1074:1074:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1043:1043 -> a
+    1074:1074:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
+    1075:1088:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1208:1221 -> a
+    1089:1113:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1204:1228 -> a
+    1114:1133:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1264:1283 -> a
+    1134:1141:boolean registersAreFreeAndConsecutive(int,boolean):3026:3033 -> a
+    1134:1141:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1283 -> a
+    1142:1167:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1284:1309 -> a
+    1168:1198:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1325:1355 -> a
+    1199:1199:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1199:1199:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1356 -> a
+    1200:1216:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1363:1379 -> a
+    1217:1223:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1830:1836 -> a
+    1224:1236:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1535:1547 -> a
+    1224:1236:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1837 -> a
+    1237:1237:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1841:1841 -> a
+    1238:1242:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1429:1433 -> a
+    1238:1242:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1842 -> a
+    1243:1245:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    1243:1245:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1845 -> a
+    1246:1247:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1853:1854 -> a
+    1248:1277:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1859:1888 -> a
+    1248:1277:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1855 -> a
+    1278:1290:int getLargestCandidate(int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1909:1921 -> a
+    1291:1296: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):1939:1944 -> a
+    1297:1309: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):1959:1971 -> a
+    1310:1312:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2107:2109 -> a
+    1313:1317:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2117:2121 -> a
+    1318:1322:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2129:2133 -> a
+    1318:1322:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2124 -> a
+    1323:1323:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1323:1323:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2134 -> a
+    1323:1323:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2124 -> a
+    1324:1350:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2135:2161 -> a
+    1324:1350:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2124 -> a
+    1351:1353: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):2325:2327 -> a
+    1354:1354:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1354:1354: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):2328 -> a
+    1355:1362: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):2329:2336 -> a
+    1363:1398: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):2444:2479 -> a
+    1399:1399:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    1399:1399:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
+    1399:1399: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):2479 -> a
+    1400:1406: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):2479:2485 -> a
+    1407:1458:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2518:2569 -> a
+    1459:1465:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2566:2572 -> a
+    1466:1466:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    1466:1466:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572 -> a
+    1467:1474:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572:2579 -> a
+    1475:1475:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    1475:1475:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
+    1475:1475:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579 -> a
+    1476:1513:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579:2616 -> a
+    1514:1515:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2643:2644 -> a
+    1514:1515:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2620 -> a
+    1516:1533:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2617:2634 -> a
+    1534:1556:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2720:2742 -> a
+    1557:1557:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2764:2764 -> a
+    1558:1562:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2869:2873 -> a
+    1558:1562:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2764 -> a
+    1563:1596:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2765:2798 -> a
+    1597:1598:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():750:751 -> a
+    1597:1598:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2800 -> a
+    1599:1599:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2801:2801 -> a
+    1600:1601:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2749:2750 -> a
+    1600:1601:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2801 -> a
+    1602:1603:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2802:2803 -> a
+    1604:1607:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2755:2758 -> a
+    1604:1607:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2804 -> a
+    1608:1632:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2806:2830 -> a
+    1633:1659:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2838:2864 -> a
+    1633:1659:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2831 -> a
+    1660:1660:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2772:2772 -> a
+    1661:1705:int getFreeConsecutiveRegisters(int,boolean):2974:3018 -> a
+    1706:1717:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):2980:2991 -> a
+    1718:1721:int getNextFreeRegister(java.util.Iterator):3042:3045 -> a
+    1722:1734:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3049:3061 -> a
+    1735:1746:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3067:3078 -> a
+    1747:1747:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3173:3173 -> a
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
-    1:1:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):309:309 -> b
-    2:4:int registersUsed():591:593 -> b
-    5:6:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):619:620 -> b
-    7:8:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):797:798 -> b
-    7:8:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):620 -> b
-    9:9:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):622:622 -> b
-    10:10:com.android.tools.r8.utils.InternalOptions options():627:627 -> b
-    10:10:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1409 -> b
-    11:28:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1409:1426 -> b
-    29:34:int unadjustedRealRegisterFromAllocated(int):802:807 -> b
-    35:36:void lambda$invariantsHold$4(java.util.TreeSet,int):1008:1009 -> b
-    37:41:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1432:1436 -> b
-    42:43:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2169:2170 -> b
-    44:44:boolean atLeastOneOfRegistersAreTaken(int,boolean):3126:3126 -> b
-    44:44:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2170 -> b
-    45:91:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2170:2216 -> b
-    92:114:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2284:2306 -> b
-    92:114:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2219 -> b
-    115:115:int toGapPosition(int):1394:1394 -> b
-    115:115:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2306 -> b
-    115:115:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2219 -> b
-    116:129:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2306:2319 -> b
-    116:129:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2219 -> b
-    130:130:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2220:2220 -> b
-    131:138:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2233:2240 -> b
-    131:138:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2221 -> b
-    139:166:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2247:2274 -> b
-    139:166:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2223 -> b
-    167:168:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2228:2229 -> b
-    169:173:void increaseCapacity(int,boolean):2965:2969 -> b
-    1:1:void allocateRegisters():207:207 -> c
-    2:11:boolean noLinkedValues():3130:3139 -> c
-    2:11:void allocateRegisters():207 -> c
-    12:12:boolean noLinkedValues():3138:3138 -> c
-    12:12:void allocateRegisters():207 -> c
-    13:14:void allocateRegisters():208:209 -> c
-    15:63:void transformBridgeMethod():2667:2715 -> c
-    15:63:void allocateRegisters():210 -> c
-    64:67:void computeNeedsRegister():2935:2938 -> c
-    64:67:void allocateRegisters():212 -> c
-    68:68:void constrainArgumentIntervals():2912:2912 -> c
-    68:68:void allocateRegisters():213 -> c
-    69:75:void createArgumentLiveIntervals(java.util.List):2886:2892 -> c
-    69:75:void constrainArgumentIntervals():2913 -> c
-    69:75:void allocateRegisters():213 -> c
-    76:84:void linkArgumentValuesAndIntervals(java.util.List):2898:2906 -> c
-    76:84:void constrainArgumentIntervals():2914 -> c
-    76:84:void allocateRegisters():213 -> c
-    85:87:void insertRangeInvokeMoves():2918:2920 -> c
-    85:87:void allocateRegisters():214 -> c
-    88:88:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> c
-    88:88:void insertRangeInvokeMoves():2921 -> c
-    88:88:void allocateRegisters():214 -> c
-    89:89:void insertRangeInvokeMoves():2922:2922 -> c
-    89:89:void allocateRegisters():214 -> c
-    90:90:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> c
-    90:90:void insertRangeInvokeMoves():2924 -> c
-    90:90:void allocateRegisters():214 -> c
-    91:91:void insertRangeInvokeMoves():2926:2926 -> c
-    91:91:void allocateRegisters():214 -> c
-    92:92:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> c
-    92:92:void insertRangeInvokeMoves():2928 -> c
-    92:92:void allocateRegisters():214 -> c
-    93:94:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():631:632 -> c
-    93:94:void allocateRegisters():215 -> c
-    95:95:com.android.tools.r8.utils.InternalOptions options():627:627 -> c
-    95:95:void computeLiveRanges():2493 -> c
-    95:95:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    95:95:void allocateRegisters():215 -> c
-    96:96:void computeLiveRanges():2493:2493 -> c
-    96:96:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    96:96:void allocateRegisters():215 -> c
-    97:97:com.android.tools.r8.utils.InternalOptions options():627:627 -> c
-    97:97:void computeLiveRanges():2498 -> c
-    97:97:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    97:97:void allocateRegisters():215 -> c
-    98:98:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1163:1163 -> c
-    98:98:void computeLiveRanges():2498 -> c
-    98:98:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    98:98:void allocateRegisters():215 -> c
-    99:99:com.android.tools.r8.utils.InternalOptions options():627:627 -> c
-    99:99:void computeLiveRanges():2498 -> c
-    99:99:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    99:99:void allocateRegisters():215 -> c
-    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1172:1172 -> c
-    100:100:void computeLiveRanges():2498 -> c
-    100:100:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    100:100:void allocateRegisters():215 -> c
-    101:110:void computeLiveRanges():2498:2507 -> c
-    101:110:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> c
-    101:110:void allocateRegisters():215 -> c
-    111:111:void performAllocation():640:640 -> c
-    111:111:void allocateRegisters():216 -> c
-    112:116:void allocateRegisters():217:221 -> c
-    117:117:com.android.tools.r8.utils.InternalOptions options():627:627 -> c
-    117:117:void allocateRegisters():226 -> c
-    118:121:void allocateRegisters():226:229 -> c
-    122:122:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> c
-    122:122:void allocateRegisters():229 -> c
-    123:127:void allocateRegisters():230:234 -> c
-    128:128:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> c
-    128:128:void allocateRegisters():229 -> c
-    129:129:void allocateRegisters():238:238 -> c
-    130:135:void clearState():534:539 -> c
-    130:135:void allocateRegisters():239 -> c
-    136:136:com.android.tools.r8.utils.InternalOptions options():627:627 -> c
-    136:136:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502 -> c
-    137:137:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1178:1178 -> c
-    137:137:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502 -> c
-    138:158:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1505:1525 -> c
-    159:171:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1538:1550 -> c
-    172:173:boolean registerIsFree(int):3106:3107 -> c
-    174:174:boolean registersAreFree(int,boolean):3113:3113 -> c
-    1:1:int highestUsedRegister():586:586 -> d
-    2:2:com.android.tools.r8.utils.InternalOptions options():627:627 -> d
-    2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1211:1211 -> d
-    3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    4:4:com.android.tools.r8.utils.InternalOptions options():627:627 -> d
-    4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1385:1385 -> d
-    5:5:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    6:24:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
+    1:1:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):306:306 -> b
+    2:4:int registersUsed():588:590 -> b
+    5:6:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):616:617 -> b
+    7:8:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):794:795 -> b
+    7:8:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):617 -> b
+    9:9:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):619:619 -> b
+    10:10:com.android.tools.r8.utils.InternalOptions options():624:624 -> b
+    10:10:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1406 -> b
+    11:28:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1406:1423 -> b
+    29:34:int unadjustedRealRegisterFromAllocated(int):799:804 -> b
+    35:36:void lambda$invariantsHold$4(java.util.TreeSet,int):1005:1006 -> b
+    37:41:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1429:1433 -> b
+    42:43:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2166:2167 -> b
+    44:44:boolean atLeastOneOfRegistersAreTaken(int,boolean):3123:3123 -> b
+    44:44:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2167 -> b
+    45:91:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2167:2213 -> b
+    92:114:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2281:2303 -> b
+    92:114:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2216 -> b
+    115:115:int toGapPosition(int):1391:1391 -> b
+    115:115:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2303 -> b
+    115:115:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2216 -> b
+    116:129:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2303:2316 -> b
+    116:129:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2216 -> b
+    130:130:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2217:2217 -> b
+    131:138:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2230:2237 -> b
+    131:138:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2218 -> b
+    139:166:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2244:2271 -> b
+    139:166:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2220 -> b
+    167:168:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2225:2226 -> b
+    169:173:void increaseCapacity(int,boolean):2962:2966 -> b
+    1:1:void allocateRegisters():205:205 -> c
+    2:11:boolean noLinkedValues():3127:3136 -> c
+    2:11:void allocateRegisters():205 -> c
+    12:12:boolean noLinkedValues():3135:3135 -> c
+    12:12:void allocateRegisters():205 -> c
+    13:14:void allocateRegisters():206:207 -> c
+    15:63:void transformBridgeMethod():2664:2712 -> c
+    15:63:void allocateRegisters():208 -> c
+    64:67:void computeNeedsRegister():2932:2935 -> c
+    64:67:void allocateRegisters():210 -> c
+    68:68:void constrainArgumentIntervals():2909:2909 -> c
+    68:68:void allocateRegisters():211 -> c
+    69:75:void createArgumentLiveIntervals(java.util.List):2883:2889 -> c
+    69:75:void constrainArgumentIntervals():2910 -> c
+    69:75:void allocateRegisters():211 -> c
+    76:84:void linkArgumentValuesAndIntervals(java.util.List):2895:2903 -> c
+    76:84:void constrainArgumentIntervals():2911 -> c
+    76:84:void allocateRegisters():211 -> c
+    85:87:void insertRangeInvokeMoves():2915:2917 -> c
+    85:87:void allocateRegisters():212 -> c
+    88:88:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> c
+    88:88:void insertRangeInvokeMoves():2918 -> c
+    88:88:void allocateRegisters():212 -> c
+    89:89:void insertRangeInvokeMoves():2919:2919 -> c
+    89:89:void allocateRegisters():212 -> c
+    90:90:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> c
+    90:90:void insertRangeInvokeMoves():2921 -> c
+    90:90:void allocateRegisters():212 -> c
+    91:91:void insertRangeInvokeMoves():2923:2923 -> c
+    91:91:void allocateRegisters():212 -> c
+    92:92:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> c
+    92:92:void insertRangeInvokeMoves():2925 -> c
+    92:92:void allocateRegisters():212 -> c
+    93:94:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():628:629 -> c
+    93:94:void allocateRegisters():213 -> c
+    95:95:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
+    95:95:void computeLiveRanges():2490 -> c
+    95:95:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    95:95:void allocateRegisters():213 -> c
+    96:96:void computeLiveRanges():2490:2490 -> c
+    96:96:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    96:96:void allocateRegisters():213 -> c
+    97:97:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
+    97:97:void computeLiveRanges():2495 -> c
+    97:97:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    97:97:void allocateRegisters():213 -> c
+    98:98:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1158:1158 -> c
+    98:98:void computeLiveRanges():2495 -> c
+    98:98:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    98:98:void allocateRegisters():213 -> c
+    99:99:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
+    99:99:void computeLiveRanges():2495 -> c
+    99:99:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    99:99:void allocateRegisters():213 -> c
+    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1167:1167 -> c
+    100:100:void computeLiveRanges():2495 -> c
+    100:100:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    100:100:void allocateRegisters():213 -> c
+    101:110:void computeLiveRanges():2495:2504 -> c
+    101:110:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> c
+    101:110:void allocateRegisters():213 -> c
+    111:111:void performAllocation():637:637 -> c
+    111:111:void allocateRegisters():214 -> c
+    112:116:void allocateRegisters():215:219 -> c
+    117:117:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
+    117:117:void allocateRegisters():224 -> c
+    118:121:void allocateRegisters():224:227 -> c
+    122:122:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
+    122:122:void allocateRegisters():227 -> c
+    123:127:void allocateRegisters():228:232 -> c
+    128:128:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
+    128:128:void allocateRegisters():227 -> c
+    129:129:void allocateRegisters():236:236 -> c
+    130:135:void clearState():531:536 -> c
+    130:135:void allocateRegisters():237 -> c
+    136:136:com.android.tools.r8.utils.InternalOptions options():624:624 -> c
+    136:136:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1499 -> c
+    137:137:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1173:1173 -> c
+    137:137:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1499 -> c
+    138:158:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502:1522 -> c
+    159:171:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1535:1547 -> c
+    172:173:boolean registerIsFree(int):3103:3104 -> c
+    174:174:boolean registersAreFree(int,boolean):3110:3110 -> c
+    1:1:int highestUsedRegister():583:583 -> d
+    2:2:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
+    2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> d
+    3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    4:4:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
+    4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1380:1380 -> d
+    5:5:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    6:24:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1459 -> d
     25:25:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
-    25:25:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1462 -> d
-    26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472:1472 -> d
-    27:27:com.android.tools.r8.utils.InternalOptions options():627:627 -> 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 com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1211:1211 -> d
-    28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    29:29:com.android.tools.r8.utils.InternalOptions options():627:627 -> 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:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1385:1385 -> d
-    30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    30:30:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    31:49:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
-    31:49:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
+    25:25:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1459 -> d
+    26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469:1469 -> d
+    27:27:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
+    27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> d
+    28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    29:29:com.android.tools.r8.utils.InternalOptions options():624:624 -> d
+    29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1380:1380 -> d
+    30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    30:30:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    31:49:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1459 -> d
+    31:49:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
     50:50:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
-    50:50:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1462 -> d
-    50:50:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    51:66:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472:1487 -> d
-    1:11:boolean overlapsMoveExceptionInterval(com.android.tools.r8.ir.regalloc.LiveIntervals):1590:1600 -> e
-    12:12:void clearUserInfo():2658:2658 -> e
-    1:26:boolean computeUnusedRegisters():546:571 -> f
-    27:28:boolean registersForIntervalsAreTaken(com.android.tools.r8.ir.regalloc.LiveIntervals):3121:3122 -> f
-    29:29:boolean registersAreTaken(int,boolean):3117:3117 -> f
-    29:29:boolean registersForIntervalsAreTaken(com.android.tools.r8.ir.regalloc.LiveIntervals):3122 -> f
-    1:2:int getMoveExceptionRegister():185:186 -> g
-    3:3:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3095:3095 -> g
-    4:7:void takeFreeRegisters(int,boolean):3087:3090 -> g
-    4:7:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3095 -> g
-    8:11:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3097:3100 -> g
-    1:1:boolean hasDedicatedMoveExceptionRegister():177:177 -> h
-    1:2:void computeRematerializableBits():2373:2374 -> i
-    1:2:void insertMoves():2349 -> i
-    3:12:void insertMoves():2351:2360 -> i
-    13:13:int toGapPosition(int):1394:1394 -> i
-    13:13:void insertMoves():2361 -> i
-    14:14:void insertMoves():2361:2361 -> i
-    15:15:void insertMoves():2359:2359 -> i
-    16:58:void resolveControlFlow(com.android.tools.r8.ir.regalloc.SpillMoveSet):2392:2434 -> i
-    16:58:void insertMoves():2367 -> i
-    59:60:void insertMoves():2368:2369 -> i
-    1:3:void removeSpillAndPhiMoves():752:754 -> j
-    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> j
-    4:4:void removeSpillAndPhiMoves():755 -> j
-    5:6:void removeSpillAndPhiMoves():756:757 -> j
-    1:28:boolean unsplitArguments():719:746 -> k
-    1:20:java.lang.String toString():3147:3166 -> toString
+    50:50:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1459 -> d
+    50:50:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    51:66:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469:1484 -> d
+    1:11:boolean overlapsMoveExceptionInterval(com.android.tools.r8.ir.regalloc.LiveIntervals):1587:1597 -> e
+    12:12:void clearUserInfo():2655:2655 -> e
+    1:26:boolean computeUnusedRegisters():543:568 -> f
+    27:28:boolean registersForIntervalsAreTaken(com.android.tools.r8.ir.regalloc.LiveIntervals):3118:3119 -> f
+    29:29:boolean registersAreTaken(int,boolean):3114:3114 -> f
+    29:29:boolean registersForIntervalsAreTaken(com.android.tools.r8.ir.regalloc.LiveIntervals):3119 -> f
+    1:2:int getMoveExceptionRegister():183:184 -> g
+    3:3:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3092:3092 -> g
+    4:7:void takeFreeRegisters(int,boolean):3084:3087 -> g
+    4:7:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3092 -> g
+    8:11:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3094:3097 -> g
+    1:1:boolean hasDedicatedMoveExceptionRegister():175:175 -> h
+    1:2:void computeRematerializableBits():2370:2371 -> i
+    1:2:void insertMoves():2346 -> i
+    3:12:void insertMoves():2348:2357 -> i
+    13:13:int toGapPosition(int):1391:1391 -> i
+    13:13:void insertMoves():2358 -> i
+    14:14:void insertMoves():2358:2358 -> i
+    15:15:void insertMoves():2356:2356 -> i
+    16:58:void resolveControlFlow(com.android.tools.r8.ir.regalloc.SpillMoveSet):2389:2431 -> i
+    16:58:void insertMoves():2364 -> i
+    59:60:void insertMoves():2365:2366 -> i
+    1:3:void removeSpillAndPhiMoves():749:751 -> j
+    4:4:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> j
+    4:4:void removeSpillAndPhiMoves():752 -> j
+    5:6:void removeSpillAndPhiMoves():753:754 -> j
+    1:28:boolean unsplitArguments():716:743 -> k
+    1:20:java.lang.String toString():3144:3163 -> toString
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode -> com.android.tools.r8.D.f.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>
+    1:3:void <clinit>():92:94 -> <clinit>
+    4:4:void <clinit>():91:91 -> <clinit>
+    1:1:void <init>(java.lang.String,int):91:91 -> <init>
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange -> com.android.tools.r8.D.f.b:
     com.android.tools.r8.graph.DebugLocalInfo local -> b
     boolean $assertionsDisabled -> f
@@ -41456,13 +41218,13 @@
     com.android.tools.r8.ir.code.Value value -> a
     int end -> e
     int register -> c
-    1:1:void <clinit>():99:99 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.ir.code.Value,int,int,int):106:112 -> <init>
-    1:3:int compareTo(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):117:119 -> a
-    1:1:int compareTo(java.lang.Object):99:99 -> compareTo
-    2:4:int compareTo(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):117:119 -> compareTo
-    2:4:int compareTo(java.lang.Object):99 -> compareTo
-    1:1:java.lang.String toString():124:124 -> toString
+    1:1:void <clinit>():97:97 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.ir.code.Value,int,int,int):104:110 -> <init>
+    1:3:int compareTo(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):115:117 -> a
+    1:1:int compareTo(java.lang.Object):97:97 -> compareTo
+    2:4:int compareTo(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):115:117 -> compareTo
+    2:4:int compareTo(java.lang.Object):97 -> compareTo
+    1:1:java.lang.String toString():122:122 -> toString
 com.android.tools.r8.ir.regalloc.LiveIntervals -> com.android.tools.r8.D.f.d:
     boolean spilled -> m
     boolean usedInMonitorOperations -> n
@@ -41796,11 +41558,11 @@
     1:2:void addInResolutionMove(int,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):122:123 -> a
     3:3:java.util.Set lambda$addInMove$1(java.lang.Integer):147:147 -> a
     4:9:int scheduleAndInsertMoves(int):167:172 -> a
-    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    10:10:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     10:10:int scheduleAndInsertMoves(int):173 -> a
     11:17:int scheduleAndInsertMoves(int):176:182 -> a
     18:32:int scheduleAndInsertMoves(int):178:192 -> a
-    33:33:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    33:33:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     33:33:int scheduleAndInsertMoves(int):194 -> a
     34:34:int scheduleAndInsertMoves(int):197:197 -> a
     35:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement moveTypeForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):201:208 -> a
@@ -41827,7 +41589,7 @@
     86:90:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):316:320 -> a
     91:99:void removeArgumentRestores(java.util.Set):332:340 -> a
     100:124:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):347:371 -> a
-    125:125:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1147:1147 -> a
+    125:125:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1142:1142 -> a
     125:125:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371 -> a
     126:131:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371:376 -> a
     132:136:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):375:379 -> a
@@ -42092,7 +41854,27 @@
     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.E.a.a.a.e.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanListIterator -> com.android.tools.r8.E.a.a.a.e.c:
+    1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.<init>():34:34 -> <init>
+    1:1:void <init>():35 -> <init>
+    1:1:void add(java.lang.Object):34:34 -> add
+    2:2:void add(java.lang.Boolean):83:83 -> add
+    2:2:void add(java.lang.Object):34 -> add
+    3:3:void add(boolean):57:57 -> add
+    3:3:void add(java.lang.Boolean):83 -> add
+    3:3:void add(java.lang.Object):34 -> add
+    1:1:boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator.previousBoolean():62:62 -> previous
+    1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():56 -> previous
+    1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():0 -> previous
+    1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():33 -> previous
+    1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():0 -> previous
+    1:1:void set(java.lang.Object):34:34 -> set
+    2:2:void set(java.lang.Boolean):70:70 -> set
+    2:2:void set(java.lang.Object):34 -> set
+    3:3:void set(boolean):46:46 -> set
+    3:3:void set(java.lang.Boolean):70 -> set
+    3:3:void set(java.lang.Object):34 -> set
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanSet -> com.android.tools.r8.E.a.a.a.e.d:
     1:1:void <init>():32:32 -> <init>
     1:1:boolean rem(boolean):87:87 -> c
     boolean remove(boolean) -> d
@@ -42101,7 +41883,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.E.a.a.a.e.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.E.a.a.a.e.f:
     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
@@ -42121,7 +41903,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():119:119 -> iterator
     2:2:java.util.Iterator iterator():29 -> iterator
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.E.a.a.a.e.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.E.a.a.a.e.e:
     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>
@@ -42129,13 +41911,14 @@
     1:2:boolean nextBoolean():129:130 -> nextBoolean
     3:3:boolean nextBoolean():129:129 -> nextBoolean
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.E.a.a.a.e.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.E.a.a.a.e.g:
     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.E.a.a.a.e.g:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.E.a.a.a.e.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanBidirectionalIterator -> com.android.tools.r8.E.a.a.a.e.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.E.a.a.a.e.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.E.a.a.a.e.k:
     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.E.a.a.a.e.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.E.a.a.a.e.j:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):369:371 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):370:370 -> <init>
@@ -42150,13 +41933,8 @@
     1:1:int hashCode():517:517 -> hashCode
     1:1:boolean isEmpty():391:391 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400:400 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):747:747 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400:400 -> iterator
-    3:3:java.util.Iterator iterator():365 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):747:747 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400 -> iterator
-    4:4:java.util.Iterator iterator():365 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400:400 -> iterator
+    2:2:java.util.Iterator iterator():365 -> iterator
     1:1:boolean remove(java.lang.Object):465:465 -> remove
     1:1:boolean removeAll(java.util.Collection):442:442 -> removeAll
     1:1:boolean retainAll(java.util.Collection):447:447 -> retainAll
@@ -42164,12 +41942,21 @@
     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.E.a.a.a.e.j:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.E.a.a.a.e.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.E.a.a.a.e.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.E.a.a.a.e.o:
+    com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator EMPTY_ITERATOR -> a
+    1:1:void <clinit>():103:103 -> <clinit>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):747:747 -> a
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator -> com.android.tools.r8.E.a.a.a.e.m:
+    1:1:void <init>():42:42 -> <init>
+    1:1:java.lang.Object clone():87:87 -> clone
+    1:1:boolean nextBoolean():57:57 -> nextBoolean
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.E.a.a.a.e.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):724:725 -> <init>
     1:1:boolean hasNext():730:730 -> hasNext
     1:1:boolean nextBoolean():735:735 -> nextBoolean
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSet -> com.android.tools.r8.E.a.a.a.e.p:
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> com.android.tools.r8.E.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>
@@ -42370,18 +42157,7 @@
     1:1:boolean add(int):68:68 -> a
     2:2:boolean add(java.lang.Integer):114:114 -> a
     3:4:int[] toArray(int[]):148:149 -> a
-    5:5:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312:312 -> a
-    5:5:int[] toArray(int[]):149 -> a
-    6:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:292 -> a
-    6:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    6:9:int[] toArray(int[]):149 -> a
-    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:289 -> a
-    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    10:10:int[] toArray(int[]):149 -> a
-    11:11:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
-    11:11:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    11:11:int[] toArray(int[]):149 -> a
-    12:13:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
+    5:6:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
     1:1:boolean add(java.lang.Object):36:36 -> add
     1:4:boolean rem(int):94:97 -> b
     1:1:boolean contains(java.lang.Object):129:129 -> contains
@@ -44422,8 +44198,6 @@
     1:1:boolean isEmpty():391:391 -> isEmpty
     1:1:java.util.Iterator iterator():365:365 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():400:400 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):830:830 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():400 -> iterator
     1:1:boolean remove(java.lang.Object):465:465 -> remove
     1:1:boolean removeAll(java.util.Collection):442:442 -> removeAll
     1:1:boolean retainAll(java.util.Collection):447:447 -> retainAll
@@ -44436,6 +44210,15 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.E.a.a.a.f.P0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator singleton(int):159:159 -> a
+    2:2:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312:312 -> a
+    3:6:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:292 -> a
+    3:6:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    7:7:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:289 -> a
+    7:7:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    8:8:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
+    8:8:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):830:830 -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.E.a.a.a.f.M0:
     1:1:void <init>():42:42 -> <init>
     1:1:int previousInt():62:62 -> c
@@ -44530,18 +44313,22 @@
     1:2:int[] toIntArray():364:365 -> f
     1:1:int removeInt(int):353:353 -> g
     1:2:int getInt(int):342:343 -> getInt
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376:376 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():332 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376:376 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376:376 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376 -> iterator
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> iterator
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376 -> iterator
     3:3:java.util.Iterator iterator():332 -> iterator
-    1:1:java.util.ListIterator listIterator():332:332 -> listIterator
-    2:2:java.util.ListIterator listIterator(int):332:332 -> listIterator
+    1:1:java.util.ListIterator listIterator(int):332:332 -> 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 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
-    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):382:383 -> listIterator
-    7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):381:381 -> listIterator
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):382 -> listIterator
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):383:383 -> listIterator
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):381:381 -> listIterator
+    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> listIterator
+    6:6:java.util.ListIterator listIterator():332 -> 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
@@ -44885,10 +44672,11 @@
     2:4:boolean rem(long):87 -> c
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:7:int hashCode():57:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap -> com.android.tools.r8.E.a.a.a.g.k:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.E.a.a.a.g.i:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.g.j:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.E.a.a.a.g.m:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceFunction -> com.android.tools.r8.E.a.a.a.g.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap -> com.android.tools.r8.E.a.a.a.g.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.E.a.a.a.g.j:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.g.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.E.a.a.a.g.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
     java.lang.Object[] value -> b
     float f -> h
@@ -44958,7 +44746,7 @@
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():794:815 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.g.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.g.m:
     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
@@ -44966,7 +44754,7 @@
     1:1:java.util.Iterator iterator():794:794 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.g.m$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.g.n$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>
@@ -44974,13 +44762,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.g.m$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.g.n$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):721:722 -> <init>
     1:1:java.lang.Long next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
     1:1:long nextLong():727:727 -> nextLong
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.E.a.a.a.g.m$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.E.a.a.a.g.n$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>
@@ -44989,7 +44777,7 @@
     1:1:java.util.Iterator iterator():737:737 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():740:740 -> iterator
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.g.m$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.g.n$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>
@@ -45000,7 +44788,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.g.m$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.g.n$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>
@@ -45010,7 +44798,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.g.m$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.g.n$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
@@ -45031,11 +44819,11 @@
     25:25:void remove():580 -> remove
     26:27:void remove():583:584 -> remove
     28:28:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.g.m$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.g.n$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.E.a.a.a.g.o:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.E.a.a.a.g.p:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -45064,7 +44852,7 @@
     3:4:java.util.ListIterator listIterator(int):48 -> listIterator
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.E.a.a.a.g.n:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.E.a.a.a.g.o:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -45083,15 +44871,17 @@
     1:1:int previousIndex():520:520 -> previousIndex
     1:9:void remove():534:542 -> remove
     10:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.E.a.a.a.g.p:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.E.a.a.a.g.q:
     long previousLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.E.a.a.a.g.q:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.E.a.a.a.g.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.E.a.a.a.g.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.E.a.a.a.g.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.E.a.a.a.g.t:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long set(int,long) -> b
     long removeLong(int) -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.E.a.a.a.g.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.E.a.a.a.g.u:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongStack -> com.android.tools.r8.E.a.a.a.g.v:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.E.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>
@@ -45112,10 +44902,7 @@
     1:1:int hashCode():310:310 -> hashCode
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> hashCode
     2:2:int hashCode():311 -> hashCode
-    3:3:int hashCode():311:311 -> hashCode
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet.iterator():136:136 -> hashCode
-    4:4:int hashCode():311 -> hashCode
-    5:5:int hashCode():313:313 -> hashCode
+    3:5:int hashCode():311:313 -> hashCode
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Boolean):123:125 -> put
@@ -45136,13 +44923,10 @@
     1:1:java.lang.String toString():328:328 -> toString
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> toString
     2:2:java.lang.String toString():329 -> toString
-    3:3:java.lang.String toString():329:329 -> toString
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet.iterator():136:136 -> toString
-    4:4:java.lang.String toString():329 -> toString
-    5:15:java.lang.String toString():330:340 -> toString
-    16:16:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> toString
-    16:16:java.lang.String toString():341 -> toString
-    17:20:java.lang.String toString():341:344 -> toString
+    3:14:java.lang.String toString():329:340 -> toString
+    15:15:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> toString
+    15:15:java.lang.String toString():341 -> toString
+    16:19:java.lang.String toString():341:344 -> toString
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry -> com.android.tools.r8.E.a.a.a.h.a:
     java.lang.Object key -> a
     boolean value -> b
@@ -45533,8 +45317,10 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.E.a.a.a.h.z:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.E.a.a.a.h.C:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanFunction -> com.android.tools.r8.E.a.a.a.h.z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.E.a.a.a.h.B:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.h.A:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.E.a.a.a.h.E:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -45565,8 +45351,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.E.a.a.a.h.A:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.E.a.a.a.h.C$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.E.a.a.a.h.C:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.E.a.a.a.h.E$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>
@@ -45576,7 +45362,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.E.a.a.a.h.B:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.E.a.a.a.h.D:
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> c
     int curr -> a
@@ -45588,10 +45374,10 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.E.a.a.a.h.D:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.E.a.a.a.h.F:
     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.E.a.a.a.h.F:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.E.a.a.a.h.H:
     float f -> l
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
@@ -45669,7 +45455,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.E:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.G:
     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:void clear():1614:1614 -> clear
@@ -45677,7 +45463,7 @@
     1:1:java.util.Iterator iterator():1596:1596 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.F$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.H$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>
@@ -45692,14 +45478,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.E.a.a.a.h.F$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.H$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.E.a.a.a.h.F$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.E.a.a.a.h.H$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>
@@ -45721,7 +45507,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.E.a.a.a.h.F$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.H$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>
@@ -45740,7 +45526,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.E.a.a.a.h.F$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.H$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>
@@ -45768,7 +45554,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.E.a.a.a.h.F$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.H$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -45789,7 +45575,7 @@
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1185:1185 -> remove
     49:49:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.F$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.H$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
@@ -45804,12 +45590,15 @@
     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.E.a.a.a.h.H:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.E.a.a.a.h.K:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.E.a.a.a.h.G:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.E.a.a.a.h.I:
     int getIntValue() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.E.a.a.a.h.I:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.E.a.a.a.h.K:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.h.J:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap -> com.android.tools.r8.E.a.a.a.h.M:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.E.a.a.a.h.L:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectFunction -> com.android.tools.r8.E.a.a.a.h.N:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.E.a.a.a.h.P:
     float f -> l
     java.lang.Object[] value -> b
     int maxFill -> j
@@ -45885,7 +45674,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1529:1550 -> values
     1:22:java.util.Collection values():85 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.E.a.a.a.h.J:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.E.a.a.a.h.O:
     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
@@ -45893,7 +45682,7 @@
     1:1:java.util.Iterator iterator():1529:1529 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1532:1532 -> iterator
     1:1:int size():1537:1537 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.K$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.P$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>
@@ -45908,14 +45697,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.E.a.a.a.h.K$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.P$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.E.a.a.a.h.K$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.E.a.a.a.h.P$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>
@@ -45937,7 +45726,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.E.a.a.a.h.K$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.P$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>
@@ -45947,7 +45736,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.E.a.a.a.h.K$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.P$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>
@@ -45975,7 +45764,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.E.a.a.a.h.K$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.P$f:
     int index -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> e
     int next -> b
@@ -45996,17 +45785,18 @@
     1:49:void remove():1102:1150 -> remove
     50:50:void remove():1144:1144 -> remove
     51:51:void remove():1103:1103 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.K$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.P$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.E.a.a.a.h.M:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.E.a.a.a.h.L:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.E.a.a.a.h.N:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.E.a.a.a.h.P:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.E.a.a.a.h.S:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.E.a.a.a.h.Q:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap -> com.android.tools.r8.E.a.a.a.h.U:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.E.a.a.a.h.T:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.E.a.a.a.h.W:
     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
@@ -46026,7 +45816,7 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.E.a.a.a.h.O:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.E.a.a.a.h.V:
     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>
@@ -46034,15 +45824,15 @@
     1:2:java.lang.Object next():129:130 -> next
     3:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.E.a.a.a.h.Q:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.E.a.a.a.h.X:
     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.E.a.a.a.h.S:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.E.a.a.a.h.T:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections -> com.android.tools.r8.E.a.a.a.h.W:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.E.a.a.a.h.Y:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.E.a.a.a.h.Z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections -> com.android.tools.r8.E.a.a.a.h.c0:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):383:383 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):383:383 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.E.a.a.a.h.U:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.E.a.a.a.h.a0:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():55:55 -> iterator
@@ -46053,7 +45843,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.E.a.a.a.h.V:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.E.a.a.a.h.b0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):276:278 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):277:277 -> <init>
@@ -46066,13 +45856,8 @@
     1:1:int hashCode():364:364 -> hashCode
     1:1:boolean isEmpty():298:298 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307:307 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):762:762 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307:307 -> iterator
-    3:3:java.util.Iterator iterator():272 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):762:762 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307 -> iterator
-    4:4:java.util.Iterator iterator():272 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307:307 -> iterator
+    2:2:java.util.Iterator iterator():272 -> iterator
     1:1:boolean remove(java.lang.Object):288:288 -> remove
     1:1:boolean removeAll(java.util.Collection):349:349 -> removeAll
     1:1:boolean retainAll(java.util.Collection):354:354 -> retainAll
@@ -46080,35 +45865,37 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):329:329 -> toArray
     2:2:java.lang.Object[] toArray():334:334 -> toArray
     1:1:java.lang.String toString():359:359 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.E.a.a.a.h.X:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.E.a.a.a.h.a0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterable -> com.android.tools.r8.E.a.a.a.h.d0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.E.a.a.a.h.e0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.E.a.a.a.h.h0:
     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.E.a.a.a.h.Y:
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):762:762 -> a
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.E.a.a.a.h.f0:
     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.E.a.a.a.h.Z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.E.a.a.a.h.g0:
     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.ObjectListIterator -> com.android.tools.r8.E.a.a.a.h.b0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.E.a.a.a.h.c0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.E.a.a.a.h.e0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.E.a.a.a.h.i0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.E.a.a.a.h.j0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.E.a.a.a.h.l0:
     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.E.a.a.a.h.d0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.E.a.a.a.h.k0:
     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.E.a.a.a.h.f0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.E.a.a.a.h.h0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.E.a.a.a.h.m0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.E.a.a.a.h.o0:
     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.E.a.a.a.h.g0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.E.a.a.a.h.n0:
     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
@@ -46119,10 +45906,11 @@
     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.E.a.a.a.h.k0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.E.a.a.a.h.i0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.h.j0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.E.a.a.a.h.m0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunction -> com.android.tools.r8.E.a.a.a.h.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.E.a.a.a.h.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.E.a.a.a.h.q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.h.r0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.E.a.a.a.h.u0:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> k
     float f -> h
     java.lang.Object[] key -> a
@@ -46193,7 +45981,7 @@
     1:1:int size():384:384 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values():803:824 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.l0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.t0:
     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
@@ -46201,7 +45989,7 @@
     1:1:java.util.Iterator iterator():803:803 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():806:806 -> iterator
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.m0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.u0$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>
@@ -46209,11 +45997,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry next():614:614 -> next
     1:1:java.lang.Object next():609 -> next
     1:2:void remove():619:620 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.m0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.u0$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.E.a.a.a.h.m0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.E.a.a.a.h.u0$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>
@@ -46223,7 +46011,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():743:743 -> iterator
     1:3:boolean remove(java.lang.Object):758:760 -> remove
     1:1:int size():748:748 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.m0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.u0$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>
@@ -46241,7 +46029,7 @@
     5:5:java.lang.Boolean setValue(java.lang.Boolean):473:473 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):423 -> setValue
     1:1:java.lang.String toString():491:491 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.m0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.u0$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>
@@ -46251,7 +46039,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():636:636 -> iterator
     1:29:boolean remove(java.lang.Object):668:696 -> remove
     1:1:int size():705:705 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.m0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.u0$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
@@ -46272,13 +46060,13 @@
     24:24:void remove():589 -> remove
     25:26:void remove():592:593 -> remove
     27:27:void remove():585:585 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.m0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.u0$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):785:786 -> <init>
     1:1:java.lang.Boolean next():797:797 -> next
     1:1:java.lang.Object next():784 -> next
     1:1:boolean nextBoolean():791:791 -> nextBoolean
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.E.a.a.a.h.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.E.a.a.a.h.x0:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -46307,8 +46095,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.E.a.a.a.h.n0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.E.a.a.a.h.p0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.E.a.a.a.h.v0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.E.a.a.a.h.x0$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>
@@ -46318,7 +46106,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.E.a.a.a.h.o0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.E.a.a.a.h.w0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -46330,10 +46118,10 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.E.a.a.a.h.q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.E.a.a.a.h.y0:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.E.a.a.a.h.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.E.a.a.a.h.A0:
     float f -> l
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
@@ -46410,7 +46198,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.r0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.z0:
     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:void clear():1614:1614 -> clear
@@ -46418,7 +46206,7 @@
     1:1:java.util.Iterator iterator():1596:1596 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.s0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.A0$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>
@@ -46433,14 +46221,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.E.a.a.a.h.s0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.A0$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.E.a.a.a.h.s0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.E.a.a.a.h.A0$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>
@@ -46462,7 +46250,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.E.a.a.a.h.s0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.A0$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>
@@ -46481,7 +46269,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.E.a.a.a.h.s0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.A0$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>
@@ -46509,7 +46297,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.E.a.a.a.h.s0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.A0$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -46530,7 +46318,7 @@
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1185:1185 -> remove
     49:49:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.s0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.A0$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
@@ -46545,12 +46333,12 @@
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void set(java.lang.Integer):1559:1559 -> set
     2:2:void set(java.lang.Object):1544 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.E.a.a.a.h.v0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.E.a.a.a.h.D0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.E.a.a.a.h.t0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.E.a.a.a.h.B0:
     int getIntValue() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.h.u0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.E.a.a.a.h.x0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.E.a.a.a.h.C0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.E.a.a.a.h.F0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     java.lang.Object[] key -> b
@@ -46614,7 +46402,7 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.w0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.E.a.a.a.h.E0:
     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:void clear():866:866 -> clear
@@ -46622,7 +46410,7 @@
     1:1:java.util.Iterator iterator():848:848 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.x0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.E.a.a.a.h.F0$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>
@@ -46630,11 +46418,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.x0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.E.a.a.a.h.F0$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.E.a.a.a.h.x0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.E.a.a.a.h.F0$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>
@@ -46644,7 +46432,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.x0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.E.a.a.a.h.F0$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>
@@ -46663,7 +46451,7 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.x0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.E.a.a.a.h.F0$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>
@@ -46673,7 +46461,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.x0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.E.a.a.a.h.F0$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
@@ -46694,14 +46482,15 @@
     24:24:void remove():634 -> remove
     25:26:void remove():637:638 -> remove
     27:27:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.x0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.E.a.a.a.h.F0$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):830:831 -> <init>
     1:1:java.lang.Integer next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
     1:1:int nextInt():836:836 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.E.a.a.a.h.y0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.E.a.a.a.h.A0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap -> com.android.tools.r8.E.a.a.a.h.H0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.E.a.a.a.h.G0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.E.a.a.a.h.J0:
     java.lang.Object[] a -> b
     boolean wrapped -> a
     int size -> c
@@ -46737,7 +46526,7 @@
     1:3:java.lang.Object set(int,java.lang.Object):357:359 -> set
     4:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.E.a.a.a.h.z0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.E.a.a.a.h.I0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -46756,7 +46545,7 @@
     10:10:void remove():538:538 -> remove
     1:2:void set(java.lang.Object):533:534 -> set
     3:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.E.a.a.a.h.C0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.E.a.a.a.h.L0:
     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
@@ -46776,7 +46565,7 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.E.a.a.a.h.B0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.E.a.a.a.h.K0:
     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>
@@ -46784,8 +46573,8 @@
     1:2:java.lang.Object next():129:130 -> next
     3:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.E.a.a.a.h.D0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.E.a.a.a.h.E0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.E.a.a.a.h.M0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.E.a.a.a.h.N0:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():55:55 -> iterator
@@ -46795,7 +46584,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.E.a.a.a.h.F0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.E.a.a.a.h.O0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):276:278 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):277:277 -> <init>
@@ -46809,8 +46598,6 @@
     1:1:boolean isEmpty():298:298 -> isEmpty
     1:1:java.util.Iterator iterator():272:272 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307:307 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):762:762 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307 -> iterator
     1:1:boolean remove(java.lang.Object):288:288 -> remove
     1:1:boolean removeAll(java.util.Collection):349:349 -> removeAll
     1:1:boolean retainAll(java.util.Collection):354:354 -> retainAll
@@ -46818,9 +46605,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.E.a.a.a.h.G0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.E.a.a.a.h.P0:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.E.a.a.a.h.I0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.E.a.a.a.h.R0:
     java.lang.Object[] key -> a
     float f -> g
     int size -> f
@@ -46870,8 +46657,8 @@
     2:5:boolean remove(java.lang.Object):332 -> remove
     6:13:boolean remove(java.lang.Object):336:343 -> remove
     1:1:int size():380:380 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.E.a.a.a.h.H0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.E.a.a.a.h.I0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.E.a.a.a.h.Q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.E.a.a.a.h.R0$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
@@ -46892,16 +46679,16 @@
     23:23:void remove():500 -> remove
     24:25:void remove():503:504 -> remove
     26:26:void remove():496:496 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.E.a.a.a.h.J0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.E.a.a.a.h.L0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.E.a.a.a.h.S0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.E.a.a.a.h.U0:
     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.E.a.a.a.h.K0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.E.a.a.a.h.T0:
     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.E.a.a.a.h.M0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.E.a.a.a.h.V0:
 com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.F.b:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
@@ -46913,16 +46700,16 @@
     com.android.tools.r8.dex.Marker marker -> f
     1:1:void <clinit>():62:62 -> <clinit>
     1:9:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.Marker,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):86:94 -> <init>
-    1:1:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():66:66 -> a
+    1:1:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():64:64 -> a
     1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):349 -> a
     2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):348:348 -> a
-    3:3:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():66:66 -> a
+    3:3:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():64:64 -> a
     3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):351 -> a
     4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):350:357 -> a
     12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):355:355 -> a
     13:17:void write(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):98:102 -> a
     18:26:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):108:116 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     27:27:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):116 -> a
     28:28:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):119:119 -> a
     29:40:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117:128 -> a
@@ -46941,7 +46728,7 @@
     123:127:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):195 -> a
     128:128:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:196 -> a
     129:132:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):200:203 -> a
-    133:133:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    133:133:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     133:133:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):204 -> a
     134:138:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):203:207 -> a
     139:146:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):222:229 -> a
@@ -47199,11 +46986,13 @@
     14005:14005:int com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.mapCapacity(int):134:134 -> a
     14005:14005:int com.android.tools.r8.jetbrains.kotlin.collections.MapsKt.mapCapacity(int):0 -> a
     14006:14007:java.util.Collection com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toCollection(java.lang.Iterable,java.util.Collection):1153:1154 -> a
-    1:2:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1184:1185 -> b
-    3:1196:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1193 -> b
-    3:1196:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1185 -> b
-    1197:1197:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1186:1186 -> b
-    1198:1199:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.indexOf(int[],int):1317:1318 -> b
+    1:1:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.SetsKt__SetsKt.emptySet():34:34 -> b
+    1:1:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.SetsKt.emptySet():0 -> b
+    2:3:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1184:1185 -> b
+    4:1197:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1193 -> b
+    4:1197:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1185 -> b
+    1198:1198:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1186:1186 -> b
+    1199:1200:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.indexOf(int[],int):1317:1318 -> b
     1:1207:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):0:1206 -> c
     1:1207:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toSet(java.lang.Iterable):0 -> c
     1208:1208:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1205:1205 -> c
@@ -47498,13 +47287,14 @@
     1:1:java.lang.String toString():54:54 -> toString
 com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.G.a.r.a:
 com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.G.a.r.b:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.G.a.r.e:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.G.a.r.d:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.G.a.r.c:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.G.a.r.f:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty$Getter -> com.android.tools.r8.G.a.r.c:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.G.a.r.e:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.G.a.r.d:
 com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.G.b.a.a:
     1:1:void <init>(java.lang.String,java.lang.Throwable):8:8 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.G.b.a.b.a.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.G.b.a.b.a.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.G.b.a.b.a.m:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List argument_ -> d
@@ -47565,7 +47355,7 @@
     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.G.b.a.b.a.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.G.b.a.b.a.j:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     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 -> f
@@ -47901,7 +47691,9 @@
     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.G.b.a.b.a.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$ValueOrBuilder -> com.android.tools.r8.G.b.a.b.a.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$ArgumentOrBuilder -> com.android.tools.r8.G.b.a.b.a.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.G.b.a.b.a.l:
     java.util.List argument_ -> d
     int bitField0_ -> b
     int id_ -> c
@@ -47942,7 +47734,8 @@
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4377:4389 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder create():4348:4348 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder access$4200():4334 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.G.b.a.b.a.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$AnnotationOrBuilder -> com.android.tools.r8.G.b.a.b.a.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.G.b.a.b.a.q:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class defaultInstance -> u
     java.util.List versionRequirement_ -> r
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -48091,11 +47884,11 @@
     1:1:boolean hasVersionRequirementTable():9340:9340 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class getDefaultInstance():8511:8511 -> q
     1:16:void initFields():9350:9365 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.G.b.a.b.a.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.G.b.a.b.a.o:
     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.G.b.a.b.a.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.G.b.a.b.a.p:
     java.util.List sealedSubclassFqName_ -> q
     java.util.List enumEntry_ -> p
     java.util.List typeAlias_ -> o
@@ -48245,7 +48038,8 @@
     1:79:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class buildPartial():9754:9832 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder create():9697:9697 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder access$8700():9684 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.G.b.a.b.a.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ClassOrBuilder -> com.android.tools.r8.G.b.a.b.a.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.G.b.a.b.a.u:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List versionRequirement_ -> f
     java.util.List valueParameter_ -> e
@@ -48299,11 +48093,11 @@
     1:1:boolean hasFlags():13501:13501 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstance():13381:13381 -> i
     1:3:void initFields():13586:13588 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.G.b.a.b.a.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.G.b.a.b.a.s:
     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.G.b.a.b.a.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.G.b.a.b.a.t:
     java.util.List valueParameter_ -> f
     int bitField0_ -> d
     int flags_ -> e
@@ -48346,7 +48140,8 @@
     1:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():13772:13789 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder create():13741:13741 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder access$12500():13728 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.G.b.a.b.a.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ConstructorOrBuilder -> com.android.tools.r8.G.b.a.b.a.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.G.b.a.b.a.y:
     java.util.List effect_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract defaultInstance -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> e
@@ -48393,11 +48188,11 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():23312 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getDefaultInstance():23325:23325 -> e
     1:1:void initFields():23439:23439 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.G.b.a.b.a.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.G.b.a.b.a.w:
     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.G.b.a.b.a.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.G.b.a.b.a.x:
     java.util.List effect_ -> c
     int bitField0_ -> b
     1:91:void <init>():23558:23648 -> <init>
@@ -48432,7 +48227,8 @@
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract buildPartial():23592:23598 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder create():23565:23565 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22300():23551 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.G.b.a.b.a.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ContractOrBuilder -> com.android.tools.r8.G.b.a.b.a.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.G.b.a.b.a.E:
     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
@@ -48498,11 +48294,11 @@
     1:1:boolean hasKind():24216:24216 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect getDefaultInstance():23855:23855 -> k
     1:4:void initFields():24226:24229 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.G.b.a.b.a.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.G.b.a.b.a.A:
     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.G.b.a.b.a.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.G.b.a.b.a.B:
     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
@@ -48567,7 +48363,7 @@
     1:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect buildPartial():24415:24435 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder create():24382:24382 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$22800():24368 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.G.b.a.b.a.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.G.b.a.b.a.C:
     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 RETURNS_CONSTANT -> b
@@ -48578,7 +48374,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.G.b.a.b.a.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.G.b.a.b.a.D:
     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 AT_LEAST_ONCE -> d
@@ -48589,7 +48385,8 @@
     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.G.b.a.b.a.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EffectOrBuilder -> com.android.tools.r8.G.b.a.b.a.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.G.b.a.b.a.I:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry defaultInstance -> f
@@ -48629,11 +48426,11 @@
     1:1:boolean hasName():20550:20550 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstance():20471:20471 -> i
     1:1:void initFields():20560:20560 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.G.b.a.b.a.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.G.b.a.b.a.G:
     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.G.b.a.b.a.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.G.b.a.b.a.H:
     int bitField0_ -> d
     int name_ -> e
     1:1:void <init>():20681:20681 -> <init>
@@ -48664,7 +48461,8 @@
     1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry buildPartial():20715:20722 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder create():20688:20688 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder access$19200():20675 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.G.b.a.b.a.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntryOrBuilder -> com.android.tools.r8.G.b.a.b.a.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.G.b.a.b.a.N:
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue constantValue_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -48750,11 +48548,11 @@
     1:1:boolean hasValueParameterReference():25191:25191 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getDefaultInstance():24960:24960 -> o
     1:7:void initFields():25391:25397 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.G.b.a.b.a.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.G.b.a.b.a.K:
     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.G.b.a.b.a.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.G.b.a.b.a.L:
     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
@@ -48834,7 +48632,7 @@
     1:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression buildPartial():25621:25654 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder create():25582:25582 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder access$23700():25568 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.G.b.a.b.a.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.G.b.a.b.a.M:
     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 FALSE -> c
@@ -48845,7 +48643,8 @@
     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.G.b.a.b.a.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ExpressionOrBuilder -> com.android.tools.r8.G.b.a.b.a.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.G.b.a.b.a.S:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> q
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int receiverTypeId_ -> k
@@ -48969,11 +48768,11 @@
     1:1:boolean hasTypeTable():14727:14727 -> x
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getDefaultInstance():14327:14327 -> y
     1:12:void initFields():14786:14797 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.G.b.a.b.a.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.G.b.a.b.a.P:
     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.G.b.a.b.a.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.G.b.a.b.a.Q:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     int returnTypeId_ -> i
@@ -49115,7 +48914,8 @@
     1:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function buildPartial():15096:15150 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder create():15047:15047 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder access$13300():15034 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.G.b.a.b.a.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$FunctionOrBuilder -> com.android.tools.r8.G.b.a.b.a.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.G.b.a.b.a.W:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> h
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -49190,11 +48990,11 @@
     1:1:boolean hasVersionRequirementTable():11825:11825 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package getDefaultInstance():11572:11572 -> k
     1:5:void initFields():11835:11839 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.G.b.a.b.a.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.G.b.a.b.a.U:
     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.G.b.a.b.a.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.G.b.a.b.a.V:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
     java.util.List property_ -> f
     java.util.List function_ -> e
@@ -49278,7 +49078,8 @@
     1:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package buildPartial():12054:12080 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder create():12019:12019 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder access$10800():12006 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.G.b.a.b.a.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$PackageOrBuilder -> com.android.tools.r8.G.b.a.b.a.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.G.b.a.b.a.a0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property defaultInstance -> q
     int setterFlags_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter setterValueParameter_ -> l
@@ -49393,11 +49194,11 @@
     1:1:boolean hasReturnTypeId():16579:16579 -> x
     1:1:boolean hasSetterFlags():16713:16713 -> y
     1:1:boolean hasSetterValueParameter():16659:16659 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.G.b.a.b.a.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.G.b.a.b.a.Y:
     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.G.b.a.b.a.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.G.b.a.b.a.Z:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -49520,7 +49321,8 @@
     1:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property buildPartial():17055:17108 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder create():17006:17006 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder access$15000():16993 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.G.b.a.b.a.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$PropertyOrBuilder -> com.android.tools.r8.G.b.a.b.a.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.G.b.a.b.a.j0:
     int outerTypeId_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int typeAliasName_ -> l
@@ -49650,11 +49452,11 @@
     1:1:boolean hasFlexibleTypeCapabilitiesId():5728:5728 -> x
     1:1:boolean hasFlexibleUpperBound():5748:5748 -> y
     1:1:boolean hasFlexibleUpperBoundId():5763:5763 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.G.b.a.b.a.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.G.b.a.b.a.c0:
     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.G.b.a.b.a.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.G.b.a.b.a.g0:
     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$Type$Argument$Projection projection_ -> c
@@ -49711,11 +49513,11 @@
     1:1:boolean hasTypeId():5257:5257 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument getDefaultInstance():5041:5041 -> k
     1:3:void initFields():5267:5269 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.G.b.a.b.a.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.G.b.a.b.a.d0:
     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.G.b.a.b.a.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.G.b.a.b.a.e0:
     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
@@ -49769,7 +49571,7 @@
     1:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5440:5455 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder create():5409:5409 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder access$5000():5395 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.G.b.a.b.a.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.G.b.a.b.a.f0:
     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
@@ -49782,7 +49584,8 @@
     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.G.b.a.b.a.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$ArgumentOrBuilder -> com.android.tools.r8.G.b.a.b.a.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.G.b.a.b.a.i0:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -49911,7 +49714,7 @@
     1:61:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type buildPartial():6259:6319 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder create():6206:6206 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder access$5700():6193 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.G.b.a.b.a.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.G.b.a.b.a.m0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int expandedTypeId_ -> j
     int underlyingTypeId_ -> h
@@ -50010,11 +49813,11 @@
     1:1:boolean hasUnderlyingTypeId():19283:19283 -> r
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstance():19027:19027 -> s
     1:9:void initFields():19392:19400 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.G.b.a.b.a.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.G.b.a.b.a.k0:
     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.G.b.a.b.a.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.G.b.a.b.a.l0:
     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
@@ -50116,7 +49919,9 @@
     1:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias buildPartial():19660:19702 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder create():19617:19617 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$17800():19604 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.G.b.a.b.a.d0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAliasOrBuilder -> com.android.tools.r8.G.b.a.b.a.n0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeOrBuilder -> com.android.tools.r8.G.b.a.b.a.o0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.G.b.a.b.a.s0:
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter defaultInstance -> k
@@ -50189,11 +49994,11 @@
     1:1:boolean hasVariance():7510:7510 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getDefaultInstance():7264:7264 -> o
     1:6:void initFields():7578:7583 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.G.b.a.b.a.a0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.G.b.a.b.a.p0:
     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.G.b.a.b.a.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.G.b.a.b.a.q0:
     int name_ -> f
     java.util.List upperBoundId_ -> j
     java.util.List upperBound_ -> i
@@ -50254,7 +50059,7 @@
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7811:7840 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder create():7774:7774 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder access$7600():7761 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.G.b.a.b.a.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.G.b.a.b.a.r0:
     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 OUT -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance INV -> d
@@ -50265,7 +50070,8 @@
     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.G.b.a.b.a.g0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameterOrBuilder -> com.android.tools.r8.G.b.a.b.a.t0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.G.b.a.b.a.w0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List type_ -> c
@@ -50321,11 +50127,11 @@
     1:1:boolean hasFirstNullable():12868:12868 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getDefaultInstance():12738:12738 -> g
     1:2:void initFields():12883:12884 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.G.b.a.b.a.e0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.G.b.a.b.a.u0:
     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.G.b.a.b.a.f0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.G.b.a.b.a.v0:
     java.util.List type_ -> c
     int firstNullable_ -> d
     int bitField0_ -> b
@@ -50364,7 +50170,8 @@
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13046:13058 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder create():13017:13017 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder access$11800():13003 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.G.b.a.b.a.j0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTableOrBuilder -> com.android.tools.r8.G.b.a.b.a.x0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.G.b.a.b.a.A0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter defaultInstance -> k
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -50445,11 +50252,11 @@
     1:1:boolean hasVarargElementTypeId():18270:18270 -> r
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstance():18061:18061 -> s
     1:6:void initFields():18280:18285 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.G.b.a.b.a.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.G.b.a.b.a.y0:
     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.G.b.a.b.a.i0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.G.b.a.b.a.z0:
     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
@@ -50529,7 +50336,8 @@
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18501:18528 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder create():18464:18464 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder access$16700():18451 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.G.b.a.b.a.o0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameterOrBuilder -> com.android.tools.r8.G.b.a.b.a.B0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.G.b.a.b.a.G0:
     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
@@ -50592,11 +50400,11 @@
     1:1:boolean hasVersionKind():21311:21311 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement getDefaultInstance():20937:20937 -> q
     1:6:void initFields():21326:21331 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.G.b.a.b.a.k0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.G.b.a.b.a.C0:
     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.G.b.a.b.a.l0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.G.b.a.b.a.D0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     int errorCode_ -> f
     int message_ -> g
@@ -50651,7 +50459,7 @@
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21523:21550 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder create():21486:21486 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder access$19800():21472 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.G.b.a.b.a.m0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.G.b.a.b.a.E0:
     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
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level WARNING -> b
@@ -50662,7 +50470,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.G.b.a.b.a.n0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.G.b.a.b.a.F0:
     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
@@ -50673,7 +50481,8 @@
     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.G.b.a.b.a.r0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementOrBuilder -> com.android.tools.r8.G.b.a.b.a.H0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.G.b.a.b.a.K0:
     java.util.List requirement_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -50715,11 +50524,11 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():21944 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getDefaultInstance():21957:21957 -> e
     1:1:void initFields():22071:22071 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.G.b.a.b.a.p0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.G.b.a.b.a.I0:
     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.G.b.a.b.a.q0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.G.b.a.b.a.J0:
     java.util.List requirement_ -> c
     int bitField0_ -> b
     1:85:void <init>():22184:22268 -> <init>
@@ -50750,7 +50559,8 @@
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():22218:22224 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder create():22191:22191 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$20900():22177 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.G.b.a.b.a.s0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTableOrBuilder -> com.android.tools.r8.G.b.a.b.a.L0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.G.b.a.b.a.M0.a:
     java.util.List rest -> d
     int[] numbers -> e
     int minor -> b
@@ -50767,7 +50577,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.jvm.JvmProtoBuf -> com.android.tools.r8.G.b.a.b.a.t0.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.G.b.a.b.a.N0.w:
     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
@@ -50782,8 +50592,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.G.b.a.b.a.t0.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.G.b.a.b.a.t0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.G.b.a.b.a.N0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.G.b.a.b.a.N0.d:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     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 -> f
@@ -50833,11 +50643,11 @@
     1:1:boolean hasName():2691:2691 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature getDefaultInstance():2607:2607 -> i
     1:2:void initFields():2724:2725 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.G.b.a.b.a.t0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.G.b.a.b.a.N0.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.G.b.a.b.a.t0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.G.b.a.b.a.N0.c:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -50872,7 +50682,8 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2881:2892 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder create():2852:2852 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder access$2500():2838 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.G.b.a.b.a.t0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignatureOrBuilder -> com.android.tools.r8.G.b.a.b.a.N0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.G.b.a.b.a.N0.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature defaultInstance -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -50922,11 +50733,11 @@
     1:1:boolean hasName():2229:2229 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getDefaultInstance():2145:2145 -> i
     1:2:void initFields():2262:2263 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.G.b.a.b.a.t0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.G.b.a.b.a.N0.f:
     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.G.b.a.b.a.t0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.G.b.a.b.a.N0.g:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -50961,7 +50772,8 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2419:2430 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder create():2390:2390 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder access$1800():2376 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.G.b.a.b.a.t0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignatureOrBuilder -> com.android.tools.r8.G.b.a.b.a.N0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.G.b.a.b.a.N0.l:
     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$JvmPropertySignature defaultInstance -> h
@@ -51018,11 +50830,11 @@
     1:1:boolean hasSyntheticMethod():3232:3232 -> l
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature getDefaultInstance():3087:3087 -> m
     1:4:void initFields():3276:3279 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.G.b.a.b.a.t0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.G.b.a.b.a.N0.j:
     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.G.b.a.b.a.t0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.G.b.a.b.a.N0.k:
     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
@@ -51101,7 +50913,8 @@
     1:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3453:3472 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder create():3420:3420 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder access$3200():3406 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.G.b.a.b.a.t0.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignatureOrBuilder -> com.android.tools.r8.G.b.a.b.a.N0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.G.b.a.b.a.N0.u:
     java.util.List record_ -> 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
@@ -51147,11 +50960,11 @@
     1:1:java.util.List getRecordList():1568:1568 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getDefaultInstance():83:83 -> g
     1:2:void initFields():1633:1634 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.G.b.a.b.a.t0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.G.b.a.b.a.N0.n:
     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.G.b.a.b.a.t0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.G.b.a.b.a.N0.o:
     java.util.List localName_ -> d
     java.util.List record_ -> c
     int bitField0_ -> b
@@ -51186,7 +50999,7 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1804:1815 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder create():1775:1775 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder access$1200():1761 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.G.b.a.b.a.t0.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.G.b.a.b.a.N0.s:
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.lang.Object string_ -> e
@@ -51249,11 +51062,11 @@
     1:1:boolean hasString():626:626 -> k
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record getDefaultInstance():341:341 -> l
     1:6:void initFields():773:778 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.G.b.a.b.a.t0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.G.b.a.b.a.N0.p:
     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.G.b.a.b.a.t0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.G.b.a.b.a.N0.q:
     java.lang.Object string_ -> e
     int predefinedIndex_ -> d
     java.util.List replaceChar_ -> h
@@ -51303,7 +51116,7 @@
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record buildPartial():998:1027 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder create():961:961 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder access$200():947 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.G.b.a.b.a.t0.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.G.b.a.b.a.N0.r:
     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 DESC_TO_CLASS_ID -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation INTERNAL_TO_CLASS_ID -> c
@@ -51314,9 +51127,12 @@
     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.G.b.a.b.a.t0.s.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$RecordOrBuilder -> com.android.tools.r8.G.b.a.b.a.N0.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypesOrBuilder -> com.android.tools.r8.G.b.a.b.a.N0.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.G.b.a.b.a.N0.x.a:
     boolean $assertionsDisabled -> a
     1:13:void <clinit>():15:27 -> <clinit>
+    void $$$reportNull$$$0(int) -> a
     1:4:byte[] decodeBytes(java.lang.String[]):179:182 -> a
     5:82:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.UtfEncodingKt.stringsToBytes(java.lang.String[]):0:77 -> a
     5:82:byte[] decodeBytes(java.lang.String[]):182 -> a
@@ -51329,12 +51145,14 @@
     105:105:byte[] decodeBytes(java.lang.String[]):191 -> a
     106:122:byte[] decode7to8(byte[]):247:263 -> a
     106:122:byte[] decodeBytes(java.lang.String[]):192 -> a
+    123:123:byte[] combineStringArrayIntoBytes(java.lang.String[]):0:0 -> a
+    123:123:byte[] decodeBytes(java.lang.String[]):189 -> a
     1:2:java.lang.String[] dropMarker(java.lang.String[]):199:200 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.G.b.a.b.a.t0.s.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.G.b.a.b.a.N0.x.b:
     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.JvmMetadataVersion -> com.android.tools.r8.G.b.a.b.a.t0.s.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.G.b.a.b.a.N0.x.c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> g
     boolean isStrictSemantics -> f
     1:1:void <clinit>():30:30 -> <clinit>
@@ -51345,7 +51163,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.G.b.a.b.a.t0.s.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.G.b.a.b.a.N0.x.d:
     java.util.List PREDEFINED_STRINGS -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes types -> a
     1:31:void <clinit>():78:108 -> <clinit>
@@ -51375,7 +51193,7 @@
     110:113:void <clinit>():117:120 -> <clinit>
     114:114:void <clinit>():111:111 -> <clinit>
     1:16:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.lang.String[]):13:28 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.G.b.a.b.a.t0.s.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.G.b.a.b.a.N0.x.e:
     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>
@@ -51849,7 +51667,7 @@
     3:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet clone():135:145 -> clone
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet newFieldSet():92:92 -> d
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.G.b.a.b.b.q:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.G.b.a.b.b.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.G.b.a.b.b.y:
     1:1:void <init>():53:53 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):56:56 -> <init>
     1:1:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):73:73 -> a
@@ -51965,7 +51783,8 @@
     2:2:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):246:246 -> a
     1:1:boolean extensionsAreInitialized():233:233 -> e
     1:1:void makeExtensionsImmutable():261:261 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.G.b.a.b.b.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessageOrBuilder -> com.android.tools.r8.G.b.a.b.b.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.G.b.a.b.b.w:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap enumTypeMap -> a
     int number -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType type -> c
@@ -51975,25 +51794,24 @@
     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.G.b.a.b.b.w:
-    java.lang.Object defaultValue -> b
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite messageDefaultInstance -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.G.b.a.b.b.x:
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite containingTypeDefaultInstance -> a
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite messageDefaultInstance -> b
     1:22:void <init>(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.GeneratedMessageLite$ExtensionDescriptor,java.lang.Class):786:807 -> <init>
     23:23:void <init>(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.GeneratedMessageLite$ExtensionDescriptor,java.lang.Class):790:790 -> <init>
     1:1:java.lang.Object singularToFieldSetType(java.lang.Object):885:885 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> a
     2:2:java.lang.Object singularToFieldSetType(java.lang.Object):885 -> a
     3:4:java.lang.Object singularToFieldSetType(java.lang.Object):885:886 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.G.b.a.b.b.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.G.b.a.b.b.B:
     byte[] EMPTY_BYTE_ARRAY -> a
     1:6:void <clinit>():383:388 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.G.b.a.b.b.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.G.b.a.b.b.z:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.G.b.a.b.b.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.G.b.a.b.b.A:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite findValueByNumber(int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.G.b.a.b.b.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.G.b.a.b.b.C:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite unfinishedMessage -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
     2:2:void <init>(java.lang.String):43:43 -> <init>
@@ -52002,7 +51820,7 @@
     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.LiteralByteString -> com.android.tools.r8.G.b.a.b.b.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.G.b.a.b.b.F:
     int hash -> d
     byte[] bytes -> c
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -52024,8 +51842,8 @@
     1:1:java.util.Iterator iterator():52:52 -> iterator
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator iterator():307:307 -> iterator
     1:1:int size():76:76 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.G.b.a.b.b.C:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.G.b.a.b.b.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.G.b.a.b.b.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.G.b.a.b.b.E:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> c
     int limit -> b
     int position -> a
@@ -52036,12 +51854,12 @@
     1:1:java.lang.Object next():310 -> next
     1:3:byte nextByte():330:332 -> nextByte
     1:1:void remove():337:337 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.G.b.a.b.b.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.G.b.a.b.b.G:
     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.G.b.a.b.b.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.G.b.a.b.b.H:
     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.G.b.a.b.b.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.G.b.a.b.b.M:
     int[] minLengthByDepth -> i
     int hash -> h
     int leftLength -> f
@@ -52074,8 +51892,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.G.b.a.b.b.H:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.G.b.a.b.b.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.G.b.a.b.b.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.G.b.a.b.b.J:
     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>
@@ -52097,7 +51915,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.G.b.a.b.b.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.G.b.a.b.b.K:
     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>
@@ -52118,7 +51936,7 @@
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765:765 -> next
     15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> next
     1:1:void remove():770:770 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.G.b.a.b.b.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.G.b.a.b.b.L:
     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
@@ -52129,7 +51947,7 @@
     1:1:java.lang.Object next():782 -> next
     1:5:byte nextByte():803:807 -> nextByte
     1:1:void remove():811:811 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.G.b.a.b.b.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.G.b.a.b.b.S:
     java.util.List entryList -> b
     java.util.Map overflowEntries -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet lazyEntrySet -> e
@@ -52164,7 +51982,7 @@
     1:5:java.util.SortedMap getOverflowEntriesMutable():377:381 -> 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.G.b.a.b.b.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.G.b.a.b.b.N:
     1:1:void <init>(int):100:100 -> <init>
     1:5:void makeImmutable():104:108 -> l
     6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> l
@@ -52174,20 +51992,20 @@
     14:14:void makeImmutable():115 -> l
     15:20:void makeImmutable():116:121 -> l
     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.G.b.a.b.b.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.G.b.a.b.b.Q:
     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.G.b.a.b.b.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.G.b.a.b.b.O:
     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.G.b.a.b.b.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.G.b.a.b.b.P:
     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.G.b.a.b.b.Q$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.G.b.a.b.b.S$a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Comparable key -> a
@@ -52211,7 +52029,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.G.b.a.b.b.Q$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.G.b.a.b.b.S$b:
     java.util.Iterator lazyOverflowIterator -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     boolean nextCalledBeforeRemove -> b
@@ -52224,7 +52042,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.G.b.a.b.b.Q$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.G.b.a.b.b.S$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>
@@ -52236,9 +52054,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.G.b.a.b.b.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.G.b.a.b.b.T:
     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.G.b.a.b.b.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.G.b.a.b.b.U:
     1:6:int incompleteStateFor(byte[],int,int):341:346 -> a
     7:7:int incompleteStateFor(byte[],int,int):344:344 -> a
     1:1:int partialIsValidUtf8(byte[],int,int):252:252 -> b
@@ -52246,10 +52064,10 @@
     2:38:int partialIsValidUtf8NonAscii(byte[],int,int):270:306 -> b
     2:38:int partialIsValidUtf8(byte[],int,int):256 -> b
     2:38:boolean isValidUtf8(byte[],int,int):122 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.G.b.a.b.b.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.G.b.a.b.b.c0:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.G.b.a.b.b.U:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.G.b.a.b.b.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.G.b.a.b.b.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.G.b.a.b.b.a0:
     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
@@ -52278,33 +52096,32 @@
     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.G.b.a.b.b.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.G.b.a.b.b.W:
     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.G.b.a.b.b.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.G.b.a.b.b.X:
     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.G.b.a.b.b.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.G.b.a.b.b.Y:
     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.G.b.a.b.b.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.G.b.a.b.b.Z:
     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.G.b.a.b.b.a0:
-    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
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType[] $VALUES -> k
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType DOUBLE -> e
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType MESSAGE -> j
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BYTE_STRING -> h
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType ENUM -> i
-    java.lang.Object defaultDefault -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType INT -> b
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType LONG -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.G.b.a.b.b.b0:
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType STRING -> f
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BYTE_STRING -> g
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType DOUBLE -> d
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BOOLEAN -> e
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType[] $VALUES -> j
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType ENUM -> h
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType MESSAGE -> i
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType LONG -> b
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType FLOAT -> c
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType INT -> a
     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>
+    1:1:void <init>(java.lang.String,int,java.lang.Object):88:88 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.G.b.a.c.a:
     int[] metadataVersion -> b
     java.lang.String[] data2 -> d
@@ -52325,6 +52142,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader getHeader():25:25 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.G.b.a.c.c:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):29:30 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.G.b.a.c.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -52341,6 +52159,7 @@
     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.G.b.a.c.f:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):84:85 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.G.b.a.c.e:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -52356,6 +52175,7 @@
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.G.b.a.c.g:
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):217:221 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.G.b.a.c.i:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):260:261 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.G.b.a.c.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -52369,6 +52189,7 @@
     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.G.b.a.c.k:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):140:141 -> <init>
     1:1:boolean isLambda():159:159 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.G.b.a.c.j:
@@ -52416,23 +52237,25 @@
     2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106:106 -> a
     3:3:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withValuesConvertedBy(com.android.tools.r8.joptsimple.ValueConverter):126:126 -> a
     3:3:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106 -> a
-    4:4:void addDefaultValue(java.lang.Object):248:248 -> a
-    4:4:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
-    5:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):224:224 -> a
-    5:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
-    6:6:void addDefaultValue(java.lang.Object):248:248 -> a
-    6:6:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):225 -> a
+    4:4:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withValuesConvertedBy(com.android.tools.r8.joptsimple.ValueConverter):124:124 -> a
+    4:4:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106 -> a
+    5:5:void addDefaultValue(java.lang.Object):248:248 -> a
+    5:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
+    6:6:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):224:224 -> a
     6:6:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
-    7:7:void com.android.tools.r8.joptsimple.internal.Objects.ensureNotNull(java.lang.Object):44:44 -> a
-    7:7:void addDefaultValue(java.lang.Object):247 -> a
+    7:7:void addDefaultValue(java.lang.Object):248:248 -> a
     7:7:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):225 -> a
     7:7:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
     8:8:void com.android.tools.r8.joptsimple.internal.Objects.ensureNotNull(java.lang.Object):44:44 -> a
     8:8:void addDefaultValue(java.lang.Object):247 -> a
-    8:8:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
-    9:12:void handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):255:258 -> a
-    13:18:void addArguments(com.android.tools.r8.joptsimple.OptionSet,java.lang.String):262:267 -> a
-    19:19:java.lang.Object convert(java.lang.String):276:276 -> a
+    8:8:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):225 -> a
+    8:8:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
+    9:9:void com.android.tools.r8.joptsimple.internal.Objects.ensureNotNull(java.lang.Object):44:44 -> a
+    9:9:void addDefaultValue(java.lang.Object):247 -> a
+    9:9:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
+    10:13:void handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):255:258 -> a
+    14:19:void addArguments(com.android.tools.r8.joptsimple.OptionSet,java.lang.String):262:267 -> a
+    20:20:java.lang.Object convert(java.lang.String):276:276 -> a
     1:5:boolean canConvertArgument(java.lang.String):280:284 -> b
     6:6:java.lang.Object convert(java.lang.String):276:276 -> b
     6:6:boolean canConvertArgument(java.lang.String):284 -> b
@@ -52952,7 +52775,7 @@
     9:26:void <init>(com.android.tools.r8.kotlin.Kotlin):60:77 -> <init>
     27:27:void <init>(com.android.tools.r8.kotlin.Kotlin):75:75 -> <init>
     1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):62:62 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     2:2:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):62 -> a
     3:3:int getArity(com.android.tools.r8.graph.DexType):85:85 -> a
     4:4:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):81:81 -> a
@@ -53103,6 +52926,7 @@
 com.android.tools.r8.naming.ApplyMappingError -> com.android.tools.r8.K.a:
     1:1:void <init>(java.lang.String,com.android.tools.r8.position.Position):26:26 -> <init>
     1:2:com.android.tools.r8.naming.ApplyMappingError mapToExistingClass(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):31:32 -> a
+    1:2:com.android.tools.r8.naming.ApplyMappingError mapToExistingMember(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):38:39 -> b
 com.android.tools.r8.naming.ClassNameMapper -> com.android.tools.r8.K.e:
     java.util.Map signatureMap -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap classNameMappings -> a
@@ -53634,12 +53458,12 @@
     49:49:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):121:121 -> a
     50:85:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):137:172 -> a
     50:85:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):120 -> a
-    86:86:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    86:86:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     86:86:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):172 -> a
     86:86:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):120 -> a
     87:89:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):174:176 -> a
     87:89:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):120 -> a
-    90:90:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    90:90:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     90:90:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):176 -> a
     90:90:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):120 -> a
     91:103:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):179:191 -> a
@@ -53648,115 +53472,113 @@
     104:104:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):138 -> a
     104:104:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):120 -> a
     105:211:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):201:307 -> a
-    212:212:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    212:212:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     212:212:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):307 -> a
-    213:213:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    213:213:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     213:213:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):308 -> a
     214:216:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):310:312 -> a
-    217:217:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
+    217:217:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
     217:217:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):312 -> a
     218:221:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):315:318 -> a
     222:225:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):209:212 -> a
     226:227:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):337:338 -> a
     226:227:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    228:229:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):169:170 -> a
+    228:229:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):147:148 -> a
     228:229:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):338 -> a
     228:229:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    230:236:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):339:345 -> a
-    230:236:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    237:246:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):344:353 -> a
-    237:246:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    247:247:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):352:352 -> a
-    247:247:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    248:267:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:236 -> a
-    268:270:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> a
-    268:270:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> a
-    268:270:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):236 -> a
-    271:276:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):237:242 -> a
-    277:277:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
-    277:277:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
-    278:292:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:259 -> a
-    293:293:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    293:293:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):259 -> a
-    294:294:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    294:294:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):260 -> a
-    295:297:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):262:264 -> a
-    298:298:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    298:298:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):264 -> a
-    299:357:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):267:325 -> a
-    358:364:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
-    365:365:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
-    365:365:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
-    366:369:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:331 -> a
-    370:370:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
-    371:400:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):362:391 -> a
+    230:243:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):339:352 -> a
+    230:243:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    244:244:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):351:351 -> a
+    244:244:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    245:264:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:236 -> a
+    265:267:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> a
+    265:267:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> a
+    265:267:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):236 -> a
+    268:273:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):237:242 -> a
+    274:274:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
+    274:274:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
+    275:289:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:259 -> a
+    290:290:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    290:290:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):259 -> a
+    291:291:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    291:291:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):260 -> a
+    292:294:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):262:264 -> a
+    295:295:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    295:295:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):264 -> a
+    296:354:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):267:325 -> a
+    355:361:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
+    362:362: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
+    362:362:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
+    363:366:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:331 -> a
+    367:367:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
+    368:397:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):361:390 -> a
 com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.K.D:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
     boolean lambda$evaluateTypeArrayContentFromConstructionToUse$0(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:89:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):67:155 -> a
-    90:96:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):108:114 -> a
-    97:97:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    97:97:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):364 -> a
-    98:101:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):364:367 -> a
-    102:103:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):169:170 -> a
-    104:106:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexItemFactory):174:176 -> a
-    107:124:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):198:215 -> a
-    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    125:125:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):307 -> a
-    125:125:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):214 -> a
-    126:134:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):308:316 -> a
-    126:134:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):214 -> a
-    135:135:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    135:135:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):307 -> a
-    135:135:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):214 -> a
-    136:175:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):221:260 -> a
-    176:214:com.android.tools.r8.graph.DexTypeList retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):519:557 -> a
-    176:214:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):260 -> a
-    215:221: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):556:562 -> a
-    215:221:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):260 -> a
-    222:222:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):264:264 -> a
-    223:223:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    223:223:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):385 -> a
-    223:223:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):264 -> a
-    224:227:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):385:388 -> a
-    224:227:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):264 -> a
-    228:230:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):266:268 -> a
-    231:231:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    231:231:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):180 -> a
-    232:234:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):181:183 -> a
-    235:235:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    235:235:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):180 -> a
-    236:238:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):274:276 -> a
-    239:239:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    239:239:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):276 -> a
-    240:240:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):277:277 -> a
-    241:241:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> a
-    241:241:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):276 -> a
-    242:269:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):324:351 -> a
-    242:269:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
-    270:270:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    270:270:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):351 -> a
-    270:270:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
-    271:275:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):352:356 -> a
-    271:275:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
-    276:276:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    276:276:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):374 -> a
-    276:276:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):358 -> a
-    276:276:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
-    277:279:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):374:376 -> a
-    277:279:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):358 -> a
-    277:279:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
-    280:280:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):291:291 -> a
-    281:324:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):417:460 -> a
-    325:333:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):396:404 -> a
-    325:333:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):460 -> a
-    334:334:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):403:403 -> a
-    334:334:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):460 -> a
-    335:350:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):465:480 -> a
-    1:3:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):298:300 -> b
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
-    4:4:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):300 -> b
+    1:79:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):55:133 -> a
+    80:86:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):86:92 -> a
+    87:87:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
+    87:87:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):340 -> a
+    88:91:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):340:343 -> a
+    92:93:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):147:148 -> a
+    94:96:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexItemFactory):152:154 -> a
+    97:112:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):176:191 -> a
+    113:113:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    113:113:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):283 -> a
+    113:113:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
+    114:122:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):284:292 -> a
+    114:122:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
+    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    123:123:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):283 -> a
+    123:123:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
+    124:163:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):197:236 -> a
+    164:202: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):495:533 -> a
+    164:202:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):236 -> a
+    203:209: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):532:538 -> a
+    203:209:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):236 -> a
+    210:210:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):240:240 -> a
+    211:211:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    211:211:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):361 -> a
+    211:211:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):240 -> a
+    212:215:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):361:364 -> a
+    212:215:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):240 -> a
+    216:218:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):242:244 -> a
+    219:221:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):250:252 -> a
+    222:222:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    222:222:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):252 -> a
+    223:223:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):253:253 -> a
+    224:224:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    224:224:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):252 -> a
+    225:225:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    225:225:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):158 -> a
+    226:228:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):159:161 -> a
+    229:229:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> a
+    229:229:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):158 -> a
+    230:257:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):300:327 -> a
+    230:257:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    258:258:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    258:258:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):327 -> a
+    258:258:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    259:263:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):328:332 -> a
+    259:263:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    264:264:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    264:264:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):350 -> a
+    264:264:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):334 -> a
+    264:264:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    265:267:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):350:352 -> a
+    265:267:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):334 -> a
+    265:267:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    268:268:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):267:267 -> a
+    269:312:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):393:436 -> a
+    313:321:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):372:380 -> a
+    313:321:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):436 -> a
+    322:322:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):379:379 -> a
+    322:322:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):436 -> a
+    323:338:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):441:456 -> a
+    1:3:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):274:276 -> b
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
+    4:4:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):276 -> b
 com.android.tools.r8.naming.InterfaceMethodNameMinifier -> com.android.tools.r8.K.G:
     com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> d
     com.android.tools.r8.graph.AppView appView -> a
@@ -53920,10 +53742,10 @@
     8:8:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):235 -> a
     9:10:com.android.tools.r8.naming.MemberNaming$MethodSignature fromDexMethod(com.android.tools.r8.graph.DexMethod,boolean):235:236 -> a
     11:13:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):270:272 -> a
-    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     14:14:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):272 -> a
     15:17:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):272:274 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     18:18:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):274 -> a
     19:20:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):277:278 -> a
     21:21:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):275:275 -> a
@@ -54324,7 +54146,7 @@
     30:31:java.lang.String lookupPackageName(java.lang.String):125 -> a
     32:32:java.lang.String lookupPackageName(java.lang.String):126:126 -> a
     33:33:void forAllRenamedTypes(java.util.function.Consumer):142:142 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     34:34:void forAllRenamedTypes(java.util.function.Consumer):142 -> a
     35:37:void forAllRenamedTypes(java.util.function.Consumer):143:145 -> a
     38:51:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):152:165 -> a
@@ -54354,145 +54176,148 @@
     java.util.Map additionalFieldNamings -> k
     java.util.Map memberNames -> g
     java.util.Map syntheticCompanionClasses -> h
-    1:1:void <clinit>():63:63 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):82:82 -> <init>
-    2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):69:86 -> <init>
-    1:1:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
-    1:1:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):272 -> a
-    2:6:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):273:277 -> a
-    7:14:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):276:283 -> a
-    15:17:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):161:163 -> a
-    15:17:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):283 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
-    18:18:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163 -> a
-    18:18:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):283 -> a
-    19:20:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163:164 -> a
-    19:20:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):283 -> a
-    21:21:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):161:161 -> a
-    21:21:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):283 -> a
-    22:22:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):285:285 -> a
-    23:27:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):284:288 -> a
-    28:28:int lambda$new$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):71:71 -> a
-    29:47:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):91:109 -> a
-    48:48:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
-    48:48:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):109 -> a
-    49:52:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):117:120 -> a
-    53:63:void computeDefaultInterfaceMethodMethods():319:329 -> a
-    53:63:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    64:79:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):345:360 -> a
-    64:79:void computeDefaultInterfaceMethodMethods():329 -> a
-    64:79:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):81:81 -> <init>
+    2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):68:85 -> <init>
+    1:1:int lambda$new$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):70:70 -> a
+    2:2:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
+    2:2:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):271 -> a
+    3:7:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):272:276 -> a
+    8:15:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):275:282 -> a
+    16:18:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):161:163 -> a
+    16:18:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
+    19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
+    19:19:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163 -> a
+    19:19:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
+    20:21:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):163:164 -> a
+    20:21:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
+    22:22:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.MemberNaming$FieldSignature.toDexField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):161:161 -> a
+    22:22:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):282 -> a
+    23:23:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):284:284 -> a
+    24:28:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):283:287 -> a
+    29:47:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):90:108 -> a
+    48:48:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
+    48:48:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):108 -> a
+    49:52:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):116:119 -> a
+    53:63:void computeDefaultInterfaceMethodMethods():318:328 -> a
+    53:63:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    64:79:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):344:359 -> a
+    64:79:void computeDefaultInterfaceMethodMethods():328 -> a
+    64:79:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     80:80:com.android.tools.r8.naming.MemberNaming$Signature com.android.tools.r8.naming.MemberNaming.getOriginalSignature():71:71 -> a
-    80:80:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361 -> a
-    80:80:void computeDefaultInterfaceMethodMethods():329 -> a
-    80:80:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    81:82:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361:362 -> a
-    81:82:void computeDefaultInterfaceMethodMethods():329 -> a
-    81:82:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
+    80:80:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):360 -> a
+    80:80:void computeDefaultInterfaceMethodMethods():328 -> a
+    80:80:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    81:82:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):360:361 -> a
+    81:82:void computeDefaultInterfaceMethodMethods():328 -> a
+    81:82:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     83:84:com.android.tools.r8.naming.MemberNaming$MethodSignature com.android.tools.r8.naming.MemberNaming$MethodSignature.toUnqualified():255:256 -> a
-    83:84:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):365 -> a
-    83:84:void computeDefaultInterfaceMethodMethods():329 -> a
-    83:84:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    85:85:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):365:365 -> a
-    85:85:void computeDefaultInterfaceMethodMethods():329 -> a
-    85:85:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    86:89:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:367 -> a
-    86:89:void computeDefaultInterfaceMethodMethods():329 -> a
-    86:89:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
+    83:84:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364 -> a
+    83:84:void computeDefaultInterfaceMethodMethods():328 -> a
+    83:84:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    85:85:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:364 -> a
+    85:85:void computeDefaultInterfaceMethodMethods():328 -> a
+    85:85:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    86:89:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):363:366 -> a
+    86:89:void computeDefaultInterfaceMethodMethods():328 -> a
+    86:89:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     90:90:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    90:90:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):368 -> a
-    90:90:void computeDefaultInterfaceMethodMethods():329 -> a
-    90:90:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    91:91:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):368:368 -> a
-    91:91:void computeDefaultInterfaceMethodMethods():329 -> a
-    91:91:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    92:92:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367:367 -> a
-    92:92:void computeDefaultInterfaceMethodMethods():329 -> a
-    92:92:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    93:135:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):122:164 -> a
-    136:138:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):112:114 -> a
-    139:162:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):170:193 -> a
-    163:178:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):190:205 -> a
-    179:186:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):204:211 -> a
+    90:90:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367 -> a
+    90:90:void computeDefaultInterfaceMethodMethods():328 -> a
+    90:90:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    91:91:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367:367 -> a
+    91:91:void computeDefaultInterfaceMethodMethods():328 -> a
+    91:91:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    92:92:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):366:366 -> a
+    92:92:void computeDefaultInterfaceMethodMethods():328 -> a
+    92:92:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    93:135:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121:163 -> a
+    136:138:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):111:113 -> a
+    139:162:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):169:192 -> a
+    163:178:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):189:204 -> a
+    179:186:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):203:210 -> a
     187:187:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    187:187:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):212 -> a
-    188:188:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):213:213 -> a
+    187:187:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):211 -> a
+    188:188:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):212:212 -> a
     189:189:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    189:189:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):213 -> a
-    190:190:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):213:213 -> a
-    191:204:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):208:221 -> a
-    205:226:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):220:241 -> a
-    227:227:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
-    227:227:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):242 -> a
-    228:231:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):243:246 -> a
-    232:232:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
-    232:232:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):247 -> a
-    233:233:void lambda$computeMapping$4(java.util.Deque,com.android.tools.r8.graph.DexType):242:242 -> a
-    234:243:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):253:262 -> a
-    244:244:void lambda$addNonPrivateInterfaceMappings$6(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):259:259 -> a
-    245:246:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):295:296 -> a
+    189:189:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):212 -> a
+    190:190:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):212:212 -> a
+    191:204:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):207:220 -> a
+    205:226:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):219:240 -> a
+    227:227:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
+    227:227:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):241 -> a
+    228:231:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):242:245 -> a
+    232:232:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
+    232:232:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):246 -> a
+    233:233:void lambda$computeMapping$4(java.util.Deque,com.android.tools.r8.graph.DexType):241:241 -> a
+    234:243:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):252:261 -> a
+    244:244:void lambda$addNonPrivateInterfaceMappings$6(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):258:258 -> a
+    245:246:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):294:295 -> a
     247:247:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    247:247:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):296 -> a
-    248:248:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):296:296 -> a
-    249:253:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):295:299 -> a
+    247:247:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):295 -> a
+    248:248:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):295:295 -> a
+    249:253:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):294:298 -> a
     254:254:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    254:254:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):299 -> a
-    255:256:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):299:300 -> a
-    257:260:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):305:308 -> a
+    254:254:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):298 -> a
+    255:256:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):298:299 -> a
+    257:260:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):304:307 -> a
     261:261:java.lang.String com.android.tools.r8.graph.DexType.toString():125:125 -> a
-    261:261:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):312 -> a
-    262:262:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):312:312 -> a
-    263:263:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311:311 -> a
-    264:268:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):310:314 -> a
-    1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):94:94 -> b
-    2:2:void lambda$computeMapping$3(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):186:186 -> b
-    3:3:void lambda$computeMapping$5(java.util.Deque,com.android.tools.r8.graph.DexType):247:247 -> b
+    261:261:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311 -> a
+    262:262:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311:311 -> a
+    263:263:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):310:310 -> a
+    264:268:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):309:313 -> a
+    1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):93:93 -> b
+    2:2:void lambda$computeMapping$3(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):185:185 -> b
+    3:3:void lambda$computeMapping$5(java.util.Deque,com.android.tools.r8.graph.DexType):246:246 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.K.m0:
     boolean $assertionsDisabled -> h
     java.util.Map mappings -> g
-    1:1:void <clinit>():373:373 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):378:379 -> <init>
-    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):388:389 -> a
+    1:1:void <clinit>():372:372 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):377:378 -> <init>
+    1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):387:388 -> a
     3:3:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
-    3: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):389 -> a
-    4:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):389:390 -> a
-    6:6:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):420:420 -> a
-    1:8:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):398:405 -> b
+    3: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):388 -> a
+    4:5:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexType,char[],com.android.tools.r8.naming.InternalNamingState,java.util.function.Predicate):388:389 -> a
+    6:6:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):419:419 -> a
+    1:8:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):397:404 -> b
     9:9:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> b
-    9:9:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):405 -> b
-    10:15:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):406:411 -> b
+    9:9:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):404 -> b
+    10:15:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):405:410 -> b
     16:16:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> b
-    16:16:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):411 -> b
-    17:21:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):411:415 -> b
+    16:16:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):410 -> b
+    17:21:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):410:414 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.K.n0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexItemFactory factory -> i
     java.util.Map mappedNames -> h
-    1:1:void <clinit>():424:424 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):432:435 -> <init>
+    1:1:void <clinit>():423:423 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):431:434 -> <init>
     boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass) -> a
-    1:13:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):443:455 -> 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):454:454 -> a
-    15:17:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):464:466 -> 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):464:464 -> a
-    19:25: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):482:488 -> a
-    26:30:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):538:542 -> a
-    26:30: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):489 -> a
-    31:32:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):493:494 -> a
-    33:33:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
-    33:33:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):494 -> a
-    34:35:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate,com.android.tools.r8.utils.TriFunction):494:495 -> a
-    36:36:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):500:500 -> a
-    37:37:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):505:505 -> a
-    38:43: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):509:514 -> a
-    44:44:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    44:44:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):514 -> a
-    45:58: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):514:527 -> a
-    59:59:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
-    59:59: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):527 -> a
-    60:60: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):527:527 -> 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):452:452 -> 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):471:471 -> 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):442:442 -> a
+    2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):450:450 -> a
+    3:7:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):460:464 -> a
+    8:14:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):504:510 -> a
+    8:14:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):465 -> a
+    15:15:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):507:507 -> a
+    15:15:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):465 -> a
+    16:17:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):469:470 -> a
+    18:18:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
+    18:18:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):470 -> a
+    19:20:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):470:471 -> a
+    21:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):476:476 -> a
+    22:22:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):481:481 -> a
+    23:24:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):486:487 -> a
+    25:25:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
+    25:25:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):487 -> a
+    26:28:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):487:489 -> a
+    29:29:boolean com.android.tools.r8.shaking.RootSetBuilder$RootSet.mayBeMinified(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.AppView):1225:1225 -> a
+    29:29:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):489 -> a
+    30:31:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):490:491 -> a
+    32:32:java.lang.String com.android.tools.r8.naming.MemberNaming.getRenamedName():83:83 -> a
+    32:32:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):491 -> a
+    33:33:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):491:491 -> 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):442:442 -> 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):450:450 -> b
 com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.K.q0:
     java.io.BufferedReader reader -> a
     boolean $assertionsDisabled -> f
@@ -54651,7 +54476,6 @@
     1:6:boolean skipLine():130:135 -> j
     1:2:void skipWhitespace():144:145 -> k
 com.android.tools.r8.naming.ProguardMapReader$ParseException -> com.android.tools.r8.K.p0:
-    com.android.tools.r8.naming.ProguardMapReader this$0 -> e
     int lineOffset -> b
     boolean eol -> c
     int lineNo -> a
@@ -54963,7 +54787,7 @@
     4:9:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
     10:10:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):190:190 -> a
     10:10:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     11:11:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):189 -> a
     11:11:java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String):153 -> a
     12:14:com.android.tools.r8.graph.DexType parsedInnerTypeName(com.android.tools.r8.graph.DexType,java.lang.String):194:196 -> a
@@ -54977,7 +54801,7 @@
     43:43:void parsedIdentifier(java.lang.String):167:167 -> a
     1:1:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):172:172 -> b
     1:1:java.lang.Object parsedTypeName(java.lang.String):153 -> b
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> b
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> b
     2:2:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):172 -> b
     2:2:java.lang.Object parsedTypeName(java.lang.String):153 -> b
     3:8:com.android.tools.r8.graph.DexType parsedTypeName(java.lang.String):173:178 -> b
@@ -54995,7 +54819,7 @@
     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):57 -> a
     13:37:void publicizeType(com.android.tools.r8.graph.DexType):77:101 -> a
     38:44:void publicizeType(com.android.tools.r8.graph.DexType):99:105 -> a
-    45:45:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
+    45:45:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     45:45:void publicizeType(com.android.tools.r8.graph.DexType):105 -> a
     46:46:void lambda$publicizeType$0(com.android.tools.r8.graph.DexEncodedField):82:82 -> a
     47:91:boolean publicizeMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):109:153 -> a
@@ -55048,7 +54872,7 @@
     39:53:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):125:139 -> a
     54:54:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:169 -> a
     54:54:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     55:55:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169 -> a
     55:55:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
     56:59:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:172 -> a
@@ -57034,23 +56858,10 @@
     24:39:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):62:77 -> a
     24:39:void processClass(com.android.tools.r8.graph.DexType):41 -> a
     40:43:void processClass(com.android.tools.r8.graph.DexType):43:46 -> a
-    44:44:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> a
+    44:44:void com.android.tools.r8.graph.AppInfoWithSubtyping.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> a
     44:44:void processClass(com.android.tools.r8.graph.DexType):46 -> a
     45:45:void processClass(com.android.tools.r8.graph.DexType):47:47 -> a
-com.android.tools.r8.shaking.AnnotationFixer -> com.android.tools.r8.N.b:
-    com.android.tools.r8.graph.GraphLense lense -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.GraphLense):24:25 -> <init>
-    1:4:void run(java.lang.Iterable):29:32 -> a
-    5:7:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):37:39 -> a
-    8:8:com.android.tools.r8.graph.DexAnnotationSet lambda$processMethod$0(com.android.tools.r8.graph.DexAnnotationSet):40:40 -> a
-    9:9:void processField(com.android.tools.r8.graph.DexEncodedField):44:44 -> a
-    10:10:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):48:48 -> a
-    11:13:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):52:54 -> a
-    14:16:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexAnnotationElement):59:61 -> a
-    17:28:com.android.tools.r8.graph.DexValue rewriteValue(com.android.tools.r8.graph.DexValue):67:78 -> a
-com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.N.c:
+com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.N.b:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set classesToRetainInnerClassAttributeFor -> c
     com.android.tools.r8.shaking.ProguardKeepAttributes keep -> b
@@ -57082,83 +56893,83 @@
     30:30:boolean com.android.tools.r8.graph.DexAnnotation.isSynthesizedClassMapAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):399:399 -> a
     30:30:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):95 -> a
     31:31:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):99:99 -> a
-    32:46:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):118:132 -> a
-    47:52:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):122:127 -> a
-    53:54:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):110:111 -> a
-    53:54:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):134 -> a
-    55:55:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138:138 -> a
-    56:62:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):144:150 -> a
-    56:62:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    63:63:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    63:63:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150 -> a
-    63:63:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    64:67:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150:153 -> a
-    64:67:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
+    32:46:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):123:137 -> a
+    47:59:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):127:139 -> a
+    60:60:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143:143 -> a
+    61:67:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):144:150 -> a
+    61:67:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
     68:68:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    68:68:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153 -> a
-    68:68:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    69:72:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153:156 -> a
-    69:72:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
+    68:68:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150 -> a
+    68:68:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    69:72:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):150:153 -> a
+    69:72:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
     73:73:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    73:73:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):156 -> a
-    73:73:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    74:82:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):156:164 -> a
-    74:82:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    83:83:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    83:83:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):164 -> a
-    83:83:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    84:84:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):164:164 -> a
-    84:84:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138 -> a
-    85:87:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):239:241 -> a
-    88:88:void processField(com.android.tools.r8.graph.DexEncodedField):245:245 -> a
-    89:98:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):258:267 -> a
-    99:99:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):266:266 -> a
-    100:100:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):263:263 -> a
-    101:101:boolean lambda$rewriteAnnotationElement$1(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
-    102:103:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):308:309 -> a
-    104:106:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):287:289 -> a
-    104:106:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):310 -> a
-    107:113:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):310:316 -> a
-    114:115:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):293:294 -> a
-    114:115:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):317 -> a
-    116:117:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):351:352 -> a
-    118:127:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):320:329 -> a
-    128:139:boolean lambda$stripAttributes$2(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):331:342 -> a
-    140:141:void clearAnnotations(com.android.tools.r8.graph.AppView):357:358 -> a
-    142:142:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    142:142:void clearAnnotations(com.android.tools.r8.graph.AppView):359 -> a
-    143:144:void clearAnnotations(com.android.tools.r8.graph.AppView):359:360 -> a
-    145:145:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    145:145:void clearAnnotations(com.android.tools.r8.graph.AppView):362 -> a
-    146:147:void clearAnnotations(com.android.tools.r8.graph.AppView):362:363 -> a
-    1:2:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):110:111 -> b
-    1:2:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):47 -> b
-    1:2:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):250 -> b
-    3:3:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):47:47 -> b
-    3:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):250 -> b
-    4:4:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):46:46 -> b
-    4:4:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):250 -> b
-    5:5:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):254:254 -> b
-    6:18:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):181:193 -> b
-    19:20:boolean hasSignatureAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):159:160 -> b
-    19:20:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):193 -> b
-    21:48:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):194:221 -> b
-    49:53:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):147:151 -> b
-    49:53:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):222 -> b
-    54:54:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):223:223 -> b
-    55:55:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):183:183 -> b
-    56:60:void run():230:234 -> b
-    61:70:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):273:282 -> b
-com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.N.e:
+    73:73:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153 -> a
+    73:73:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    74:77:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):153:156 -> a
+    74:77:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    78:78:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    78:78:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):156 -> a
+    78:78:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    79:87:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):156:164 -> a
+    79:87:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    88:88:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    88:88:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):164 -> a
+    88:88:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    89:89:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):164:164 -> a
+    89:89:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143 -> a
+    90:92:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):244:246 -> a
+    93:93:void processField(com.android.tools.r8.graph.DexEncodedField):250:250 -> a
+    94:97:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):263:266 -> a
+    98:104:com.android.tools.r8.graph.DexEncodedAnnotation com.android.tools.r8.graph.DexEncodedAnnotation.rewrite(java.util.function.Function,java.util.function.Function):81:87 -> a
+    98:104:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):267 -> a
+    105:108:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):269:272 -> a
+    109:109:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):271:271 -> a
+    110:110:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):268:268 -> a
+    111:111:boolean lambda$rewriteAnnotationElement$1(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):286:286 -> a
+    112:113:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):312:313 -> a
+    114:116:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):291:293 -> a
+    114:116:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):314 -> a
+    117:123:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):314:320 -> a
+    124:125:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):297:298 -> a
+    124:125:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):321 -> a
+    126:127:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):355:356 -> a
+    128:137:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):324:333 -> a
+    138:149:boolean lambda$stripAttributes$2(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):335:346 -> a
+    150:151:void clearAnnotations(com.android.tools.r8.graph.AppView):361:362 -> a
+    152:152:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    152:152:void clearAnnotations(com.android.tools.r8.graph.AppView):363 -> a
+    153:154:void clearAnnotations(com.android.tools.r8.graph.AppView):363:364 -> a
+    155:155:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
+    155:155:void clearAnnotations(com.android.tools.r8.graph.AppView):366 -> a
+    156:157:void clearAnnotations(com.android.tools.r8.graph.AppView):366:367 -> a
+    1:7:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):110:116 -> b
+    8:20:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):186:198 -> b
+    21:22:boolean hasSignatureAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):164:165 -> b
+    21:22:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):198 -> b
+    23:50:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):199:226 -> b
+    51:55:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):152:156 -> b
+    51:55:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):227 -> b
+    56:56:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):228:228 -> b
+    57:57:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):188:188 -> b
+    58:62:void run():235:239 -> b
+    63:71:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):278:286 -> b
+    1:1:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):47:47 -> c
+    1:1:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):255 -> c
+    2:2:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):46:46 -> c
+    2:2:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):255 -> c
+    3:3:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):259:259 -> c
+    4:11:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.rewrite(java.util.function.Function):403:410 -> c
+    4:11:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):259 -> c
+com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.N.d:
     java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers -> y
-    java.util.Set instantiatedLambdas -> Z
-    boolean $assertionsDisabled -> a0
-    java.util.Set constClassReferences -> T
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> V
+    java.util.Set neverPropagateValue -> T
+    java.util.Set prunedTypes -> V
     java.util.SortedSet virtualMethodsTargetedByInvokeDirect -> v
-    java.util.Map switchMaps -> X
+    java.util.Map enumValueInfoMaps -> X
     java.util.SortedSet bootstrapMethods -> t
     java.util.Set pinnedItems -> H
+    boolean $assertionsDisabled -> Z
     java.util.Set callSites -> F
     java.util.Set instantiatedAnnotationTypes -> o
     java.util.Map noSideEffects -> J
@@ -57171,13 +56982,13 @@
     java.util.SortedMap virtualInvokes -> A
     java.util.SortedSet brokenSuperInvokes -> G
     java.util.Set neverInline -> N
-    java.util.Set prunedTypes -> W
+    java.util.Set instantiatedLambdas -> Y
     java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer -> z
     java.util.Set neverMerge -> S
-    java.util.Set neverPropagateValue -> U
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> U
     com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> x
-    java.util.Map enumValueInfoMaps -> Y
     java.util.IdentityHashMap indirectlyInstantiatedTypes -> r
+    java.util.Map switchMaps -> W
     java.util.SortedSet liveMethods -> w
     java.util.SortedSet methodsTargetedByInvokeDynamic -> u
     java.util.SortedSet targetedMethods -> s
@@ -57191,142 +57002,142 @@
     java.util.Set forceInline -> M
     java.util.Set liveTypes -> n
     1:1:void <clinit>():57:57 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):230:230 -> <init>
-    2:198:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):74:270 -> <init>
-    199:199:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):313:313 -> <init>
-    200:479:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):74:353 -> <init>
-    480:519:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):365:404 -> <init>
-    520:565:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):365:410 -> <init>
-    566:566:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):415:415 -> <init>
-    567:960:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):74:467 -> <init>
-    961:979:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):463:481 -> <init>
-    980:995:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):477:492 -> <init>
-    996:1003:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):488:495 -> <init>
-    1004:1004:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):502:502 -> <init>
-    1005:1474:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):74:543 -> <init>
-    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):567:599 -> a
-    34:39:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):622:627 -> a
-    40:42:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):639:641 -> a
-    43:43:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):639:639 -> a
-    44:55:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):660:671 -> a
-    56:66:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):710:720 -> a
-    67:72:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):771:776 -> a
-    73:82:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):782:791 -> a
-    83:83:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):787:787 -> a
-    84:85:boolean isPinned(com.android.tools.r8.graph.DexReference):813:814 -> a
-    84:85:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1055 -> a
-    86:86:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1055:1055 -> a
-    87:106:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):819:838 -> a
-    87:106:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1055 -> a
-    107:145:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1056:1094 -> a
-    146:147:boolean isPinned(com.android.tools.r8.graph.DexReference):813:814 -> a
-    148:149:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):858:859 -> a
-    150:151:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):864:865 -> a
-    152:167: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):884:899 -> a
-    168:168: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):897:897 -> a
-    169:169: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):895:895 -> a
-    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1127:1128 -> a
-    170:171: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):893 -> a
-    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):932:933 -> a
-    172:173: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):891 -> a
-    174:177:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):924:927 -> a
-    178:187:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1110:1119 -> a
-    188:209:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1136:1157 -> a
-    210:242:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1156:1188 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):227:227 -> <init>
+    2:194:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:266 -> <init>
+    195:195:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):308:308 -> <init>
+    196:469:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:347 -> <init>
+    470:509:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):359:398 -> <init>
+    510:554:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):359:403 -> <init>
+    555:555:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):408:408 -> <init>
+    556:942:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):74:460 -> <init>
+    943:961:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):456:474 -> <init>
+    962:977:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):470:485 -> <init>
+    978:984:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):481:487 -> <init>
+    985:985:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):494:494 -> <init>
+    986:1446:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):74:534 -> <init>
+    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):555:587 -> a
+    34:39:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):600:605 -> a
+    40:42:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:619 -> a
+    43:43:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:617 -> a
+    44:55:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):638:649 -> a
+    56:66:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):688:698 -> a
+    67:72:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):749:754 -> a
+    73:82:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):760:769 -> a
+    83:83:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):765:765 -> a
+    84:85:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
+    84:85:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033 -> a
+    86:86:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033:1033 -> a
+    87:106:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):797:816 -> a
+    87:106:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033 -> a
+    107:145:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1034:1072 -> a
+    146:147:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
+    148:149:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):836:837 -> a
+    150:151:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):842:843 -> a
+    152:167: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):862:877 -> a
+    168:168: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):875:875 -> a
+    169:169: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):873:873 -> a
+    170:171:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1105:1106 -> a
+    170:171: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):871 -> a
+    172:173:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):910:911 -> a
+    172:173: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):869 -> a
+    174:177:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):902:905 -> a
+    178:187:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1088:1097 -> a
+    188:209:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1114:1135 -> a
+    210:242:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1134:1166 -> a
     243:243:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    243:243:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1187 -> a
-    244:270:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1189:1215 -> a
-    271:273:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1226:1228 -> a
-    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):547:547 -> b
-    2:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):615:619 -> b
-    7:7:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):357:357 -> b
-    7:7:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):619 -> b
-    8:21:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):620:633 -> b
-    22:22:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):631:631 -> b
-    23:24:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):724:725 -> b
-    25:25:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):760:760 -> b
-    26:27:boolean isPinned(com.android.tools.r8.graph.DexReference):813:814 -> b
-    26:27:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):761 -> b
-    28:28:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):761:761 -> b
-    29:37:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):907:915 -> b
-    38:56:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):941:959 -> b
-    57:112:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):958:1013 -> b
-    113:119:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1009:1015 -> b
-    120:129:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1008:1017 -> b
-    130:130:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):995:995 -> b
-    131:138:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1022:1029 -> b
-    139:141:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1219:1221 -> b
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):650:651 -> c
-    3:14:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):729:740 -> c
-    1:2:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):754:755 -> d
+    243:243:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1165 -> a
+    244:270:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1167:1193 -> a
+    271:273:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1204:1206 -> a
+    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> b
+    2:6:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):593:597 -> b
+    7:7:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):351:351 -> b
+    7:7:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):597 -> b
+    8:21:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):598:611 -> b
+    22:22:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):609:609 -> b
+    23:24:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):702:703 -> b
+    25:25:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):738:738 -> b
+    26:27:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> b
+    26:27:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):739 -> b
+    28:28:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):739:739 -> b
+    29:37:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):885:893 -> b
+    38:56:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):919:937 -> b
+    57:112:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):936:991 -> b
+    113:119:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):987:993 -> b
+    120:129:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):986:995 -> b
+    130:130:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):973:973 -> b
+    131:138:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1000:1007 -> b
+    139:141:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1197:1199 -> b
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):628:629 -> c
+    3:14:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):707:718 -> c
+    1:2:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):732:733 -> d
     3:3:java.lang.String com.android.tools.r8.graph.DexEncodedField.toSourceString():89:89 -> d
-    3:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):755 -> d
-    4:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):755:756 -> d
-    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):765:766 -> e
-    1:1:boolean hasLiveness():802:802 -> g
-    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):796:797 -> h
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():808:808 -> m
-    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):645:646 -> p
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():656:656 -> q
-    2:3:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):704:705 -> q
-    4:9:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):677:682 -> q
-    4:9:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):706 -> q
-    10:10:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):706:706 -> q
-    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):686:700 -> r
-    16:17:java.util.Set getPrunedTypes():878:879 -> r
-    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):551:552 -> s
-    3:3:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):547:547 -> s
-    3:3:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):552 -> s
-    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):556:563 -> t
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):873:874 -> u
-com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo -> com.android.tools.r8.N.d:
+    3:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):733 -> d
+    4:5:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):733:734 -> d
+    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):743:744 -> e
+    1:1:boolean hasLiveness():780:780 -> g
+    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):774:775 -> h
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():786:786 -> m
+    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):623:624 -> q
+    3:3:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():634:634 -> q
+    1:2:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):682:683 -> r
+    3:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):655:660 -> r
+    3:8:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):684 -> r
+    9:9:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):684:684 -> r
+    10:11:java.util.Set getPrunedTypes():856:857 -> r
+    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):664:678 -> s
+    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):542:543 -> t
+    3:3:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> t
+    3:3:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):543 -> t
+    1:5:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):547:551 -> u
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):851:852 -> v
+com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo -> com.android.tools.r8.N.c:
     com.android.tools.r8.graph.DexType type -> a
     int ordinal -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):181:183 -> <init>
-com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.N.i:
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):179:181 -> <init>
+com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.N.h:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> q
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassInlineRule$Type):72:86 -> <init>
     1:5:java.lang.String typeString():99:103 -> u
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type getType():94:94 -> v
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Builder builder():90:90 -> w
-com.android.tools.r8.shaking.ClassInlineRule$1 -> com.android.tools.r8.N.f:
+com.android.tools.r8.shaking.ClassInlineRule$1 -> com.android.tools.r8.N.e:
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> a
     1:1:void <clinit>():99:99 -> <clinit>
-com.android.tools.r8.shaking.ClassInlineRule$Builder -> com.android.tools.r8.N.g:
+com.android.tools.r8.shaking.ClassInlineRule$Builder -> com.android.tools.r8.N.f:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.ClassInlineRule$1):17:17 -> <init>
     2:2:void <init>():20:20 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ClassInlineRule$Type -> com.android.tools.r8.N.h:
+com.android.tools.r8.shaking.ClassInlineRule$Type -> com.android.tools.r8.N.g:
     com.android.tools.r8.shaking.ClassInlineRule$Type NEVER -> a
     com.android.tools.r8.shaking.ClassInlineRule$Type[] $VALUES -> b
     1:1:void <clinit>():14:14 -> <clinit>
     2:2:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.ClassMergingRule -> com.android.tools.r8.N.m:
+com.android.tools.r8.shaking.ClassMergingRule -> com.android.tools.r8.N.l:
     com.android.tools.r8.shaking.ClassMergingRule$Type type -> q
     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.ClassMergingRule$Type,com.android.tools.r8.shaking.ClassMergingRule$1):11:11 -> <init>
     2:5: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.ClassMergingRule$Type):60:63 -> <init>
     1:5:java.lang.String typeString():76:80 -> u
     1:1:com.android.tools.r8.shaking.ClassMergingRule$Type getType():71:71 -> v
     1:1:com.android.tools.r8.shaking.ClassMergingRule$Builder builder():67:67 -> w
-com.android.tools.r8.shaking.ClassMergingRule$1 -> com.android.tools.r8.N.j:
+com.android.tools.r8.shaking.ClassMergingRule$1 -> com.android.tools.r8.N.i:
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassMergingRule$Type -> a
     1:1:void <clinit>():76:76 -> <clinit>
-com.android.tools.r8.shaking.ClassMergingRule$Builder -> com.android.tools.r8.N.k:
+com.android.tools.r8.shaking.ClassMergingRule$Builder -> com.android.tools.r8.N.j:
     com.android.tools.r8.shaking.ClassMergingRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.ClassMergingRule$1):17:17 -> <init>
     2:2:void <init>():20:20 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ClassMergingRule$Type -> com.android.tools.r8.N.l:
+com.android.tools.r8.shaking.ClassMergingRule$Type -> com.android.tools.r8.N.k:
     com.android.tools.r8.shaking.ClassMergingRule$Type NEVER -> a
     com.android.tools.r8.shaking.ClassMergingRule$Type[] $VALUES -> b
     1:1:void <clinit>():14:14 -> <clinit>
     2:2:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.ClassMergingRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.N.n:
+com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.N.m:
     java.util.Map target2sources -> b
     com.android.tools.r8.experimental.graphinfo.GraphConsumer subConsumer -> a
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):23:23 -> <init>
@@ -57335,21 +57146,21 @@
     1:6:void acceptEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo):29:34 -> acceptEdge
     1:1:java.util.Map lambda$acceptEdge$0(com.android.tools.r8.experimental.graphinfo.GraphNode):30:30 -> b
     1:1:java.util.Set lambda$acceptEdge$1(com.android.tools.r8.experimental.graphinfo.GraphNode):31:31 -> c
-com.android.tools.r8.shaking.ConstantArgumentRule -> com.android.tools.r8.N.q:
+com.android.tools.r8.shaking.ConstantArgumentRule -> com.android.tools.r8.N.p:
     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.ConstantArgumentRule$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>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ConstantArgumentRule$Builder builder():74:74 -> v
-com.android.tools.r8.shaking.ConstantArgumentRule$1 -> com.android.tools.r8.N.o:
-com.android.tools.r8.shaking.ConstantArgumentRule$Builder -> com.android.tools.r8.N.p:
+com.android.tools.r8.shaking.ConstantArgumentRule$1 -> com.android.tools.r8.N.n:
+com.android.tools.r8.shaking.ConstantArgumentRule$Builder -> com.android.tools.r8.N.o:
     1:1:void <init>(com.android.tools.r8.shaking.ConstantArgumentRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.DexStringCache -> com.android.tools.r8.N.r:
+com.android.tools.r8.shaking.DexStringCache -> com.android.tools.r8.N.q:
     java.util.concurrent.ConcurrentHashMap stringCache -> a
     1:2:void <init>():9:10 -> <init>
     1:1:java.lang.String lookupString(com.android.tools.r8.graph.DexString):13:13 -> a
-com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.N.s:
+com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.N.r:
     java.util.Set checkDiscarded -> a
     java.lang.Iterable classes -> b
     1:3:void <init>(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.lang.Iterable):20:22 -> <init>
@@ -57361,60 +57172,58 @@
     9:11:void lambda$run$0(java.util.List,com.android.tools.r8.graph.DexEncodedMethod):30 -> a
     12:14:void checkItem(com.android.tools.r8.graph.DexDefinition,java.util.List):37:39 -> a
     12:14:void lambda$run$1(java.util.List,com.android.tools.r8.graph.DexEncodedField):31 -> a
-com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.N.C:
-    java.util.Map deferredAnnotations -> R
-    java.util.Map scopedMethodsForLiveTypes -> T
+com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.N.A:
+    java.util.Map scopedMethodsForLiveTypes -> R
     java.util.Map staticInvokes -> m
     java.util.Set brokenSuperInvokes -> s
-    java.util.Map virtualTargetsMarkedAsReachable -> N
+    com.android.tools.r8.shaking.EnqueuerWorklist workList -> K
     com.android.tools.r8.graph.AppView appView -> e
-    java.util.Map unusedInterfaceTypes -> y
-    boolean $assertionsDisabled -> V
+    java.util.Map deferredAnnotations -> P
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveFields -> H
+    java.util.Set directAndIndirectlyInstantiatedTypes -> A
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedInterfaceTypes -> J
     java.util.Map superInvokeDependencies -> u
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedTypes -> A
-    java.util.Set instantiatedAppServices -> J
+    boolean $assertionsDisabled -> T
     java.util.Set analyses -> c
     com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> h
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason targetedMethods -> C
-    java.util.Set bootstrapMethods -> D
-    com.android.tools.r8.shaking.GraphReporter graphReporter -> U
+    java.util.Set methodsTargetedByInvokeDynamic -> D
     com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason liveTypes -> w
-    java.util.Set lambdaMethodsTargetedByInvokeDynamic -> F
+    java.util.Set virtualMethodsTargetedByInvokeDirect -> F
     java.util.Map virtualInvokes -> i
     java.util.Set instanceFieldsWrittenOutsideEnclosingInstanceInitializers -> o
-    java.util.Set pinnedItems -> P
     java.util.Map superInvokes -> k
     java.util.Set callSites -> q
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveAnnotations -> y
+    com.android.tools.r8.shaking.GraphReporter graphReporter -> S
+    java.util.Set pendingReflectiveUses -> L
+    java.util.Set reportedMissing -> N
+    java.util.Map activeIfRules -> Q
     java.util.Set liveNonProgramTypes -> x
-    java.util.Map activeIfRules -> S
     java.util.Map reachableVirtualMethods -> t
-    com.android.tools.r8.shaking.EnqueuerWorklist workList -> L
+    java.util.Map virtualTargetsMarkedAsReachable -> M
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveMethods -> G
     com.android.tools.r8.utils.InternalOptions options -> f
-    java.util.Set directAndIndirectlyInstantiatedTypes -> B
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveFields -> I
     java.util.Map reachableInstanceFields -> v
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedInterfaceTypes -> K
     com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> g
-    java.util.Set virtualMethodsTargetedByInvokeDirect -> G
     com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> n
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason targetedMethods -> B
+    java.util.Set instantiatedAppServices -> I
     com.android.tools.r8.shaking.Enqueuer$Mode mode -> b
-    com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet liveMethods -> H
-    java.util.Set methodsTargetedByInvokeDynamic -> E
-    java.util.Set reportedMissing -> O
+    java.util.Set bootstrapMethods -> C
+    java.util.Set lambdaMethodsTargetedByInvokeDynamic -> E
+    java.util.Set pinnedItems -> O
     java.util.Map interfaceInvokes -> j
     java.util.Set staticFieldsWrittenOutsideEnclosingStaticInitializer -> p
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> d
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason liveAnnotations -> z
-    java.util.Set constClassReferences -> Q
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason instantiatedTypes -> z
     java.util.Map directInvokes -> l
     java.util.Set identifierNameStrings -> r
     boolean forceProguardCompatibility -> a
-    java.util.Set pendingReflectiveUses -> M
     1:1:void <clinit>():103:103 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):303:303 -> <init>
-    2:195:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):131:324 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):293:293 -> <init>
+    2:185:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):131:314 -> <init>
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> a
-    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1755 -> a
+    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1713 -> a
     boolean lambda$markVirtualMethodAsReachable$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void lambda$newSetWithoutReasonReporter$1(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
     2:2:com.android.tools.r8.shaking.GraphReporter access$100(com.android.tools.r8.shaking.Enqueuer):103:103 -> a
@@ -57424,558 +57233,544 @@
     6:6:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,java.util.function.Function):103:103 -> a
     7:7:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> a
     8:8:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):103:103 -> a
-    9:9:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):103:103 -> a
-    10:10:void access$4300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):103:103 -> a
-    11:11:void access$4400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):103:103 -> a
-    12:12:void access$4700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):103:103 -> a
-    13:13:boolean access$600(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
-    14:14:com.android.tools.r8.shaking.GraphReporter getGraphReporter():332:332 -> a
-    15:15:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):336:336 -> a
-    16:23:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):345:352 -> a
-    24:28:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):360:364 -> a
-    24:28:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):352 -> a
-    29:29:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):355:355 -> a
-    30:53:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):381:404 -> a
-    54:54:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):400:400 -> a
-    55:68:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):384:397 -> a
-    69:69:void enqueueRootItems(java.util.Map):413:413 -> a
-    70:72:void enqueueRootItem(java.util.Map$Entry):417:419 -> a
-    73:73:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):427:427 -> a
-    73:73:void enqueueRootItem(java.util.Map$Entry):419 -> a
-    74:81:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):432:439 -> a
-    82:82:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    82:82:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):440 -> a
-    83:87:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):441:445 -> a
-    88:93:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):442:447 -> a
-    94:94:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733:733 -> a
-    94:94:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):447 -> a
-    95:95:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isExternalizable(com.android.tools.r8.graph.DexType):600:600 -> a
-    95:95:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733 -> a
-    95:95:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):447 -> a
-    96:107:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):448:459 -> a
-    108:120:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):456:468 -> a
-    121:129:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):465:473 -> a
-    130:130:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):471:471 -> a
-    131:137:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):477:483 -> a
-    138:141:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):529:532 -> a
-    142:142:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):532:532 -> a
-    143:144:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):546:547 -> a
-    145:173:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):552:580 -> a
-    174:174:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1068:1068 -> a
-    175:183:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1640:1648 -> a
-    175:183:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1070 -> a
-    184:184:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1647:1647 -> a
-    184:184:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1070 -> a
-    185:185:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1644:1644 -> a
-    185:185:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1070 -> a
-    186:196:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1075:1085 -> a
-    186:196:com.android.tools.r8.graph.DexMethod access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    197:212:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1123:1138 -> a
-    213:213:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1135:1135 -> a
-    214:218:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1150:1154 -> a
-    219:219:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    219:219:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1155 -> a
-    220:220:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1158:1158 -> a
-    221:221:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
-    221:221:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1158 -> a
-    222:236:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1160:1174 -> a
-    237:240:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1232:1235 -> a
-    237:240:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1191 -> a
-    241:246:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):343:348 -> a
-    241:246:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1235 -> a
-    241:246:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1191 -> a
-    247:247:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1236:1236 -> a
-    247:247:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1191 -> a
-    248:256:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1195:1203 -> a
-    257:267:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):488:498 -> a
-    257:267:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1204 -> a
-    268:268:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    268:268:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):499 -> a
-    268:268:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1204 -> a
-    269:269:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):499:499 -> a
-    269:269:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1204 -> a
-    270:282:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1207:1219 -> a
-    283:283:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    283:283:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1220 -> a
-    284:284:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1220:1220 -> a
-    285:285:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):516:516 -> a
-    285:285:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1219 -> a
-    286:286:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):427:427 -> a
-    286:286:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):519 -> a
-    286:286:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1219 -> a
-    287:287:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1214:1214 -> a
-    288:291:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1224:1227 -> a
-    292:311:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1243:1262 -> a
-    312:312:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1249:1249 -> a
-    313:313:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1269:1269 -> a
-    314:314:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1273:1273 -> a
-    315:315:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1279:1279 -> a
-    315:315:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1274 -> a
-    316:316:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1279:1279 -> a
-    316:316:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2515 -> a
-    317:325:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1283:1291 -> a
-    326:326:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):24:24 -> a
-    326:326:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1295 -> a
-    327:330:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1296:1299 -> a
-    331:351:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1303:1323 -> a
-    331:351:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
-    352:353:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1330:1331 -> a
-    352:353:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1324 -> a
-    352:353:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
-    354:354:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1325:1325 -> a
-    354:354:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
-    355:355:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1337:1337 -> a
-    356:380:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1374:1398 -> a
-    381:381:void reportMissingField(com.android.tools.r8.graph.DexField):1416:1416 -> a
-    381:381:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
-    382:382:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    382:382:void reportMissingField(com.android.tools.r8.graph.DexField):1417 -> a
-    382:382:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
-    383:383:void reportMissingField(com.android.tools.r8.graph.DexField):1416:1416 -> a
-    383:383:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
-    384:384:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1457:1457 -> a
-    385:385:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexProgramClass.asProgramClass():0:0 -> a
-    385:385:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1457 -> a
-    386:387:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1605:1606 -> a
-    388:391:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1608:1611 -> a
-    392:423:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2448:2479 -> a
-    392:423:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1612 -> a
-    424:425:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1613:1614 -> a
-    426:426:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):48:48 -> a
-    426:426:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1617 -> a
-    427:427:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1614:1614 -> a
-    428:435:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1627:1634 -> a
-    436:436:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1698:1698 -> a
-    437:457:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1767:1787 -> a
-    437:457:void access$2900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    458:458:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
-    458:458:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1788 -> a
-    458:458:void access$2900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    459:460:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1789:1790 -> a
-    459:460:void access$2900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
-    461:461:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1828:1828 -> a
-    462:463:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1854:1855 -> a
-    464:464:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    464:464:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1856 -> a
-    465:480:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1859:1874 -> a
-    481:481:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1849:1849 -> a
-    481:481:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1876 -> a
-    482:487:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1877:1882 -> a
-    488:488:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1860:1860 -> a
-    489:489:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1881:1881 -> a
-    490:490:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889:1889 -> a
-    491:517:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1897:1923 -> a
-    491:517:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    518:518:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    518:518:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1924 -> a
-    518:518:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    519:556:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2016:2053 -> a
-    519:556:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1928 -> a
-    519:556:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    557:572:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2071:2086 -> a
-    557:572:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2052 -> a
-    557:572:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1928 -> a
-    557:572:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    573:576:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2072:2075 -> a
-    573:576:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2052 -> a
-    573:576:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1928 -> a
-    573:576:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    577:585:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2074:2082 -> a
-    577:585:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2052 -> a
-    577:585:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1928 -> a
-    577:585:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    586:595:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2054:2063 -> a
-    586:595:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1928 -> a
-    586:595:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    596:609:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1929:1942 -> a
-    596:609:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    610:610:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
-    610:610:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1943 -> a
-    610:610:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    611:618:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1944:1951 -> a
-    611:618:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889 -> a
-    619:619:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1959:1959 -> a
-    620:620:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    620:620:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1055 -> a
-    620:620:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1959 -> a
-    621:633:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1959:1971 -> a
-    634:634:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1849:1849 -> a
-    634:634:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1979 -> a
-    635:658:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1983:2006 -> a
-    659:665:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2003:2009 -> a
-    666:669:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1986:1989 -> a
-    670:670:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1986:1986 -> a
-    671:682:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2119:2130 -> a
-    683:683:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
-    683:683:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2133 -> a
-    684:703:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2132:2151 -> a
-    704:704:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    704:704:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2151 -> a
-    705:710:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2154:2159 -> a
-    711:718:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2168:2175 -> a
-    719:726: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):2184:2191 -> a
-    727:729:boolean verifyKeptGraph():2196:2198 -> a
-    727:729: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):2191 -> a
-    730:730: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):2192:2192 -> a
-    731:746:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2205:2220 -> a
-    747:768:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2219:2240 -> a
-    769:774:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2277:2282 -> a
-    769:774:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2254 -> a
-    775:779:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2255:2259 -> a
-    780:783:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2258:2261 -> a
-    784:784:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2207:2207 -> a
-    785:785:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2212:2212 -> a
-    786:791:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2267:2272 -> a
-    792:818:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2288:2314 -> a
-    819:819:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):106:106 -> a
-    819:819:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2314 -> a
-    820:884:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2315:2379 -> a
-    885:894:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2378:2387 -> a
-    895:899:void unpinLambdaMethods():2393:2397 -> a
-    895:899:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2389 -> a
-    900:900:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2387:2387 -> a
-    901:901:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2311:2311 -> a
-    902:902:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2332:2332 -> a
-    903:903:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2337:2337 -> a
-    904:904:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
-    904:904:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2337 -> a
-    905:905:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2338:2338 -> a
-    906:906:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):516:516 -> a
-    906:906:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2339 -> a
-    907:907:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):427:427 -> a
-    907:907:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):519 -> a
-    907:907:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2339 -> a
-    908:908:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
-    908:908:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2338 -> a
-    909:933:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2402:2426 -> a
-    934:943:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2423:2432 -> a
-    944:948:void markFieldAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2438:2442 -> a
-    949:960:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2489:2500 -> a
-    961:961:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    961:961:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2500 -> a
-    962:966:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2502:2506 -> a
-    967:970:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2505:2508 -> a
-    971:986:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2507:2522 -> a
-    987:987:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2522:2522 -> a
-    988:990:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2542:2544 -> a
-    991:991:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
-    991:991:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2544 -> a
-    992:992:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2544:2544 -> a
-    993:1005:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2889:2901 -> a
+    9:9:void access$3300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):103:103 -> a
+    10:10:void access$4100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):103:103 -> a
+    11:11:void access$4400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):103:103 -> a
+    12:12:boolean access$600(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> a
+    13:13:com.android.tools.r8.shaking.GraphReporter getGraphReporter():322:322 -> a
+    14:14:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):326:326 -> a
+    15:22:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):335:342 -> a
+    23:27:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):350:354 -> a
+    23:27:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):342 -> a
+    28:28:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):345:345 -> a
+    29:52:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):371:394 -> a
+    53:53:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):390:390 -> a
+    54:67:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):374:387 -> a
+    68:68:void enqueueRootItems(java.util.Map):403:403 -> a
+    69:71:void enqueueRootItem(java.util.Map$Entry):407:409 -> a
+    72:72:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> a
+    72:72:void enqueueRootItem(java.util.Map$Entry):409 -> a
+    73:80:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):422:429 -> a
+    81:81:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    81:81:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):430 -> a
+    82:85:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):431:434 -> a
+    86:90:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):432:436 -> a
+    91:91:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733:733 -> a
+    91:91:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):436 -> a
+    92:92:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isExternalizable(com.android.tools.r8.graph.DexType):598:598 -> a
+    92:92:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733 -> a
+    92:92:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):436 -> a
+    93:108:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):437:452 -> a
+    109:109:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):450:450 -> a
+    110:116:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):456:462 -> a
+    117:120:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):508:511 -> a
+    121:121:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):511:511 -> a
+    122:123:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):525:526 -> a
+    124:152:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):531:559 -> a
+    153:153:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1038:1038 -> a
+    154:162:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1611:1619 -> a
+    154:162:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1040 -> a
+    163:163:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1618:1618 -> a
+    163:163:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1040 -> a
+    164:164:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1615:1615 -> a
+    164:164:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1040 -> a
+    165:175:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1045:1055 -> a
+    165:175:com.android.tools.r8.graph.DexMethod access$1300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    176:191:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1093:1108 -> a
+    192:192:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1105:1105 -> a
+    193:197:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1120:1124 -> a
+    198:198:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    198:198:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1125 -> a
+    199:199:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1128:1128 -> a
+    200:200:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
+    200:200:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1128 -> a
+    201:201:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1130:1130 -> a
+    202:226:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1208:1232 -> a
+    202:226:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1131 -> a
+    227:232:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1134:1139 -> a
+    233:236:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1198:1201 -> a
+    233:236:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1157 -> a
+    237:242:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):341:346 -> a
+    237:242:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1201 -> a
+    237:242:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1157 -> a
+    243:243:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1202:1202 -> a
+    243:243:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1157 -> a
+    244:252:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1161:1169 -> a
+    253:263:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):467:477 -> a
+    253:263:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1170 -> a
+    264:264:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    264:264:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):478 -> a
+    264:264:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1170 -> a
+    265:265:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):478:478 -> a
+    265:265:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1170 -> a
+    266:278:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1173:1185 -> a
+    279:279:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    279:279:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1186 -> a
+    280:280:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1186:1186 -> a
+    281:281:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):495:495 -> a
+    281:281:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1185 -> a
+    282:282:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> a
+    282:282:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):498 -> a
+    282:282:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1185 -> a
+    283:283:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1180:1180 -> a
+    284:287:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1190:1193 -> a
+    288:288:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1238:1238 -> a
+    289:289:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1242:1242 -> a
+    290:290:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> a
+    290:290:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1243 -> a
+    291:291:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> a
+    291:291:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2480 -> a
+    292:300:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1252:1260 -> a
+    301:301:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):24:24 -> a
+    301:301:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1264 -> a
+    302:305:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1265:1268 -> a
+    306:326:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1272:1292 -> a
+    306:326:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
+    327:328:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1299:1300 -> a
+    327:328:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1293 -> a
+    327:328:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
+    329:329:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1294:1294 -> a
+    329:329:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103 -> a
+    330:330:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1306:1306 -> a
+    331:355:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1343:1367 -> a
+    356:356:void reportMissingField(com.android.tools.r8.graph.DexField):1385:1385 -> a
+    356:356:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
+    357:357:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    357:357:void reportMissingField(com.android.tools.r8.graph.DexField):1386 -> a
+    357:357:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
+    358:358:void reportMissingField(com.android.tools.r8.graph.DexField):1385:1385 -> a
+    358:358:void access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):103 -> a
+    359:373:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1423:1437 -> a
+    374:374:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    374:374:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1437 -> a
+    375:375:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440:1440 -> a
+    376:403:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1484:1511 -> a
+    376:403:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    404:404:com.android.tools.r8.shaking.Enqueuer$Mode getMode():318:318 -> a
+    404:404:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1516 -> a
+    404:404:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    405:418:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1516:1529 -> a
+    405:418:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    419:440:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1549:1570 -> a
+    419:440:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1530 -> a
+    419:440:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    441:450:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1532:1541 -> a
+    441:450:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1443 -> a
+    451:455:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1631:1635 -> a
+    451:455:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1445 -> a
+    456:456:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> a
+    456:456:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1635 -> a
+    456:456:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1445 -> a
+    457:461:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1635:1639 -> a
+    457:461:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1445 -> a
+    462:462:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1447:1447 -> a
+    463:463:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1428:1428 -> a
+    464:464:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexProgramClass.asProgramClass():0:0 -> a
+    464:464:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1428 -> a
+    465:466:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1576:1577 -> a
+    467:470:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1579:1582 -> a
+    471:502:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2412:2443 -> a
+    471:502:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1583 -> a
+    503:504:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1584:1585 -> a
+    505:505:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.isLibraryMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):48:48 -> a
+    505:505:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1588 -> a
+    506:506:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1585:1585 -> a
+    507:514:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1598:1605 -> a
+    515:515:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1656:1656 -> a
+    516:536:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1725:1745 -> a
+    516:536:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    537:537:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
+    537:537:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1746 -> a
+    537:537:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    538:539:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1747:1748 -> a
+    538:539:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103 -> a
+    540:540:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1786:1786 -> a
+    541:541:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1818:1818 -> a
+    542:542:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1839:1839 -> a
+    543:543:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847:1847 -> a
+    544:570:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855:1881 -> a
+    544:570:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    571:571:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    571:571:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1882 -> a
+    571:571:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    572:609:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1974:2011 -> a
+    572:609:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    572:609:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    610:625:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2029:2044 -> a
+    610:625:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010 -> a
+    610:625:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    610:625:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    626:629:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2030:2033 -> a
+    626:629:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010 -> a
+    626:629:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    626:629:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    630:638:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2032:2040 -> a
+    630:638:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010 -> a
+    630:638:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    630:638:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    639:648:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2012:2021 -> a
+    639:648:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886 -> a
+    639:648:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    649:662:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1887:1900 -> a
+    649:662:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    663:663:java.util.Set com.android.tools.r8.graph.ResolutionResult.lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
+    663:663:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1901 -> a
+    663:663:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    664:671:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1902:1909 -> a
+    664:671:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847 -> a
+    672:672:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917:1917 -> a
+    673:673:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    673:673:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
+    673:673:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917 -> a
+    674:686:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917:1929 -> a
+    687:687:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1807:1807 -> a
+    687:687:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1937 -> a
+    688:711:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1941:1964 -> a
+    712:718:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1961:1967 -> a
+    719:722:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1944:1947 -> a
+    723:723:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1944:1944 -> a
+    724:735:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2077:2088 -> a
+    736:736:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
+    736:736:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2091 -> a
+    737:756:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2090:2109 -> a
+    757:757:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    757:757:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2109 -> a
+    758:763:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2112:2117 -> a
+    764:771:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2126:2133 -> a
+    772:779: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):2142:2149 -> a
+    780:782:boolean verifyKeptGraph():2154:2156 -> a
+    780:782: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):2149 -> a
+    783:783: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):2150:2150 -> a
+    784:799:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2163:2178 -> a
+    800:821:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2177:2198 -> a
+    822:827:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2234:2239 -> a
+    822:827:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2212 -> a
+    828:832:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2213:2217 -> a
+    833:835:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2216:2218 -> a
+    836:836:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2165:2165 -> a
+    837:837:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2170:2170 -> a
+    838:843:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2224:2229 -> a
+    844:870:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2245:2271 -> a
+    871:871:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,java.util.Collection):106:106 -> a
+    871:871:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2271 -> a
+    872:936:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2272:2336 -> a
+    937:946:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2335:2344 -> a
+    947:951:void unpinLambdaMethods():2350:2354 -> a
+    947:951:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2346 -> a
+    952:952:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2344:2344 -> a
+    953:953:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2268:2268 -> a
+    954:954:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2289:2289 -> a
+    955:955:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2294:2294 -> a
+    956:956:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
+    956:956:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2294 -> a
+    957:957:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295:2295 -> a
+    958:958:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):495:495 -> a
+    958:958:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2296 -> a
+    959:959:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> a
+    959:959:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):498 -> a
+    959:959:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2296 -> a
+    960:960:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
+    960:960:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295 -> a
+    961:989:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2359:2387 -> a
+    990:999:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2384:2393 -> a
+    1000:1007:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2399:2406 -> a
+    1008:1019:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2453:2464 -> a
+    1020:1020:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1020:1020:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2464 -> a
+    1021:1025:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2466:2470 -> a
+    1026:1029:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2469:2472 -> a
+    1030:1047:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2471:2488 -> a
+    1048:1048:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2488:2488 -> a
+    1049:1051:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2502:2504 -> a
+    1052:1052:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> a
+    1052:1052:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2504 -> a
+    1053:1053:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2504:2504 -> a
+    1054:1066:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2848:2860 -> a
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> b
-    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1737 -> b
+    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1695 -> b
     2:2:java.util.Map access$1000(com.android.tools.r8.shaking.Enqueuer):103:103 -> b
-    3:3:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> b
-    4:4:void access$4500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> b
+    3:3:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> b
+    4:4:void access$4200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> b
     5:5:void access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> b
-    6:6:boolean isProgramClass(com.android.tools.r8.graph.DexType):341:341 -> b
+    6:6:boolean isProgramClass(com.android.tools.r8.graph.DexType):331:331 -> b
     6:6:boolean access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):103 -> b
-    7:8:java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers():369:370 -> b
-    9:9:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):538:538 -> b
-    10:25:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1104:1119 -> b
-    26:26:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1116:1116 -> b
-    27:29:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1142:1144 -> b
-    30:30:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1142:1142 -> b
-    31:31:void lambda$markTypeAsLive$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1215:1215 -> b
-    32:32:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$10(com.android.tools.r8.graph.DexType):1226:1226 -> b
-    33:33:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$11(com.android.tools.r8.graph.DexProgramClass):1261:1261 -> b
-    34:34:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1279:1279 -> b
-    34:34:void lambda$markMethodAsTargeted$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1431 -> b
-    35:63:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1341:1369 -> b
-    64:64:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1410:1410 -> b
-    65:65:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    65:65:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1411 -> b
-    66:80:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1452:1466 -> b
-    81:81:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    81:81:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1466 -> b
-    82:82:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1469:1469 -> b
-    83:110:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1513:1540 -> b
-    83:110:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1472 -> b
-    111:111:com.android.tools.r8.shaking.Enqueuer$Mode getMode():328:328 -> b
-    111:111:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1545 -> b
-    111:111:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1472 -> b
-    112:125:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1545:1558 -> b
-    112:125:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1472 -> b
-    126:147:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1578:1599 -> b
-    126:147:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1559 -> b
-    126:147:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1472 -> b
-    148:157:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1561:1570 -> b
-    148:157:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1472 -> b
-    158:162:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1660:1664 -> b
-    158:162:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1474 -> b
-    163:163:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):36:36 -> b
-    163:163:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1664 -> b
-    163:163:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1474 -> b
-    164:168:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1664:1668 -> b
-    164:168:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1474 -> b
-    169:169:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1476:1476 -> b
-    170:176:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1675:1681 -> b
-    177:177:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1699:1699 -> b
-    178:183:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1741:1746 -> b
-    184:184:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    184:184:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1746 -> b
-    185:192:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1748:1755 -> b
-    193:194:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1832:1833 -> b
-    195:195:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1862:1862 -> b
-    196:200:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2090:2094 -> b
-    196:200:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2102 -> b
-    201:201:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
-    201:201:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2094 -> b
-    201:201:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2102 -> b
-    202:202:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2094:2094 -> b
-    202:202:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2102 -> b
-    203:208:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2093:2098 -> b
-    203:208:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2102 -> b
-    209:215:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2102:2108 -> b
-    216:216:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2359:2359 -> b
-    217:219:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2568:2570 -> b
-    220:220:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> b
-    220:220:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2571 -> b
-    221:222:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2572:2573 -> b
-    223:229:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2579:2585 -> b
-    223:229:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    230:237:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2675:2682 -> b
-    230:237:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2586 -> b
-    230:237:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    238:246:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2681:2689 -> b
-    238:246:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2586 -> b
-    238:246:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    247:247:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
-    247:247:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2693 -> b
-    247:247:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2586 -> b
-    247:247:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    248:251:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2695:2698 -> b
-    248:251:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2586 -> b
-    248:251:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    252:252:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2589:2589 -> b
-    252:252:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    253:258:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2705:2710 -> b
-    253:258:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    253:258:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    259:259:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    259:259:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2710 -> b
-    259:259:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    259:259:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    260:274:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2711:2725 -> b
-    260:274:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    260:274:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    275:301:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2724:2750 -> b
-    275:301:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    275:301:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    302:302:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
-    302:302:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2752 -> b
-    302:302:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    302:302:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    303:347:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2754:2798 -> b
-    303:347:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    303:347:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    348:348:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    348:348:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2710 -> b
-    348:348:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2590 -> b
-    348:348:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    349:349:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2593:2593 -> b
-    349:349:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    350:355:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2845:2850 -> b
-    350:355:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2594 -> b
-    350:355:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    356:356:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2597:2597 -> b
-    356:356:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    357:384:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2808:2835 -> b
-    357:384:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2598 -> b
-    357:384:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    385:385:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2601:2601 -> b
-    385:385:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    386:391:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2856:2861 -> b
-    386:391:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2602 -> b
-    386:391:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    392:392:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    392:392:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2861 -> b
-    392:392:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2602 -> b
-    392:392:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    393:405:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2862:2874 -> b
-    393:405:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2602 -> b
-    393:405:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    406:422:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2867:2883 -> b
-    406:422:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2602 -> b
-    406:422:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    423:423:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():258:258 -> b
-    423:423:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2861 -> b
-    423:423:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2602 -> b
-    423:423:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    424:438:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2605:2619 -> b
-    424:438:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    439:439:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
-    439:439:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2620 -> b
-    439:439:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    440:468:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2621:2649 -> b
-    440:468:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    469:469:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):538:538 -> b
-    469:469:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2649 -> b
-    469:469:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    470:470:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2650:2650 -> b
-    470:470:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    471:471:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):542:542 -> b
-    471:471:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2650 -> b
-    471:471:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    472:487:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2653:2668 -> b
-    472:487:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    488:489:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2665:2666 -> b
-    488:489:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2574 -> b
-    490:490:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():928:928 -> b
-    490:490:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2571 -> b
+    7:8:java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers():359:360 -> b
+    9:11:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):485:487 -> b
+    12:12:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):517:517 -> b
+    13:28:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1074:1089 -> b
+    29:29:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1086:1086 -> b
+    30:32:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1112:1114 -> b
+    33:33:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1112:1112 -> b
+    34:34:void lambda$markTypeAsLive$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1181:1181 -> b
+    35:35:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$10(com.android.tools.r8.graph.DexType):1192:1192 -> b
+    36:36:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> b
+    36:36:void lambda$markMethodAsTargeted$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1402 -> b
+    37:65:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1310:1338 -> b
+    66:66:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1379:1379 -> b
+    67:67:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    67:67:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1380 -> b
+    68:74:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1646:1652 -> b
+    75:75:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1657:1657 -> b
+    76:77:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1790:1791 -> b
+    78:79:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1812:1813 -> b
+    80:80:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    80:80:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1814 -> b
+    81:96:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1817:1832 -> b
+    97:97:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1807:1807 -> b
+    97:97:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1834 -> b
+    98:103:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1835:1840 -> b
+    104:104:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1820:1820 -> b
+    105:105:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1928:1928 -> b
+    106:110:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2048:2052 -> b
+    106:110:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    111:111:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
+    111:111:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2052 -> b
+    111:111:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    112:112:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2052:2052 -> b
+    112:112:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    113:118:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2051:2056 -> b
+    113:118:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060 -> b
+    119:125:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060:2066 -> b
+    126:126:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2316:2316 -> b
+    127:129:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2528:2530 -> b
+    130:130:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> b
+    130:130:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2531 -> b
+    131:132:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2532:2533 -> b
+    133:139:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2539:2545 -> b
+    133:139:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    140:147:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2634:2641 -> b
+    140:147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    140:147:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    148:156:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2640:2648 -> b
+    148:156:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    148:156:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    157:157:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
+    157:157:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2652 -> b
+    157:157:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    157:157:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    158:161:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2654:2657 -> b
+    158:161:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2546 -> b
+    158:161:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    162:162:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2549:2549 -> b
+    162:162:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    163:168:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2664:2669 -> b
+    163:168:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    163:168:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    169:169:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    169:169:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2669 -> b
+    169:169:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    169:169:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    170:184:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2670:2684 -> b
+    170:184:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    170:184:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    185:211:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2683:2709 -> b
+    185:211:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    185:211:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    212:212:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
+    212:212:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2711 -> b
+    212:212:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    212:212:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    213:257:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2713:2757 -> b
+    213:257:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    213:257:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    258:258:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    258:258:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2669 -> b
+    258:258:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2550 -> b
+    258:258:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    259:259:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2553:2553 -> b
+    259:259:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    260:265:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2804:2809 -> b
+    260:265:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2554 -> b
+    260:265:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    266:266:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2557:2557 -> b
+    266:266:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    267:294:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2767:2794 -> b
+    267:294:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2558 -> b
+    267:294:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    295:295:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2561:2561 -> b
+    295:295:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    296:301:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2815:2820 -> b
+    296:301:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    296:301:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    302:302:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    302:302:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2820 -> b
+    302:302:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    302:302:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    303:315:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2821:2833 -> b
+    303:315:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    303:315:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    316:332:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2826:2842 -> b
+    316:332:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    316:332:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    333:333:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue():257:257 -> b
+    333:333:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2820 -> b
+    333:333:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2562 -> b
+    333:333:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    334:348:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2565:2579 -> b
+    334:348:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    349:349:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> b
+    349:349:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2580 -> b
+    349:349:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    350:378:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581:2609 -> b
+    350:378:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    379:379:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):517:517 -> b
+    379:379:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2609 -> b
+    379:379:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    380:380:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2610:2610 -> b
+    380:380:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    381:381:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):521:521 -> b
+    381:381:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2610 -> b
+    381:381:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    382:396:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2613:2627 -> b
+    382:396:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    397:397:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2625:2625 -> b
+    397:397:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    398:398:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2624:2624 -> b
+    398:398:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2534 -> b
+    399:399:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.IRCode.instructionIterator():924:924 -> b
+    399:399:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2531 -> b
     1:1:java.util.Map access$1200(com.android.tools.r8.shaking.Enqueuer):103:103 -> c
-    2:2:void access$4600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> c
-    3:3:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():409:409 -> c
-    4:6:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):506:508 -> c
-    7:7:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):542:542 -> c
-    8:8:java.util.Set lambda$handleAnnotation$12(com.android.tools.r8.graph.DexType):1291:1291 -> c
-    9:15:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1704:1710 -> c
-    16:17:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1330:1331 -> c
-    16:17:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1715 -> c
-    18:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1720:1721 -> c
-    20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1722 -> c
-    21:21:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1725:1725 -> c
-    22:22:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]) -> c
-    22:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1726 -> c
-    23:30:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1730:1737 -> c
-    31:31:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1706:1706 -> c
-    32:36:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1837:1841 -> c
-    37:37:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
-    37:37:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1842 -> c
-    38:39:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1844:1845 -> c
-    40:40:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
-    40:40:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1842 -> c
-    41:41:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1970:1970 -> c
-    42:42:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2155:2155 -> c
-    43:43:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2534:2534 -> c
-    44:49:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2550:2555 -> c
-    44:49:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
-    50:50:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
-    50:50:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2556 -> c
-    50:50:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
-    51:53:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2557:2559 -> c
-    51:53:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
-    54:54:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2557:2557 -> c
-    54:54:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
-    55:55:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2550:2550 -> c
-    55:55:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    2:2:void access$4300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> c
+    3:3:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():399:399 -> c
+    4:4:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):521:521 -> c
+    5:5:java.util.Set lambda$handleAnnotation$11(com.android.tools.r8.graph.DexType):1260:1260 -> c
+    6:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markMethodAsTargeted$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1398:1398 -> c
+    7:19:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1451:1463 -> c
+    20:20:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1664:1664 -> c
+    21:26:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1699:1704 -> c
+    27:27:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    27:27:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1704 -> c
+    28:35:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1706:1713 -> c
+    36:44:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1755:1763 -> c
+    45:46:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1063:1064 -> c
+    45:46:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1763 -> c
+    47:47:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1764:1764 -> c
+    48:48:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1069:1069 -> c
+    48:48:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1764 -> c
+    49:51:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1765:1767 -> c
+    52:52:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    52:52:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1766 -> c
+    53:57:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1795:1799 -> c
+    58:58:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    58:58:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1800 -> c
+    59:60:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1802:1803 -> c
+    61:61:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    61:61:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1800 -> c
+    62:62:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2113:2113 -> c
+    63:68:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2510:2515 -> c
+    63:68:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    69:69:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
+    69:69:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2516 -> c
+    69:69:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    70:72:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517:2519 -> c
+    70:72:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    73:73:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517:2517 -> c
+    73:73:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
+    74:74:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2510:2510 -> c
+    74:74:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103 -> c
     1:1:java.util.Map access$1400(com.android.tools.r8.shaking.Enqueuer):103:103 -> d
-    2:3:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():375:376 -> d
-    4:4:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexType):1118:1118 -> d
-    5:17:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1480:1492 -> d
-    18:19:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1698:1699 -> d
-    20:20:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1708:1708 -> d
-    21:29:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1797:1805 -> d
-    30:31:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1093:1094 -> d
-    30:31:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1805 -> d
-    32:32:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1806:1806 -> d
-    33:33:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1099:1099 -> d
-    33:33:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1806 -> d
-    34:36:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1807:1809 -> d
-    37:37:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    37:37:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1808 -> d
-    38:42:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2532:2536 -> d
-    43:43:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$38(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2538:2538 -> d
+    2:3:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():365:366 -> d
+    4:4:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexType):1088:1088 -> d
+    5:6:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1656:1657 -> d
+    7:13:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1662:1668 -> d
+    14:15:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1299:1300 -> d
+    14:15:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1673 -> d
+    16:17:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1678:1679 -> d
+    18:18:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    18:18:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1680 -> d
+    19:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1683:1683 -> d
+    20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1684 -> d
+    21:28:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1688:1695 -> d
+    29:29:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1666:1666 -> d
+    30:31:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1718:1719 -> d
+    32:32:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    32:32:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1719 -> d
+    33:33:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1721:1721 -> d
+    34:38:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2492:2496 -> d
+    39:39:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2494:2494 -> d
     1:1:com.android.tools.r8.graph.AppInfoWithSubtyping access$1600(com.android.tools.r8.shaking.Enqueuer):103:103 -> e
-    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$5(com.android.tools.r8.graph.DexType):1137:1137 -> e
-    3:11:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):1685:1693 -> e
-    12:13:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1760:1761 -> e
-    14:14:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> e
-    14:14:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1761 -> e
-    15:15:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1763:1763 -> e
-    16:18:void markReferencedTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2526:2528 -> e
-    19:19:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markReferencedTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2527:2527 -> e
+    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$5(com.android.tools.r8.graph.DexType):1107:1107 -> e
+    3:16:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1392:1405 -> e
+    17:17:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> e
+    17:17:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1405 -> e
+    18:21:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1407:1410 -> e
+    22:22:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524:2524 -> e
+    22:22:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    23:28:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:187 -> e
+    23:28:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524 -> e
+    23:28:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    29:29:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524:2524 -> e
+    29:29:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    30:30:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:182 -> e
+    30:30:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524 -> e
+    30:30:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1411 -> e
+    31:31:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2498:2498 -> e
     1:1:java.util.Set access$1900(com.android.tools.r8.shaking.Enqueuer):103:103 -> f
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):531:531 -> f
-    3:3:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$6(com.android.tools.r8.graph.DexType):1144:1144 -> f
-    4:15:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1423:1434 -> f
-    16:16:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> f
-    16:16:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1434 -> f
-    17:20:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1436:1439 -> f
-    21:21:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2564:2564 -> f
-    21:21:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440 -> f
-    22:27:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:187 -> f
-    22:27:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2564 -> f
-    22:27:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440 -> f
-    28:28:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2564:2564 -> f
-    28:28:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440 -> f
-    29:29:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:182 -> f
-    29:29:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2564 -> f
-    29:29:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440 -> f
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):510:510 -> f
+    3:3:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$6(com.android.tools.r8.graph.DexType):1114:1114 -> f
+    4:8:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1773:1777 -> f
+    9:9:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1775:1775 -> f
+    10:10:boolean com.android.tools.r8.shaking.KeepReason.isDueToKeepRule():0:0 -> f
+    10:10:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1776 -> f
+    11:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1778:1779 -> f
+    13:13:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> f
+    13:13:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1780 -> f
     1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.Enqueuer):103:103 -> g
-    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$7(com.android.tools.r8.graph.DexType):1167:1167 -> g
-    3:7:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1815:1819 -> g
-    8:8:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1817:1817 -> g
-    9:9:boolean com.android.tools.r8.shaking.KeepReason.isDueToKeepRule():0:0 -> g
-    9:9:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1818 -> g
-    10:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1820:1821 -> g
-    12:12:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> g
-    12:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1822 -> g
+    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$7(com.android.tools.r8.graph.DexType):1137:1137 -> g
     1:1:java.util.Set access$2500(com.android.tools.r8.shaking.Enqueuer):103:103 -> h
-    2:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1404:1405 -> h
+    2:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1373:1374 -> h
     4:4:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> h
-    4:4:void reportMissingClass(com.android.tools.r8.graph.DexType):1405 -> h
-    1:1:java.util.Set access$2600(com.android.tools.r8.shaking.Enqueuer):103:103 -> i
-    1:1:java.util.Set access$2800(com.android.tools.r8.shaking.Enqueuer):103:103 -> j
+    4:4:void reportMissingClass(com.android.tools.r8.graph.DexType):1374 -> h
+    1:1:java.util.Set access$2700(com.android.tools.r8.shaking.Enqueuer):103:103 -> i
+    1:1:com.android.tools.r8.utils.InternalOptions access$2900(com.android.tools.r8.shaking.Enqueuer):103:103 -> j
     1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer):103:103 -> k
-    1:1:com.android.tools.r8.utils.InternalOptions access$3000(com.android.tools.r8.shaking.Enqueuer):103:103 -> l
+    1:1:java.util.Set access$3000(com.android.tools.r8.shaking.Enqueuer):103:103 -> l
     1:1:java.util.Set access$3100(com.android.tools.r8.shaking.Enqueuer):103:103 -> m
     1:1:java.util.Set access$3200(com.android.tools.r8.shaking.Enqueuer):103:103 -> n
-    1:1:java.util.Set access$3300(com.android.tools.r8.shaking.Enqueuer):103:103 -> o
-    1:1:boolean access$3500(com.android.tools.r8.shaking.Enqueuer):103:103 -> p
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$3700(com.android.tools.r8.shaking.Enqueuer):103:103 -> q
-    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer):103:103 -> r
-    1:1:java.util.Map access$500(com.android.tools.r8.shaking.Enqueuer):103:103 -> s
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$700(com.android.tools.r8.shaking.Enqueuer):103:103 -> t
-    1:1:java.util.Map access$800(com.android.tools.r8.shaking.Enqueuer):103:103 -> u
-com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.N.t:
+    1:1:boolean access$3400(com.android.tools.r8.shaking.Enqueuer):103:103 -> o
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$3600(com.android.tools.r8.shaking.Enqueuer):103:103 -> p
+    1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer):103:103 -> q
+    1:1:java.util.Map access$500(com.android.tools.r8.shaking.Enqueuer):103:103 -> r
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$700(com.android.tools.r8.shaking.Enqueuer):103:103 -> s
+    1:1:java.util.Map access$800(com.android.tools.r8.shaking.Enqueuer):103:103 -> t
+com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.N.s:
     int[] $SwitchMap$com$android$tools$r8$graph$DexMethodHandle$MethodHandleType -> a
-    1:1:void <clinit>():1002:1002 -> <clinit>
-com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.N.u:
+    1:1:void <clinit>():972:972 -> <clinit>
+com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.N.t:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.shaking.Enqueuer this$0 -> d
     com.android.tools.r8.graph.DexItem annotationHolder -> a
     com.android.tools.r8.shaking.KeepReason reason -> c
-    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):3067:3067 -> <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):3074:3077 -> <init>
+    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):3001:3001 -> <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):3008:3011 -> <init>
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    1:15:boolean addField(com.android.tools.r8.graph.DexField):3087:3101 -> b
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> b
-    16:16:boolean addField(com.android.tools.r8.graph.DexField):3101 -> b
-    17:29:boolean addField(com.android.tools.r8.graph.DexField):3101:3113 -> b
-    30:39:boolean addMethod(com.android.tools.r8.graph.DexMethod):3121:3130 -> b
-    40:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):3129:3136 -> b
-    48:49:boolean addType(com.android.tools.r8.graph.DexType):3166:3167 -> b
-com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.N.v:
-    com.android.tools.r8.shaking.Enqueuer this$0 -> c
-    java.util.Set items -> a
-    java.util.function.BiConsumer register -> b
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):2930:2930 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):2926:2931 -> <init>
-    1:1:java.util.Set access$4100(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):2924:2924 -> a
-    2:4:boolean add(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2935:2937 -> a
-    5:5:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):2941:2941 -> a
-    6:6:java.util.Set getItems():2945:2945 -> a
-com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.N.w:
+    1:15:boolean addField(com.android.tools.r8.graph.DexField):3021:3035 -> b
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    16:16:boolean addField(com.android.tools.r8.graph.DexField):3035 -> b
+    17:29:boolean addField(com.android.tools.r8.graph.DexField):3035:3047 -> b
+    30:39:boolean addMethod(com.android.tools.r8.graph.DexMethod):3055:3064 -> b
+    40:47:boolean addMethod(com.android.tools.r8.graph.DexMethod):3063:3070 -> b
+    48:49:boolean addType(com.android.tools.r8.graph.DexType):3100:3101 -> b
+com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.N.u:
     com.android.tools.r8.graph.DexClass holder -> a
     com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget UNRESOLVED -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> b
     boolean $assertionsDisabled -> d
-    1:3:void <clinit>():2973:2975 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):2984:2987 -> <init>
-    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2981:2981 -> a
-    1:1:boolean isUnresolved():2991 -> a
-    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2981:2981 -> b
-    1:2:boolean equals(java.lang.Object):3003:3004 -> equals
-    1:1:int hashCode():2997:2997 -> hashCode
+    1:3:void <clinit>():2907:2909 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):2918:2921 -> <init>
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2915:2915 -> a
+    1:1:boolean isUnresolved():2925 -> a
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2915:2915 -> b
+    1:2:boolean equals(java.lang.Object):2937:2938 -> equals
+    1:1:int hashCode():2931:2931 -> hashCode
     2:2:int com.android.tools.r8.graph.KeyedDexItem.hashCode():20:20 -> hashCode
-    2:2:int hashCode():2997 -> hashCode
-com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.N.x:
+    2:2:int hashCode():2931 -> hashCode
+com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.N.v:
     com.android.tools.r8.shaking.Enqueuer$Mode WHY_ARE_YOU_KEEPING -> d
     com.android.tools.r8.shaking.Enqueuer$Mode MAIN_DEX_TRACING -> c
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_TREE_SHAKING -> b
@@ -57987,195 +57782,193 @@
     2:2:boolean isInitialOrFinalTreeShaking():120 -> a
     1:1:boolean isInitialTreeShaking():112:112 -> b
     1:1:boolean isTracingMainDex():124:124 -> c
-com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.N.y:
+com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.N.w:
     java.util.Map methods -> a
-    1:4:void <init>():3008:3011 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3008:3008 -> <init>
-    1:1:java.util.Set getMethods():3014:3014 -> a
-    2:2:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):3018:3018 -> a
-    2:2:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3022 -> a
-    3:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3024:3029 -> a
-    9:9:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):3018:3018 -> a
-com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.N.z:
+    1:4:void <init>():2942:2945 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2942:2942 -> <init>
+    1:1:java.util.Set getMethods():2948:2948 -> a
+    2:2:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2952:2952 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2956 -> a
+    3:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2958:2963 -> a
+    9:9:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2952:2952 -> a
+com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.N.x:
     java.util.Set items -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(java.util.function.BiConsumer):2955:2955 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):2951:2956 -> <init>
-    1:1:java.util.Set access$3900(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2949:2949 -> a
-    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2960:2961 -> a
-    4:4:boolean contains(java.lang.Object):2965:2965 -> a
-    5:5:java.util.Set getItems():2969:2969 -> a
-com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.N.A:
+    1:1:void <init>(java.util.function.BiConsumer):2889:2889 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):2885:2890 -> <init>
+    1:1:java.util.Set access$3800(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2883:2883 -> a
+    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2894:2895 -> a
+    4:4:boolean contains(java.lang.Object):2899:2899 -> a
+    5:5:java.util.Set getItems():2903:2903 -> a
+com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.N.y:
     java.util.Set items -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():2906:2906 -> <clinit>
-    1:3:void <init>():2906:2908 -> <init>
-    4:4:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2906:2906 -> <init>
-    1:1:java.util.Set access$4000(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):2906:2906 -> a
-    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2911:2912 -> a
-    4:4:boolean contains(java.lang.Object):2916:2916 -> a
-    5:5:java.util.Set getItems():2920:2920 -> a
-com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.N.B:
+    1:1:void <clinit>():2865:2865 -> <clinit>
+    1:3:void <init>():2865:2867 -> <init>
+    4:4:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2865:2865 -> <init>
+    1:1:java.util.Set access$3900(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):2865:2865 -> a
+    2:3:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2870:2871 -> a
+    4:4:boolean contains(java.lang.Object):2875:2875 -> a
+    5:5:java.util.Set getItems():2879:2879 -> a
+com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.N.z:
     com.android.tools.r8.shaking.Enqueuer this$0 -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexProgramClass currentHolder -> c
     com.android.tools.r8.graph.DexEncodedMethod currentMethod -> d
-    1:1:void <clinit>():583:583 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):583:583 -> <init>
-    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):588:592 -> <init>
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):596:596 -> a
-    2:2:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):626:626 -> a
-    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):630:633 -> a
+    1:1:void <clinit>():562:562 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):562:562 -> <init>
+    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):567:571 -> <init>
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> a
+    2:2:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):605:605 -> a
+    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):609:612 -> 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:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):634 -> a
-    8:8:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):636:636 -> a
-    9:27:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):754:772 -> a
+    7:7:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):613 -> a
+    8:8:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):615:615 -> a
+    9:27:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):733:751 -> a
     28:28:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    28:28:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):773 -> a
-    29:31:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):778:780 -> a
-    32:32:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):596:596 -> a
-    32:32:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):780 -> a
-    33:39:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):780:786 -> a
-    40:40:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):785:785 -> a
-    41:46:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):797:802 -> a
-    47:47:java.lang.Boolean lambda$registerStaticFieldRead$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):836:836 -> a
-    48:48:boolean registerCheckCast(com.android.tools.r8.graph.DexType):922:922 -> a
-    49:49:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):933:933 -> a
+    28:28:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):752 -> a
+    29:31:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):757:759 -> a
+    32:32:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> a
+    32:32:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):759 -> a
+    33:39:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):759:765 -> a
+    40:40:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):764:764 -> a
+    41:46:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):776:781 -> a
+    47:47:java.lang.Boolean lambda$registerStaticFieldRead$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):815:815 -> a
+    48:48:boolean registerCheckCast(com.android.tools.r8.graph.DexType):892:892 -> a
+    49:49:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):903:903 -> a
     50:50:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
-    50:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):940 -> a
-    51:55:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):940:944 -> a
+    50:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):910 -> a
+    51:55:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):910:914 -> a
     56:56:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
-    56:56:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):944 -> a
-    57:60:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):945:948 -> a
-    61:125:void registerCallSite(com.android.tools.r8.graph.DexCallSite):956:1020 -> a
-    126:136:void registerCallSite(com.android.tools.r8.graph.DexCallSite):1007:1017 -> a
-    137:137:void registerCallSite(com.android.tools.r8.graph.DexCallSite):1016:1016 -> a
-    138:138:void registerCallSite(com.android.tools.r8.graph.DexCallSite):1010:1010 -> a
-    139:179:void registerCallSite(com.android.tools.r8.graph.DexCallSite):1004:1044 -> a
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):677:677 -> b
-    2:5:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):681:684 -> b
+    56:56:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):914 -> a
+    57:60:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):915:918 -> a
+    61:125:void registerCallSite(com.android.tools.r8.graph.DexCallSite):926:990 -> a
+    126:136:void registerCallSite(com.android.tools.r8.graph.DexCallSite):977:987 -> a
+    137:137:void registerCallSite(com.android.tools.r8.graph.DexCallSite):986:986 -> a
+    138:138:void registerCallSite(com.android.tools.r8.graph.DexCallSite):980:980 -> a
+    139:179:void registerCallSite(com.android.tools.r8.graph.DexCallSite):974:1014 -> a
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):656:656 -> b
+    2:5:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):660:663 -> b
     6:6:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    6:6:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):685 -> b
-    7:7:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):687:687 -> b
-    8:26:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):708:726 -> b
+    6:6:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):664 -> b
+    7:7:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):666:666 -> b
+    8:26:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):687:705 -> b
     27:27:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    27:27:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):727 -> b
-    28:39:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):731:742 -> b
-    40:40:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):596:596 -> b
-    40:40:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):742 -> b
-    41:47:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):742:748 -> b
-    48:48:java.lang.Boolean lambda$registerStaticFieldWrite$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):881:881 -> b
-    49:56:boolean registerConstClass(com.android.tools.r8.graph.DexType):910:917 -> b
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):642:642 -> c
-    2:24:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):646:668 -> c
+    27:27:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):706 -> b
+    28:39:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):710:721 -> b
+    40:40:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> b
+    40:40:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):721 -> b
+    41:47:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):721:727 -> b
+    48:48:java.lang.Boolean lambda$registerStaticFieldWrite$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):860:860 -> b
+    49:49:boolean registerConstClass(com.android.tools.r8.graph.DexType):887:887 -> b
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):621:621 -> c
+    2:24:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):625:647 -> c
     25:25:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    25:25:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):669 -> c
-    26:26:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):671:671 -> c
-    27:27:boolean registerNewInstance(com.android.tools.r8.graph.DexType):792:792 -> c
+    25:25:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):648 -> c
+    26:26:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):650:650 -> c
+    27:27:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771:771 -> c
     28:28:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.DexEncodedMethod) -> c
-    28:28:boolean registerNewInstance(com.android.tools.r8.graph.DexType):792 -> c
-    29:29:boolean registerNewInstance(com.android.tools.r8.graph.DexType):792:792 -> c
-    30:48:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):810:828 -> c
+    28:28:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771 -> c
+    29:29:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771:771 -> c
+    30:48:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):789:807 -> c
     49:49:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    49:49:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):828 -> c
-    50:56:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):831:837 -> c
-    57:72:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):834:849 -> c
-    1:8:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):605:612 -> d
-    9:19:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):607:617 -> d
+    49:49:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):807 -> c
+    50:56:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):810:816 -> c
+    57:72:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):813:828 -> c
+    1:8:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):584:591 -> d
+    9:19:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):586:596 -> d
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    20:20:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):618 -> d
-    21:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):620:620 -> d
-    22:27:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):695:700 -> d
+    20:20:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):597 -> d
+    21:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):599:599 -> d
+    22:27:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):674:679 -> d
     28:28:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    28:28:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):700 -> d
-    29:29:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):702:702 -> d
-    30:48:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):855:873 -> d
+    28:28:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):679 -> d
+    29:29:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):681:681 -> d
+    30:48:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):834:852 -> d
     49:49:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    49:49:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):873 -> d
-    50:56:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):876:882 -> d
-    57:80:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):879:902 -> d
-    81:81:boolean registerTypeReference(com.android.tools.r8.graph.DexType):927:927 -> d
-    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):601:601 -> e
-    2:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1050:1059 -> e
-    12:12:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1058:1058 -> e
-com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.N.D:
+    49:49:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):852 -> d
+    50:56:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):855:861 -> d
+    57:80:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):858:881 -> d
+    81:81:boolean registerTypeReference(com.android.tools.r8.graph.DexType):897:897 -> d
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):580:580 -> e
+    2:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1020:1029 -> e
+    12:12:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1028:1028 -> e
+com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.N.B:
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableSortedMap com.android.tools.r8.shaking.EnqueuerUtils.toImmutableSortedMap(java.util.Map,java.util.Comparator):15:17 -> a
     4:4:com.android.tools.r8.shaking.Enqueuer createForInitialTreeShaking(com.android.tools.r8.graph.AppView):16:16 -> a
     5:5:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):21:21 -> a
     1:1:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView):25:25 -> b
     2:2:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):30:30 -> b
     1:1:com.android.tools.r8.shaking.Enqueuer createForWhyAreYouKeeping(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):35:35 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.N.O:
+com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.N.M:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Queue queue -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):169:169 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):167:170 -> <init>
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):174:174 -> a
-    2:2:boolean isEmpty():178:178 -> a
-    3:3:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):186:186 -> a
-    4:4:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):198:198 -> a
-    5:6:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):203:204 -> a
-    7:8:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):211:212 -> a
-    9:10:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):229:230 -> a
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action poll():182:182 -> b
-    2:2:void enqueueMarkReachableInterfaceAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):194:194 -> b
-    3:4:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):223:224 -> b
-    1:1:void enqueueMarkReachableVirtualAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):190:190 -> c
-    2:3:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):217:218 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist$Action -> com.android.tools.r8.N.E:
-    1:1:void <init>():18:18 -> <init>
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):162:162 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):160:163 -> <init>
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):167:167 -> a
+    2:2:boolean isEmpty():171:171 -> a
+    3:3:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):179:179 -> a
+    4:4:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):191:191 -> a
+    5:6:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):196:197 -> a
+    7:8:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):204:205 -> a
+    9:10:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):215:216 -> a
+    11:12:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):220:221 -> a
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action poll():175:175 -> b
+    2:2:void enqueueMarkReachableInterfaceAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):187:187 -> b
+    3:4:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):210:211 -> b
+    1:1:void enqueueMarkReachableVirtualAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):183:183 -> c
+com.android.tools.r8.shaking.EnqueuerWorklist$Action -> com.android.tools.r8.N.C:
+    1:1:void <init>():17:17 -> <init>
     void run(com.android.tools.r8.shaking.Enqueuer) -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.N.F:
-    com.android.tools.r8.graph.DexEncodedField target -> b
-    com.android.tools.r8.graph.DexProgramClass holder -> a
-    com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness witness -> c
-    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):154:157 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):162:162 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.N.G:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.N.D:
+    com.android.tools.r8.graph.DexEncodedField target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):148:150 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):155:155 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.N.E:
     com.android.tools.r8.graph.DexProgramClass target -> a
     com.android.tools.r8.shaking.KeepReason reason -> c
     com.android.tools.r8.graph.DexEncodedMethod context -> b
-    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:106 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):111:111 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.N.H:
-    com.android.tools.r8.graph.DexProgramClass holder -> a
-    com.android.tools.r8.shaking.KeepReason reason -> c
-    com.android.tools.r8.graph.DexEncodedMethod target -> b
-    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):136:139 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):144:144 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.N.I:
+    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):102:105 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):110:110 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.N.F:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.shaking.KeepReason reason -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):119:121 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):126:126 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.N.J:
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):133:135 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):140:140 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.N.G:
+    com.android.tools.r8.graph.DexEncodedMethod target -> a
+    com.android.tools.r8.shaking.KeepReason reason -> b
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):118:120 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):125:125 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.N.H:
     com.android.tools.r8.shaking.KeepReason reason -> b
     com.android.tools.r8.graph.DexMethod target -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):26:28 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):33:33 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction -> com.android.tools.r8.N.K:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):25:27 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):32:32 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableFieldAction -> com.android.tools.r8.N.I:
     com.android.tools.r8.graph.DexEncodedField target -> a
     com.android.tools.r8.shaking.KeepReason reason -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):86:88 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):93:93 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableInterfaceAction -> com.android.tools.r8.N.L:
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):85:87 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):92:92 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableInterfaceAction -> com.android.tools.r8.N.J:
     com.android.tools.r8.shaking.KeepReason reason -> b
     com.android.tools.r8.graph.DexMethod target -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):56:58 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):63:63 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.N.M:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):55:57 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):62:62 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.N.K:
     com.android.tools.r8.graph.DexEncodedMethod context -> b
     com.android.tools.r8.graph.DexMethod target -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):71:73 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):78:78 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableVirtualAction -> com.android.tools.r8.N.N:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):70:72 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):77:77 -> a
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableVirtualAction -> com.android.tools.r8.N.L:
     com.android.tools.r8.shaking.KeepReason reason -> b
     com.android.tools.r8.graph.DexMethod target -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):41:43 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):48:48 -> a
-com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.N.P:
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):40:42 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):47:47 -> a
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.N.N:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -58194,7 +57987,7 @@
     1:1:boolean isUnfiltered():123:123 -> toString
     1:1:java.lang.String toString():128 -> toString
     2:16:java.lang.String toString():129:143 -> toString
-com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.N.S:
+com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.N.P:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map annotationNodes -> d
     boolean $assertionsDisabled -> j
@@ -58222,85 +58015,84 @@
     52:57: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):149:154 -> a
     52:57:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):162 -> a
     58:58:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):165:165 -> a
-    59:64:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):203:208 -> a
-    65:70:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):213:218 -> a
-    71:76:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):222:227 -> a
-    77:80:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):232:235 -> a
-    81:86:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):233:238 -> a
-    87:94:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):243:250 -> a
-    95:101:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):265:271 -> a
-    102:102:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):269:269 -> a
-    103:105: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):276:278 -> a
-    106:110:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):306:310 -> a
-    111:111:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):372:372 -> a
-    111:111:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):310 -> a
-    112:113:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):310:311 -> a
-    114:117:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):323:326 -> a
-    118:121:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):330:333 -> a
-    122:125:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):337:340 -> a
-    126:127:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):367:368 -> a
-    126:127:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):340 -> a
-    128:130:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):343:345 -> a
-    131:134:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):349:352 -> a
-    135:135:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):356:356 -> a
-    136:136:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):372:372 -> a
-    136:136:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):357 -> a
-    137:137:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):359:359 -> a
-    138:138:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):389:389 -> a
-    138:138:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):360 -> a
-    139:141:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):361:363 -> a
-    142:151:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):376:385 -> a
-    152:152:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):393:393 -> a
-    153:153:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):397:397 -> a
-    154:158:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):400:404 -> a
-    159:159:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):409:409 -> a
-    160:160:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):420:420 -> a
-    161:163:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):423:425 -> a
-    164:164:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    164:164:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):426 -> a
-    165:168:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):426:429 -> a
-    169:169:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    169:169:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):431 -> a
-    170:175:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):431:436 -> a
-    176:176:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    176:176:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):436 -> a
-    177:177:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):436:436 -> a
-    178:178:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):430:430 -> a
-    179:179:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):441:441 -> a
-    180:182:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):444:446 -> a
-    183:183:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    183:183:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):448 -> a
-    184:185:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):448:449 -> a
-    186:186:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    186:186:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):450 -> a
-    187:187:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):450:450 -> a
-    188:188:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):447:447 -> a
-    189:209:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):463:483 -> a
-    210:210: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):468:468 -> a
-    211:215:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):476:480 -> a
+    59:64:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):203:208 -> a
+    65:70:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):212:217 -> a
+    71:74:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):222:225 -> a
+    75:80:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):223:228 -> a
+    81:88:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):233:240 -> a
+    89:95:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):244:250 -> a
+    96:96:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):249:249 -> a
+    97:103:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):255:261 -> a
+    104:104:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):259:259 -> a
+    105:107: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):266:268 -> a
+    108:112:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):296:300 -> a
+    113:113:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):362:362 -> a
+    113:113:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):300 -> a
+    114:115:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):300:301 -> a
+    116:119:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):313:316 -> a
+    120:123:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):320:323 -> a
+    124:127:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):327:330 -> a
+    128:129:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):357:358 -> a
+    128:129:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):330 -> a
+    130:132:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):333:335 -> a
+    133:136:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):339:342 -> a
+    137:137:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):346:346 -> a
+    138:138:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):362:362 -> a
+    138:138:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):347 -> a
+    139:139:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):349:349 -> a
+    140:140:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):379:379 -> a
+    140:140:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):350 -> a
+    141:143:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):351:353 -> a
+    144:153:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):366:375 -> a
+    154:154:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):383:383 -> a
+    155:155:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):387:387 -> a
+    156:160:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):390:394 -> a
+    161:161:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):399:399 -> a
+    162:162:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):410:410 -> a
+    163:165:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):413:415 -> a
+    166:166:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    166:166:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):416 -> a
+    167:170:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):416:419 -> a
+    171:171:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    171:171:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):421 -> a
+    172:177:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):421:426 -> a
+    178:178:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    178:178:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):426 -> a
+    179:179:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):426:426 -> a
+    180:180:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):420:420 -> a
+    181:181:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):431:431 -> a
+    182:184:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):434:436 -> a
+    185:185:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    185:185:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):438 -> a
+    186:187:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):438:439 -> a
+    188:188:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
+    188:188:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):440 -> a
+    189:189:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):440:440 -> a
+    190:190:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):437:437 -> a
+    191:211:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):453:473 -> a
+    212:212: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):458:458 -> a
+    213:217:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):466:470 -> a
     1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):192:195 -> b
     5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):193:198 -> b
-    11:17:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):254:260 -> b
-    18:18:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):259:259 -> b
-    19:23:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):315:319 -> b
-    24:24:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$0(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):393:393 -> b
-    25:27:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):412:414 -> b
-    28:28:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
-    28:28:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):415 -> b
-    29:29:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):415:415 -> b
+    11:15:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):305:309 -> b
+    16:16:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$0(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):383:383 -> b
+    17:19:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):402:404 -> b
+    20:20:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> b
+    20:20:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):405 -> b
+    21:21:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):405:405 -> b
     1:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):170:171 -> c
     3:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> c
     3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171 -> c
     4:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):171:175 -> c
     9:14:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):173:178 -> c
-com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.N.Q:
+com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.N.O:
     com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness INSTANCE -> a
-    1:1:void <clinit>():288:288 -> <clinit>
-    1:1:void <init>():290:290 -> <init>
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():296:296 -> a
-    2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):301:301 -> a
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():286:286 -> c
-com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.N.T:
+    1:1:void <clinit>():278:278 -> <clinit>
+    1:1:void <init>():280:280 -> <init>
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():286:286 -> a
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):291:291 -> a
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():276:276 -> c
+com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.N.Q:
     1:1:void <init>():11:11 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
     2:22:boolean doEquivalent(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardIfRule):15:35 -> a
@@ -58308,7 +58100,7 @@
     23:23:int doHash(java.lang.Object):11:11 -> a
     24:41:int doHash(com.android.tools.r8.shaking.ProguardIfRule):43:60 -> a
     24:41:int doHash(java.lang.Object):11 -> a
-com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.N.U:
+com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.N.S:
     java.util.Set liveTypes -> g
     com.android.tools.r8.shaking.RootSetBuilder rootSetBuilder -> i
     com.android.tools.r8.graph.AppView appView -> a
@@ -58357,7 +58149,7 @@
     203:204:boolean lambda$evaluateIfRuleMembersAndMaterialize$4(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):280:281 -> a
     205:230:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):294:319 -> a
     1:5:void registerClassCapture(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):179:183 -> b
-com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.N.Y:
+com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.N.W:
     com.android.tools.r8.origin.Origin checkDiscardOrigin -> r
     com.android.tools.r8.shaking.InlineRule$Type type -> q
     boolean $assertionsDisabled -> s
@@ -58399,14 +58191,14 @@
     24:24:com.android.tools.r8.shaking.ProguardCheckDiscardRule asProguardCheckDiscardRule():95:95 -> v
     1:1:com.android.tools.r8.shaking.InlineRule$Type getType():78:78 -> w
     1:1:com.android.tools.r8.shaking.InlineRule$Builder builder():74:74 -> x
-com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.N.V:
+com.android.tools.r8.shaking.InlineRule$1 -> com.android.tools.r8.N.T:
     1:1:void <init>(com.android.tools.r8.origin.Origin):13:13 -> <init>
-com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.N.W:
+com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.N.U:
     com.android.tools.r8.shaking.InlineRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.InlineRule$1):24:24 -> <init>
     2:2:void <init>():27:27 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.N.X:
+com.android.tools.r8.shaking.InlineRule$Type -> com.android.tools.r8.N.V:
     com.android.tools.r8.shaking.InlineRule$Type[] $VALUES -> d
     com.android.tools.r8.shaking.InlineRule$Type NEVER -> c
     com.android.tools.r8.shaking.InlineRule$Type FORCE -> b
@@ -58415,7 +58207,7 @@
     2:2:void <clinit>():20:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
     1:1:com.android.tools.r8.shaking.InlineRule$Type[] values():20:20 -> a
-com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.N.n0:
+com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.N.l0:
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind() -> a
     com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter) -> a
@@ -58426,8 +58218,8 @@
     1:1:com.android.tools.r8.shaking.KeepReason invokedFromLambdaCreatedIn(com.android.tools.r8.graph.DexEncodedMethod):44:44 -> b
     1:1:com.android.tools.r8.shaking.KeepReason invokedViaSuperFrom(com.android.tools.r8.graph.DexEncodedMethod):32:32 -> c
     1:1:com.android.tools.r8.shaking.KeepReason reflectiveUseIn(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> d
-com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.N.Z:
-com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.N.a0:
+com.android.tools.r8.shaking.KeepReason$1 -> com.android.tools.r8.N.X:
+com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.N.Y:
     com.android.tools.r8.graph.DexDefinition holder -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():261:261 -> <clinit>
@@ -58435,66 +58227,66 @@
     2:3:void <init>(com.android.tools.r8.graph.DexDefinition):265:266 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():271:271 -> a
     2:8:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):276:282 -> a
-com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.N.b0:
+com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.N.Z:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):79:79 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):83:84 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):95:95 -> a
-com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> com.android.tools.r8.N.c0:
+com.android.tools.r8.shaking.KeepReason$InstatiatedIn -> com.android.tools.r8.N.a0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):99:99 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):102:102 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):99:99 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():107:107 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.N.d0:
+com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.N.b0:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():150:150 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):150:150 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):153:154 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():159:159 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.N.e0:
+com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.N.c0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):168:168 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):171:171 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():176:176 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.N.f0:
+com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.N.d0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):116:116 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):119:119 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():124:124 -> a
-com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> com.android.tools.r8.N.g0:
+com.android.tools.r8.shaking.KeepReason$IsLibraryMethod -> com.android.tools.r8.N.e0:
     com.android.tools.r8.graph.DexType implementer -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):221:221 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):226:227 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():233:233 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):238:238 -> a
-com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.N.h0:
+com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.N.f0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):309:309 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):312:312 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():317:317 -> a
-com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.N.i0:
+com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.N.g0:
     com.android.tools.r8.graph.DexType type -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason$1):202:202 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):206:207 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():212:212 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):217:217 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.N.j0:
+com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.N.h0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):185:185 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):188:188 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():193:193 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.N.k0:
+com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.N.i0:
     com.android.tools.r8.graph.DexItem holder -> a
     1:1:void <init>(com.android.tools.r8.graph.DexItem,com.android.tools.r8.shaking.KeepReason$1):242:242 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexItem):246:247 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():252:252 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):257:257 -> a
-com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.N.l0:
+com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.N.j0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):287:287 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):290:290 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():300:300 -> a
     boolean isDueToReflectiveUse() -> b
-com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.N.m0:
+com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.N.k0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):136:136 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():141:141 -> a
-com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.N.o0:
+com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.N.m0:
     java.util.List pruned -> c
     java.util.Set emulatedInterfaces -> a
     java.util.Set backports -> b
@@ -58506,7 +58298,7 @@
     9:21:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):48 -> a
     22:22:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):51:51 -> a
     23:31:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):49:57 -> a
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.N.q0:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.N.o0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap escapeDebuggingCounters -> c
     java.util.Set nonEscapingClassesWithLibraryMethodOverrides -> b
@@ -58539,7 +58331,7 @@
     6:10:void logResults():159:163 -> b
     11:18:void logResults():160:167 -> b
     19:25:void logResults():164:170 -> b
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.N.p0:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.N.n0:
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():184:184 -> <init>
@@ -58547,7 +58339,7 @@
     2:2: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):196:196 -> a
     3:14:boolean isTrivialInitializerInvocation(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:220 -> a
     3:14: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 -> a
-com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.N.t0:
+com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.N.r0:
     java.util.Set classes -> c
     boolean $assertionsDisabled -> e
     java.util.Set roots -> a
@@ -58571,8 +58363,8 @@
     1:1:java.util.Set getDependencies():87:87 -> b
     1:1:java.util.Set getRoots():83:83 -> c
     1:2:boolean isEmpty():78:79 -> d
-com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.N.r0:
-com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.N.s0:
+com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.N.p0:
+com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.N.q0:
     java.util.Set dependencies -> c
     java.util.Set roots -> b
     com.android.tools.r8.graph.AppInfo appInfo -> a
@@ -58592,7 +58384,7 @@
     4:5:com.android.tools.r8.shaking.MainDexClasses$Builder addRoot(com.android.tools.r8.graph.DexType):32:33 -> b
     1:1:boolean contains(com.android.tools.r8.graph.DexType):50:50 -> c
     1:2:boolean isProgramClass(com.android.tools.r8.graph.DexType):58:59 -> d
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.N.y0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.N.w0:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector codeDirectReferenceCollector -> b
     java.util.function.Consumer consumer -> d
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
@@ -58615,8 +58407,8 @@
     20:20:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):81:81 -> a
     21:25:void lambda$hasReferencesOutsideFromCode$2(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox,com.android.tools.r8.graph.DexType):71:75 -> a
     26:29:void traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):89:92 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.N.u0:
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.N.v0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.N.s0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.N.t0:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):172:172 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):172:172 -> <init>
@@ -58628,11 +58420,11 @@
     1:2:boolean addField(com.android.tools.r8.graph.DexField):182:183 -> b
     3:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):189:190 -> b
     5:5:boolean addType(com.android.tools.r8.graph.DexType):210:210 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox -> com.android.tools.r8.N.w0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$BooleanBox -> com.android.tools.r8.N.u0:
     boolean value -> a
     1:2:void <init>():59:60 -> <init>
     3:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):59:59 -> <init>
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.N.x0:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.N.v0:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> c
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):96:96 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory):98:99 -> <init>
@@ -58649,7 +58441,7 @@
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):104:104 -> e
     2:3:boolean registerFieldAccess(com.android.tools.r8.graph.DexField):154:155 -> e
     1:2:boolean registerInvoke(com.android.tools.r8.graph.DexMethod):128:129 -> f
-com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.N.z0:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.N.x0:
     java.util.Map annotationTypeContainEnum -> c
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> b
     boolean $assertionsDisabled -> f
@@ -58699,29 +58491,29 @@
     14:14:void traceRuntimeAnnotationsWithEnumForMainDex():78:78 -> c
     15:37:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):359:381 -> c
     15:37:void traceRuntimeAnnotationsWithEnumForMainDex():78 -> c
-com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.N.D0:
+com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.N.B0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.shaking.MemberValuePropagationRule$1):11:11 -> <init>
     2:5:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.MemberValuePropagationRule$Type):61:64 -> <init>
     1:5:java.lang.String typeString():77:81 -> u
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type getType():72:72 -> v
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder builder():68:68 -> w
-com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> com.android.tools.r8.N.A0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$1 -> com.android.tools.r8.N.y0:
     int[] $SwitchMap$com$android$tools$r8$shaking$MemberValuePropagationRule$Type -> a
     1:1:void <clinit>():77:77 -> <clinit>
-com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.N.B0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.N.z0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> o
     1:1:void <init>(com.android.tools.r8.shaking.MemberValuePropagationRule$1):17:17 -> <init>
     2:2:void <init>():21:21 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> com.android.tools.r8.N.C0:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Type -> com.android.tools.r8.N.A0:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] $VALUES -> b
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type NEVER -> a
     1:1:void <clinit>():14:14 -> <clinit>
     2:2:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] values():13:13 -> a
-com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.N.E0:
+com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.N.C0:
     java.util.List NAMES -> c
     int PPP_MASK -> b
     int flags -> a
@@ -58772,51 +58564,51 @@
     1:1:void setSynthetic():182:182 -> x
     1:1:void setTransient():150:150 -> y
     1:1:void setVolatile():142:142 -> z
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.N.H0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.N.F0:
     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.ProguardAssumeMayHaveSideEffectsRule$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>
     boolean applyToNonProgramClasses() -> p
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder builder():75:75 -> v
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.N.F0:
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.N.G0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.N.D0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.N.E0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.N.K0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.N.I0:
     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.ProguardAssumeNoSideEffectRule$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):46:46 -> <init>
     boolean applyToNonProgramClasses() -> p
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder builder():55:55 -> v
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.N.I0:
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.N.J0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.N.G0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.N.H0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:1:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule build():26:26 -> c
-com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.N.N0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.N.L0:
     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.ProguardAssumeValuesRule$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):46:46 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder builder():55:55 -> v
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> com.android.tools.r8.N.L0:
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.N.M0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> com.android.tools.r8.N.J0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.N.K0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.N.Q0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.N.O0:
     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.ProguardCheckDiscardRule$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):46:46 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder builder():52:52 -> v
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.N.O0:
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.N.P0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.N.M0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.N.N0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule build():26:26 -> c
-com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.N.T0:
+com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.N.R0:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> a
     1:2:void <clinit>():12:13 -> <clinit>
@@ -58827,15 +58619,15 @@
     4:5:void filterOutMatches(java.util.Set):59:60 -> a
     6:10:void lambda$filterOutMatches$0(java.util.Set,com.android.tools.r8.shaking.ProguardTypeMatcher):61:65 -> a
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder builder():18:18 -> b
-com.android.tools.r8.shaking.ProguardClassFilter$1 -> com.android.tools.r8.N.R0:
-com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.N.S0:
+com.android.tools.r8.shaking.ProguardClassFilter$1 -> com.android.tools.r8.N.P0:
+com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.N.Q0:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassFilter$1):21:21 -> <init>
     2:2:void <init>():24:24 -> <init>
     3:3:void <init>():22:22 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder addPattern(com.android.tools.r8.shaking.ProguardClassNameList):28:28 -> a
     2:2:com.android.tools.r8.shaking.ProguardClassFilter build():33:33 -> a
-com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.N.Z0:
+com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.N.X0:
     1:1:void <init>():21:21 -> <init>
     java.util.List asSpecificDexTypes() -> a
     void forEachTypeMatcher(java.util.function.Consumer) -> a
@@ -58846,15 +58638,15 @@
     2:2:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardClassNameList):91:91 -> a
     java.lang.Iterable getWildcards() -> b
     1:3:java.lang.String toString():71:73 -> toString
-com.android.tools.r8.shaking.ProguardClassNameList$1 -> com.android.tools.r8.N.U0:
-com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.N.V0:
+com.android.tools.r8.shaking.ProguardClassNameList$1 -> com.android.tools.r8.N.S0:
+com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.N.T0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassNameList$1):37:37 -> <init>
     2:2:void <init>():44:44 -> <init>
     3:3:void <init>():42:42 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder addClassName(boolean,com.android.tools.r8.shaking.ProguardTypeMatcher):48:48 -> a
     2:9:com.android.tools.r8.shaking.ProguardClassNameList build():53:60 -> a
-com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.N.W0:
+com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.N.U0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap classNames -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardClassNameList$1):279:279 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):283:284 -> <init>
@@ -58871,7 +58663,7 @@
     1:3:java.lang.Iterable getWildcards():342:344 -> b
     1:5:boolean equals(java.lang.Object):312:316 -> equals
     1:1:int hashCode():321:321 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.N.X0:
+com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.N.V0:
     com.android.tools.r8.com.google.common.collect.ImmutableList classNames -> a
     1:1:void <init>(java.util.Collection,com.android.tools.r8.shaking.ProguardClassNameList$1):201:201 -> <init>
     2:3:void <init>(java.util.Collection):205:206 -> <init>
@@ -58888,7 +58680,7 @@
     2:4:java.lang.Iterable getWildcards():259:261 -> b
     1:5:boolean equals(java.lang.Object):231:235 -> equals
     1:1:int hashCode():240:240 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.N.Y0:
+com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.N.W0:
     com.android.tools.r8.shaking.ProguardTypeMatcher className -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardClassNameList$1):139:139 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher):143:144 -> <init>
@@ -58901,7 +58693,7 @@
     1:1:java.lang.Iterable getWildcards():187:187 -> b
     1:5:boolean equals(java.lang.Object):162:166 -> equals
     1:1:int hashCode():171:171 -> hashCode
-com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.N.b1:
+com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.N.Z0:
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceClassName -> k
     boolean $assertionsDisabled -> n
     com.android.tools.r8.shaking.ProguardClassType classType -> h
@@ -58939,7 +58731,7 @@
     1:1:java.lang.String getSource():228:228 -> n
     1:1:boolean hasInheritanceClassName():244:244 -> o
     1:1:java.lang.String toString():374:374 -> toString
-com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.N.a1:
+com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.N.Y0:
     com.android.tools.r8.shaking.ProguardClassType classType -> i
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceAnnotation -> k
     boolean inheritanceIsExtends -> m
@@ -58960,7 +58752,7 @@
     1:7:com.android.tools.r8.position.Position getPosition():70:76 -> a
     8:8:com.android.tools.r8.position.Position getPosition():74:74 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.N.h1:
+com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.N.f1:
     com.android.tools.r8.shaking.ProguardClassType ANNOTATION_INTERFACE -> a
     com.android.tools.r8.shaking.ProguardClassType CLASS -> b
     com.android.tools.r8.shaking.ProguardClassType UNSPECIFIED -> e
@@ -58973,22 +58765,22 @@
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.shaking.ProguardClassType$1):9:9 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
     1:9:java.lang.String toString():43:51 -> toString
-com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.N.c1:
+com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.N.a1:
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):13:13 -> a
-com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.N.d1:
+com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.N.b1:
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.N.e1:
+com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.N.c1:
     1:1:void <init>(java.lang.String,int):22:22 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):25:25 -> a
-com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.N.f1:
+com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.N.d1:
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):31:31 -> a
-com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.N.g1:
+com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.N.e1:
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.N.j1:
+com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.N.h1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.lang.String packagePrefix -> f
     boolean optimizing -> i
@@ -59069,8 +58861,8 @@
     1:1:boolean hasApplyMappingFile():543:543 -> x
     1:1:boolean hasDontUseMixedCaseClassnames():659:659 -> y
     1:1:boolean isAccessModificationAllowed():531:531 -> z
-com.android.tools.r8.shaking.ProguardConfiguration$1 -> com.android.tools.r8.N.i1:
-com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.N.j1$a:
+com.android.tools.r8.shaking.ProguardConfiguration$1 -> com.android.tools.r8.N.g1:
+com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.N.h1$a:
     java.lang.String packagePrefix -> f
     java.nio.file.Path classObfuscationDictionary -> D
     boolean overloadAggressively -> N
@@ -59194,7 +58986,7 @@
     1:10:void synthesizeKeepRulesForRecompilation():296:305 -> n
     11:11:void synthesizeKeepRulesForRecompilation():302:302 -> n
     12:12:void synthesizeKeepRulesForRecompilation():301:301 -> n
-com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.N.o1:
+com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.N.m1:
     com.android.tools.r8.shaking.ProguardConfiguration$Builder configurationBuilder -> a
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.utils.Reporter reporter -> c
@@ -59239,24 +59031,24 @@
     1:1:java.util.List access$700():46:46 -> i
     1:1:java.util.List access$800():46:46 -> j
     1:1:java.util.List access$900():46:46 -> k
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.N.k1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.N.i1:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
     1:3:void <init>(java.lang.String,java.util.List):2024:2026 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2030:2030 -> a
     2:3:boolean hasBackreference():2038:2039 -> a
     1:15:boolean hasUnusualCharacters():2043:2057 -> b
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.N.l1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.N.j1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards patternWithWildcards -> a
     boolean negated -> b
     1:3:void <init>(java.lang.String,java.util.List,boolean):2068:2070 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.N.m1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.N.k1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType CLASS_NAME -> b
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType PACKAGE_NAME -> a
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType ANY -> c
     1:3:void <clinit>():191:193 -> <clinit>
     1:1:void <init>(java.lang.String,int):190:190 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.N.n1:
+com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.N.l1:
     java.util.function.Predicate PACKAGE_NAME_PREDICATE -> j
     java.nio.file.Path baseDirectory -> g
     boolean $assertionsDisabled -> l
@@ -59587,7 +59379,7 @@
     477:477:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
     477:477:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
     477:477:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):823 -> a
-    478:478:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    478:478:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     478:478:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1209 -> a
     478:478:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1007 -> a
     478:478:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):993 -> a
@@ -60272,7 +60064,7 @@
     1:6:void skipWhitespace():1432:1437 -> x
     7:14:void skipComment():1443:1450 -> x
     7:14:void skipWhitespace():1439 -> x
-com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.N.p1:
+com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.N.n1:
     boolean used -> o
     boolean $assertionsDisabled -> p
     1:1:void <clinit>():21:21 -> <clinit>
@@ -60294,9 +60086,9 @@
     1:1:void markAsUsed():49:49 -> s
     java.lang.String modifierString() -> t
     java.lang.String typeString() -> u
-com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.N.q1:
+com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.N.o1:
     java.nio.file.Path getBaseDirectory() -> a
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.N.r1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.N.p1:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> b
     1:3:void <init>(byte[],com.android.tools.r8.origin.Origin):18:20 -> <init>
@@ -60304,14 +60096,14 @@
     1:1:java.lang.String get():29:29 -> get
     1:1:java.lang.String getName():40:40 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.N.s1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.N.q1:
     java.nio.file.Path path -> a
     1:2:void <init>(java.nio.file.Path):18:19 -> <init>
     1:5:java.nio.file.Path getBaseDirectory():29:33 -> a
     1:1:java.lang.String get():24:24 -> get
     1:1:java.lang.String getName():40:40 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.N.t1:
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.N.r1:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
@@ -60319,7 +60111,7 @@
     1:1:java.nio.file.Path getBaseDirectory():47:47 -> a
     1:1:java.lang.String get():42:42 -> get
     1:1:com.android.tools.r8.origin.Origin getOrigin():57:57 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.N.x1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.N.v1:
     com.android.tools.r8.origin.Origin synthesizedRecompilationOrigin -> a
     1:12:void <clinit>():19:30 -> <clinit>
     1:14:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):90:103 -> a
@@ -60328,7 +60120,7 @@
     16:16:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):104:104 -> a
     17:17:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):130:130 -> a
     17:17:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):105 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     18:18:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108 -> a
     19:19:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.create(com.android.tools.r8.graph.DexType):101:101 -> a
     19:19:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108 -> a
@@ -60345,7 +60137,7 @@
     36:36:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):109 -> a
     37:37:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):120:120 -> a
     38:50:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):129:141 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     51:51:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):141 -> a
     52:78:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):141:167 -> a
     79:82:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):178:181 -> a
@@ -60359,25 +60151,25 @@
     92:92:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):188 -> a
     93:93:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):189:189 -> a
     94:94:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):180:180 -> a
-com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.N.u1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.N.s1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):22:22 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.N.v1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.N.t1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):30:30 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.N.w1:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.N.u1:
     com.android.tools.r8.utils.AndroidApiLevel val$apiLevel -> e
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.AndroidApiLevel):91:91 -> <init>
     1:1:java.lang.String part():94:94 -> part
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.N.A1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.N.y1:
     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.ProguardIdentifierNameStringRule$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):45:45 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder builder():51:51 -> v
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> com.android.tools.r8.N.y1:
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.N.z1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> com.android.tools.r8.N.w1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.N.x1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):12:12 -> <init>
     2:2:void <init>():15:15 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.N.D1:
+com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.N.B1:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> t
     java.util.Set preconditions -> s
     com.android.tools.r8.origin.Origin neverInlineOrigin -> u
@@ -60401,16 +60193,16 @@
     java.lang.String typeString() -> u
     1:1:java.util.Set getPreconditions():30:30 -> x
     1:1:com.android.tools.r8.shaking.ProguardIfRule$Builder builder():97:97 -> y
-com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.N.B1:
+com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.N.z1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):19:19 -> <init>
-com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.N.C1:
+com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.N.A1:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> q
     boolean $assertionsDisabled -> r
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>():38:38 -> <init>
     2:2:void <init>():35:35 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.N.E1:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.N.C1:
     boolean runtimeInvisibleAnnotations -> m
     boolean runtimeVisibleParameterAnnotations -> n
     boolean runtimeInvisibleParameterAnnotations -> o
@@ -60443,7 +60235,7 @@
     1:5:boolean equals(java.lang.Object):176:180 -> equals
     1:16:int hashCode():200:215 -> hashCode
     1:1:java.lang.String toString():298:298 -> toString
-com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.N.H1:
+com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.N.F1:
     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.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):50:50 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardKeepRule$Builder builder():59:59 -> a
     1:1:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):116 -> a
@@ -60478,13 +60270,13 @@
     44:51:void appendNonEmpty(java.lang.StringBuilder,java.lang.String,java.lang.Object,java.lang.String):102:109 -> a
     1:5:boolean equals(java.lang.Object):91:95 -> equals
     1:1:com.android.tools.r8.shaking.ProguardKeepRule$Builder builder():59:59 -> x
-com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.N.F1:
+com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.N.D1:
     1:1:void <init>(com.android.tools.r8.origin.Origin):118:118 -> <init>
-com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.N.G1:
+com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.N.E1:
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
     1:3:com.android.tools.r8.shaking.ProguardKeepRule build():28:30 -> c
-com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.N.J1:
+com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.N.H1:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers modifiers -> r
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> q
     1:5: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.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):58:62 -> <init>
@@ -60494,13 +60286,13 @@
     1:1:java.lang.String typeString():116:116 -> u
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers getModifiers():70:70 -> v
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleType getType():66:66 -> w
-com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.N.I1:
+com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.N.G1:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder modifiersBuilder -> p
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> o
     1:1:void <init>():21:21 -> <init>
     2:2:void <init>():18:18 -> <init>
     1:2:com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder setType(com.android.tools.r8.shaking.ProguardKeepRuleType):25:26 -> a
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.N.M1:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.N.K1:
     boolean allowsShrinking -> a
     boolean allowsOptimization -> b
     boolean allowsObfuscation -> c
@@ -60512,8 +60304,8 @@
     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
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> com.android.tools.r8.N.K1:
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.N.L1:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> com.android.tools.r8.N.I1:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.N.J1:
     boolean allowsShrinking -> a
     boolean allowsOptimization -> b
     boolean allowsObfuscation -> c
@@ -60526,7 +60318,7 @@
     1:1:void setAllowsOptimization(boolean):21:21 -> b
     1:1:void setAllowsShrinking(boolean):17:17 -> c
     1:1:void setIncludeDescriptorClasses(boolean):30:30 -> d
-com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.N.N1:
+com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.N.L1:
     com.android.tools.r8.shaking.ProguardKeepRuleType[] $VALUES -> e
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASS_MEMBERS -> b
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASSES_WITH_MEMBERS -> c
@@ -60537,7 +60329,7 @@
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleType[] values():8:8 -> a
     1:11:java.lang.String toString():16:26 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.N.Q1:
+com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.N.O1:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
     com.android.tools.r8.shaking.ProguardTypeMatcher type -> e
@@ -60654,10 +60446,10 @@
     52:52:java.lang.String toString():390 -> toString
     53:53:java.lang.String toString():390:390 -> toString
     54:88:java.lang.String toString():369:403 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.N.O1:
+com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.N.M1:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardMemberType -> a
     1:1:void <clinit>():174:174 -> <clinit>
-com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.N.P1:
+com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.N.N1:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
@@ -60683,7 +60475,7 @@
     1:1:com.android.tools.r8.shaking.ProguardAccessFlags getNegatedAccessFlags():51:51 -> c
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getTypeMatcher():64:64 -> d
     1:1:boolean isValid():87:87 -> e
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.N.S1:
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.N.Q1:
     com.android.tools.r8.utils.LongInterval longInterval -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type type -> a
@@ -60703,14 +60495,14 @@
     1:1:boolean isSingleValue():78:78 -> g
     1:1:boolean isValueRange():56:56 -> h
     1:17:java.lang.String toString():111:127 -> toString
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type -> com.android.tools.r8.N.R1:
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type -> com.android.tools.r8.N.P1:
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type BOOLEAN -> a
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type FIELD -> c
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type VALUE_RANGE -> b
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type NULL -> d
     1:4:void <clinit>():12:15 -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
-com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.N.T1:
+com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.N.R1:
     com.android.tools.r8.shaking.ProguardMemberType METHOD -> h
     com.android.tools.r8.shaking.ProguardMemberType CONSTRUCTOR -> g
     com.android.tools.r8.shaking.ProguardMemberType INIT -> f
@@ -60724,7 +60516,7 @@
     9:9:void <clinit>():6:6 -> <clinit>
     1:1:void <init>(java.lang.String,int):6:6 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardMemberType[] values():6:6 -> a
-com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.N.Y1:
+com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.N.W1:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.shaking.ProguardNameMatcher MATCH_ALL_NAMES -> a
     1:3:void <clinit>():14:16 -> <clinit>
@@ -60741,8 +60533,8 @@
     1:43:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):39:81 -> b
     44:66:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):56:78 -> b
     67:111:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):43:87 -> b
-com.android.tools.r8.shaking.ProguardNameMatcher$1 -> com.android.tools.r8.N.U1:
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.N.V1:
+com.android.tools.r8.shaking.ProguardNameMatcher$1 -> com.android.tools.r8.N.S1:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.N.T1:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> c
     1:1:void <init>():108:108 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardWildcard):111:112 -> <init>
@@ -60750,7 +60542,7 @@
     2:2:java.lang.Iterable getWildcards():123:123 -> a
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames materialize():128:128 -> b
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher materialize():104 -> b
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.N.W1:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.N.U1:
     java.util.List wildcards -> d
     java.lang.String pattern -> c
     1:3:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):142:144 -> <init>
@@ -60761,14 +60553,14 @@
     1:1:boolean equals(java.lang.Object):180:180 -> equals
     1:1:int hashCode():185:185 -> hashCode
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.N.X1:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.N.V1:
     java.lang.String name -> c
     1:2:void <init>(java.lang.String):193:194 -> <init>
     1:1:boolean matches(java.lang.String):199:199 -> a
     1:1:boolean equals(java.lang.Object):209:209 -> equals
     1:1:int hashCode():214:214 -> hashCode
     1:1:java.lang.String toString():204:204 -> toString
-com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.N.Z1:
+com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.N.X1:
     java.lang.String pattern -> a
     1:2:void <init>(java.lang.String):12:13 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexType):17:17 -> a
@@ -60780,7 +60572,7 @@
     57:86:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):44:73 -> a
     1:5:boolean equals(java.lang.Object):85:89 -> equals
     1:1:int hashCode():94:94 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.N.c2:
+com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.N.a2:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap packageNames -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardPackageNameList$1):12:12 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):39:40 -> <init>
@@ -60788,15 +60580,15 @@
     2:5:boolean matches(com.android.tools.r8.graph.DexType):60:63 -> a
     1:15:boolean equals(java.lang.Object):74:88 -> equals
     1:6:int hashCode():98:103 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList$1 -> com.android.tools.r8.N.a2:
-com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.N.b2:
+com.android.tools.r8.shaking.ProguardPackageNameList$1 -> com.android.tools.r8.N.Y1:
+com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.N.Z1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPackageNameList$1):18:18 -> <init>
     2:2:void <init>():24:24 -> <init>
     3:3:void <init>():21:21 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardPackageNameList$Builder addPackageName(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):28:28 -> a
     2:2:com.android.tools.r8.shaking.ProguardPackageNameList build():33:33 -> a
-com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.N.f2:
+com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.N.d2:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> b
     boolean $assertionsDisabled -> c
@@ -60806,8 +60598,8 @@
     1:1:boolean isEnabled():55:55 -> a
     2:4:boolean matches(java.lang.String):59:61 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder builder():14:14 -> b
-com.android.tools.r8.shaking.ProguardPathFilter$1 -> com.android.tools.r8.N.d2:
-com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.N.e2:
+com.android.tools.r8.shaking.ProguardPathFilter$1 -> com.android.tools.r8.N.b2:
+com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.N.c2:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> b
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathFilter$1):17:17 -> <init>
@@ -60817,13 +60609,13 @@
     2:2:com.android.tools.r8.shaking.ProguardPathFilter build():40:40 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder disable():30:30 -> b
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder enable():35:35 -> c
-com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.N.l2:
+com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.N.j2:
     1:1:void <init>():10:10 -> <init>
     boolean matches(java.lang.String) -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList emptyList():17:17 -> b
-com.android.tools.r8.shaking.ProguardPathList$1 -> com.android.tools.r8.N.g2:
-com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.N.h2:
+com.android.tools.r8.shaking.ProguardPathList$1 -> com.android.tools.r8.N.e2:
+com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.N.f2:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):22:22 -> <init>
     2:2:void <init>():26:26 -> <init>
@@ -60832,11 +60624,11 @@
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String):30 -> a
     2:2:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String,boolean):34:34 -> a
     3:7:com.android.tools.r8.shaking.ProguardPathList build():39:43 -> a
-com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.N.i2:
+com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.N.g2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):122:122 -> <init>
     2:2:void <init>():124:124 -> <init>
     boolean matches(java.lang.String) -> a
-com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.N.j2:
+com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.N.h2:
     boolean negated -> a
     java.lang.String pattern -> b
     1:3:void <init>(boolean,java.lang.String):52:54 -> <init>
@@ -60848,12 +60640,12 @@
     34:34:boolean containsSeparatorsStartingAt(java.lang.String,int):98:98 -> a
     34:34:boolean matchImpl(java.lang.String,int,java.lang.String,int):70 -> a
     35:56:boolean matchImpl(java.lang.String,int,java.lang.String,int):73:94 -> a
-com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.N.k2:
+com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.N.i2:
     java.util.List matchers -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardPathList$1):103:103 -> <init>
     2:3:void <init>(java.util.List):106:107 -> <init>
     1:4:boolean matches(java.lang.String):112:115 -> a
-com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.N.m2:
+com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.N.k2:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.lang.String message -> a
@@ -60863,7 +60655,7 @@
     1:1:java.lang.String getMessage():48:48 -> getMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():33:33 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
-com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.N.v2:
+com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.N.t2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher$1):23:23 -> <init>
     2:2:void <init>():31:31 -> <init>
     com.android.tools.r8.graph.DexType getSpecificType() -> a
@@ -60877,19 +60669,19 @@
     27:27:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):86:86 -> a
     28:28:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):84:84 -> a
     29:29:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):82:82 -> a
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     30:30:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):93 -> a
     31:34:com.android.tools.r8.shaking.ProguardTypeMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType,com.android.tools.r8.graph.DexItemFactory):93:96 -> a
     1:1:java.lang.Iterable getWildcards():55:55 -> b
     boolean hasSpecificType() -> c
     boolean isTripleDotPattern() -> d
-com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> com.android.tools.r8.N.n2:
-com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.N.o2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> com.android.tools.r8.N.l2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.N.m2:
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType CLASS -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType TYPE -> b
     1:2:void <clinit>():35:36 -> <clinit>
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.N.p2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.N.n2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ALL_TYPES -> b
     1:1:void <clinit>():128:128 -> <clinit>
@@ -60904,7 +60696,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$000():126:126 -> e
     1:1:boolean equals(java.lang.Object):163:163 -> equals
     1:1:int hashCode():168:168 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.N.q2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.N.o2:
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ANY_ARG_SEQUENCE -> a
     1:1:void <clinit>():174:174 -> <clinit>
     1:1:void <init>():172:172 -> <init>
@@ -60913,7 +60705,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$100():172:172 -> e
     1:1:boolean equals(java.lang.Object):193:193 -> equals
     1:1:int hashCode():198:198 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.N.r2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.N.p2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_BASIC_TYPES -> b
     1:1:void <clinit>():259:259 -> <clinit>
@@ -60928,7 +60720,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$400():257:257 -> e
     1:1:boolean equals(java.lang.Object):297:297 -> equals
     1:1:int hashCode():302:302 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.N.s2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.N.q2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> b
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_CLASS_TYPES -> c
     boolean $assertionsDisabled -> e
@@ -60951,7 +60743,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$300():202:202 -> f
     1:1:int hashCode():253:253 -> hashCode
     1:1:java.lang.String toString():243:243 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.N.t2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.N.r2:
     com.android.tools.r8.graph.DexType type -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardTypeMatcher$1):306:306 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):310:311 -> <init>
@@ -60961,7 +60753,7 @@
     1:2:boolean equals(java.lang.Object):326:327 -> equals
     1:1:int hashCode():334:334 -> hashCode
     1:1:java.lang.String toString():321:321 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.N.u2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.N.s2:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType kind -> c
@@ -60975,7 +60767,7 @@
     22:68:java.lang.String removeMaterializedBackReferencesFromPattern(java.lang.String,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):413:459 -> a
     22:68:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):394 -> a
     69:70:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):395:396 -> a
-    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    71:71:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     71:71:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):397 -> a
     72:82:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):398:408 -> a
     83:174:boolean matchClassOrTypeNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int,com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType):470:561 -> a
@@ -60990,17 +60782,17 @@
     1:3:boolean equals(java.lang.Object):589:591 -> equals
     1:1:int hashCode():598:598 -> hashCode
     1:1:java.lang.String toString():584:584 -> toString
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.N.y2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.N.w2:
     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.ProguardWhyAreYouKeepingRule$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):46:46 -> <init>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder builder():52:52 -> v
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> com.android.tools.r8.N.w2:
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.N.x2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> com.android.tools.r8.N.u2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.N.v2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.N.B2:
+com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.N.z2:
     1:1:void <init>():8:8 -> <init>
     com.android.tools.r8.shaking.ProguardWildcard$BackReference asBackReference() -> a
     void setCaptured(java.lang.String) -> a
@@ -61009,7 +60801,7 @@
     boolean isBackReference() -> d
     boolean isPattern() -> e
     com.android.tools.r8.shaking.ProguardWildcard materialize() -> f
-com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.N.z2:
+com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.N.x2:
     int referenceIndex -> b
     com.android.tools.r8.shaking.ProguardWildcard$Pattern reference -> a
     1:2:void <init>(int):85:86 -> <init>
@@ -61024,7 +60816,7 @@
     6:6:com.android.tools.r8.shaking.ProguardWildcard materialize():80 -> f
     1:1:java.lang.String getCaptured():105:105 -> g
     1:1:java.lang.String toString():130:130 -> toString
-com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.N.A2:
+com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.N.y2:
     java.lang.String pattern -> a
     java.lang.String captured -> b
     1:1:void <init>(java.lang.String):35:35 -> <init>
@@ -61039,7 +60831,7 @@
     7:7:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():60 -> f
     1:1:java.lang.String getCaptured():51:51 -> g
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.N.E2:
+com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.N.C2:
     java.util.Set identifierNameStrings -> w
     java.util.Map dependentKeepClassCompatRule -> s
     com.android.tools.r8.graph.AppView appView -> a
@@ -61129,33 +60921,33 @@
     221:221:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):795 -> a
     222:222:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):797:797 -> a
     223:242:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):801:820 -> a
-    243:263: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):844:864 -> a
-    264:264:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
-    264:264: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):864 -> a
-    265:274: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):870:879 -> a
-    275:296: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):876:897 -> a
-    297:297:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    297:297: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):897 -> a
-    298:322: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):897:921 -> a
-    323:333:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):824:834 -> a
-    323:333: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):922 -> a
-    334:364: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):923:953 -> a
-    365:365: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):947:947 -> a
-    366:384: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):944:962 -> a
-    385:399: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):959:973 -> a
-    400:413: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):971:984 -> a
-    414:458: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):982:1026 -> a
-    459:460:java.lang.Iterable com.android.tools.r8.shaking.AppInfoWithLiveness.getPinnedItems():846:847 -> a
-    459:460:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):517 -> a
-    461:472:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):517:528 -> a
-    473:473:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    473:473:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):530 -> a
-    474:474:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):530:530 -> a
-    475:500:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):525:550 -> a
-    501:501:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    501:501:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):550 -> a
-    502:502:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):550:550 -> a
-    503:518:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):549:564 -> a
+    243:244:java.lang.Iterable com.android.tools.r8.shaking.AppInfoWithLiveness.getPinnedItems():824:825 -> a
+    243:244:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):517 -> a
+    245:256:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):517:528 -> a
+    257:257:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    257:257:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):530 -> a
+    258:258:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):530:530 -> a
+    259:284:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):525:550 -> a
+    285:285:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    285:285:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):550 -> a
+    286:286:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):550:550 -> a
+    287:302:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):549:564 -> a
+    303:323: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):844:864 -> a
+    324:324:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    324:324: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):864 -> a
+    325:334: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):870:879 -> a
+    335:356: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):876:897 -> a
+    357:357:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    357:357: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):897 -> a
+    358:382: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):897:921 -> a
+    383:393:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):824:834 -> a
+    383:393: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):922 -> a
+    394:424: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):923:953 -> a
+    425:425: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):947:947 -> a
+    426:444: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):944:962 -> a
+    445:459: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):959:973 -> a
+    460:473: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):971:984 -> a
+    474:518: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):982:1026 -> a
     519:519:java.util.Set lambda$addItemToSets$14(com.android.tools.r8.graph.DexType):897:897 -> a
     520:520:java.util.Map lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference):905:905 -> a
     1:1:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):160:160 -> b
@@ -61199,7 +60991,7 @@
     com.android.tools.r8.graph.DexReference lambda$addItemToSets$19(com.android.tools.r8.graph.DexReference) -> e
     1:1:java.util.Map lambda$includeDescriptor$12(com.android.tools.r8.graph.DexReference):816:816 -> f
     1:1:java.util.Set lambda$includeDescriptor$13(com.android.tools.r8.graph.DexReference):817:817 -> g
-com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.N.C2:
+com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.N.A2:
     int[] $SwitchMap$com$android$tools$r8$shaking$InlineRule$Type -> b
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassMergingRule$Type -> d
@@ -61210,7 +61002,7 @@
     3:3:void <clinit>():964:964 -> <clinit>
     4:4:void <clinit>():942:942 -> <clinit>
     5:5:void <clinit>():139:139 -> <clinit>
-com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.N.D2:
+com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.N.B2:
     java.util.Map noShrinking -> c
     java.util.Set noOptimization -> d
     java.util.Set noObfuscation -> e
@@ -61220,7 +61012,7 @@
     java.util.Map dependentKeepClassCompatRule -> g
     1:1:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.shaking.RootSetBuilder$1):1410:1410 -> <init>
     2:9:void <init>(java.util.Set,java.util.Set,java.util.Map,java.util.Set,java.util.Set,java.util.Map,java.util.Map):1426:1433 -> <init>
-com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.N.E2$a:
+com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.N.C2$a:
     java.util.Map assumedValues -> q
     java.util.Map dependentNoShrinking -> r
     java.util.Map dependentKeepClassCompatRule -> s
@@ -61307,7 +61099,7 @@
     2:6:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1279:1283 -> c
     7:7:java.util.Set lambda$verifyKeptItemsAreKept$6(com.android.tools.r8.graph.DexType):1323:1323 -> c
     1:21:java.lang.String toString():1385:1405 -> toString
-com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.N.G2:
+com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.N.E2:
     java.util.Map items -> b
     com.android.tools.r8.com.google.common.base.Equivalence METHOD_EQUIVALENCE -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet parent -> a
@@ -61325,13 +61117,13 @@
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet newNestedScope():36:36 -> b
     2:11:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):58:67 -> b
     12:19:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult addMethodIfMoreVisible(com.android.tools.r8.graph.DexEncodedMethod):64:71 -> b
-com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult -> com.android.tools.r8.N.F2:
+com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult -> com.android.tools.r8.N.D2:
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult ADDED_NOT_EXISTING -> b
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult ADDED_MORE_VISIBLE -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult NOT_ADDED -> a
     1:3:void <clinit>():17:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.N.K2:
+com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.N.I2:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
     com.android.tools.r8.com.google.common.base.Equivalence fieldEquivalence -> c
@@ -61342,72 +61134,74 @@
     com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> b
     java.util.Map representatives -> e
     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:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):210:210 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):200:219 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Equivalence access$000(com.android.tools.r8.shaking.StaticClassMerger):59:59 -> a
-    2:13:com.android.tools.r8.graph.GraphLense run():229:240 -> a
-    14:14:com.android.tools.r8.graph.GraphLense run():236:236 -> a
-    15:27:com.android.tools.r8.graph.GraphLense buildGraphLense():246:258 -> a
-    15:27:com.android.tools.r8.graph.GraphLense run():242 -> a
-    28:37:com.android.tools.r8.graph.GraphLense buildGraphLense():247:256 -> a
-    28:37:com.android.tools.r8.graph.GraphLense run():242 -> a
-    38:38:boolean isValidRepresentative(com.android.tools.r8.graph.DexProgramClass):324:324 -> a
-    39:46:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):328:335 -> a
-    47:48:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key com.android.tools.r8.shaking.StaticClassMerger$MergeGroup.key(java.lang.String):126:127 -> a
-    47:48:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):335 -> a
-    49:83:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):339:373 -> a
-    49:83:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):331 -> a
-    84:84:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key com.android.tools.r8.shaking.StaticClassMerger$MergeGroup.key(java.lang.String):126:126 -> a
-    84:84:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):335 -> a
-    85:93:com.android.tools.r8.shaking.StaticClassMerger$Representative getOrCreateRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.graph.DexProgramClass):379:387 -> a
-    94:101:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):391:398 -> a
-    102:113:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):394:405 -> a
-    114:122:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):400:408 -> a
-    123:123:boolean lambda$mayMergeAcrossPackageBoundaries$2(com.android.tools.r8.graph.DexEncodedMethod):431:431 -> a
-    124:124:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedField):435:435 -> a
-    125:130:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):459:464 -> a
-    131:147:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):460:476 -> a
-    148:151:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):475:478 -> a
-    152:155:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):477:480 -> a
-    156:162:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):479:485 -> a
-    163:163:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeMethods$5(com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexEncodedMethod):496:496 -> a
-    164:164:boolean lambda$mergeMethods$6(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):500:500 -> a
-    165:183:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):521:539 -> a
-    184:190:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):579:585 -> a
-    184:190:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):541 -> a
-    191:191:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    191:191:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):585 -> a
-    191:191:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):541 -> a
-    192:198:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):585:591 -> a
-    192:198:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):541 -> a
-    199:208:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):542:551 -> a
-    209:209:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeFields$7(com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexEncodedField):533:533 -> a
-    210:210:boolean lambda$mergeFields$8(java.util.Set,com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexField):537:537 -> a
+    2:13:com.android.tools.r8.graph.GraphLense run():223:234 -> a
+    14:14:com.android.tools.r8.graph.GraphLense run():230:230 -> a
+    15:27:com.android.tools.r8.graph.GraphLense buildGraphLense():240:252 -> a
+    15:27:com.android.tools.r8.graph.GraphLense run():236 -> a
+    28:37:com.android.tools.r8.graph.GraphLense buildGraphLense():241:250 -> a
+    28:37:com.android.tools.r8.graph.GraphLense run():236 -> a
+    38:38:boolean isValidRepresentative(com.android.tools.r8.graph.DexProgramClass):318:318 -> a
+    39:43:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):322:326 -> a
+    44:73:boolean mergeGlobally(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):332:361 -> a
+    44:73:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):327 -> a
+    74:81:boolean mergeInsidePackage(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):368:375 -> a
+    74:81:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):328 -> a
+    82:113:boolean mergeInsidePackage(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):372:403 -> a
+    82:113:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):328 -> a
+    114:122:com.android.tools.r8.shaking.StaticClassMerger$Representative getOrCreateRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.graph.DexProgramClass):409:417 -> a
+    123:130:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):421:428 -> a
+    131:142:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):424:435 -> a
+    143:151:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):430:438 -> a
+    152:157:void clearRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):442:447 -> a
+    158:162:void clearRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):446:450 -> a
+    163:163:boolean lambda$mayMergeAcrossPackageBoundaries$2(com.android.tools.r8.graph.DexEncodedMethod):461:461 -> a
+    164:164:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedField):465:465 -> a
+    165:170:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):489:494 -> a
+    171:187:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):490:506 -> a
+    188:191:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505:508 -> a
+    192:195:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):507:510 -> a
+    196:202:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):509:515 -> a
+    203:203:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeMethods$5(com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexEncodedMethod):526:526 -> a
+    204:204:boolean lambda$mergeMethods$6(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):530:530 -> a
+    205:223:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):551:569 -> a
+    224:230:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):609:615 -> a
+    224:230:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):571 -> a
+    231:231:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    231:231:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):615 -> a
+    231:231:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):571 -> a
+    232:238:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):615:621 -> a
+    232:238:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):571 -> a
+    239:248:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):572:581 -> a
+    249:249:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeFields$7(com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexEncodedField):563:563 -> a
+    250:250:boolean lambda$mergeFields$8(java.util.Set,com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexField):567:567 -> a
     1:1:com.android.tools.r8.com.google.common.base.Equivalence access$100(com.android.tools.r8.shaking.StaticClassMerger):59:59 -> b
-    2:2:boolean lambda$satisfiesMergeCriteria$0(com.android.tools.r8.graph.DexEncodedField):278:278 -> b
-    3:23:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):426:446 -> b
+    2:2:boolean lambda$satisfiesMergeCriteria$0(com.android.tools.r8.graph.DexEncodedField):272:272 -> b
+    3:23:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):456:476 -> b
     24:24:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> b
-    24:24:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):447 -> b
-    25:28:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):447:450 -> b
-    29:29:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedMethod):443:443 -> b
-    30:40:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):493:503 -> b
-    41:48:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):559:566 -> b
-    41:48:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):505 -> b
+    24:24:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):477 -> b
+    25:28:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):477:480 -> b
+    29:29:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedMethod):473:473 -> b
+    30:40:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):523:533 -> b
+    41:48:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):589:596 -> b
+    41:48:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):535 -> b
     49:49:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> b
-    49:49:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):566 -> b
-    49:49:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):505 -> b
-    50:56:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):566:572 -> b
-    50:56:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):505 -> b
-    57:63:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):506:512 -> b
-    1:28:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):262:289 -> c
+    49:49:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):596 -> b
+    49:49:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):535 -> b
+    50:56:com.android.tools.r8.graph.DexEncodedMethod renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):596:602 -> b
+    50:56:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):535 -> b
+    57:63:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):536:542 -> b
+    1:28:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):256:283 -> c
     29:29:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
-    29:29:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):291 -> c
-    30:41:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):291:302 -> c
+    29:29:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):285 -> c
+    30:41:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):285:296 -> c
     42:42:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> c
-    42:42:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):302 -> c
-    43:53:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):309:319 -> c
-    54:59:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):294:299 -> c
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.N.I2:
+    42:42:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):296 -> c
+    43:53:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):303:313 -> c
+    54:59:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):288:293 -> c
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.N.G2:
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup DONT_MERGE -> d
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key mainDexDependenciesGlobalKey -> f
@@ -61423,107 +61217,107 @@
     1:9:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():113:121 -> a
     10:10:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():119:119 -> a
     11:11:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key globalKey():117:117 -> a
+    12:13:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key key(java.lang.String):126:127 -> a
     1:9:java.lang.String toString():132:140 -> toString
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key -> com.android.tools.r8.N.H2:
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key -> com.android.tools.r8.N.F2:
     java.lang.String packageOrGlobal -> b
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup mergeGroup -> a
     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 -> a
-    2:2:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup():83:83 -> a
+    1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup():83:83 -> a
     1:1:java.lang.String getPackageOrGlobal():87:87 -> b
     1:1:boolean isGlobal():91:91 -> c
     1:5:boolean equals(java.lang.Object):104:108 -> equals
     1:1:int hashCode():96:96 -> hashCode
-com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.N.J2:
+com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.N.H2:
+    com.android.tools.r8.shaking.StaticClassMerger this$0 -> d
     com.android.tools.r8.graph.DexProgramClass clazz -> a
-    com.android.tools.r8.shaking.StaticClassMerger this$0 -> e
-    boolean $assertionsDisabled -> f
     com.android.tools.r8.com.google.common.collect.HashMultiset methodBuckets -> c
     com.android.tools.r8.com.google.common.collect.HashMultiset fieldBuckets -> b
-    boolean hasSynchronizedMethods -> d
-    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:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):160:160 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):157:162 -> <init>
     1:1:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    1:1:void include(com.android.tools.r8.graph.DexProgramClass):169 -> a
-    2:4:void include(com.android.tools.r8.graph.DexProgramClass):169:171 -> a
+    1:1:void include(com.android.tools.r8.graph.DexProgramClass):167 -> a
+    2:4:void include(com.android.tools.r8.graph.DexProgramClass):167:169 -> a
     5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    5:5:void include(com.android.tools.r8.graph.DexProgramClass):174 -> a
-    6:12:void include(com.android.tools.r8.graph.DexProgramClass):174:180 -> a
-    13:13:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    13:13:void include(com.android.tools.r8.graph.DexProgramClass):169 -> a
-    14:14:boolean access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):151:151 -> a
-    15:19:boolean isFull():189:193 -> a
-    1:1:com.android.tools.r8.graph.DexProgramClass access$300(com.android.tools.r8.shaking.StaticClassMerger$Representative):151:151 -> b
-com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.N.L2:
+    5:5:void include(com.android.tools.r8.graph.DexProgramClass):171 -> a
+    6:8:void include(com.android.tools.r8.graph.DexProgramClass):171:173 -> a
+    9:9:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
+    9:9:void include(com.android.tools.r8.graph.DexProgramClass):167 -> a
+    10:10:com.android.tools.r8.graph.DexProgramClass access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):151:151 -> a
+    11:15:boolean isFull():183:187 -> a
+com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.N.J2:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set prunedTypes -> d
     java.util.Set methodsToKeepForConfigurationDebugging -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.shaking.UsagePrinter usagePrinter -> c
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):41:41 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):38:51 -> <init>
-    1:1:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):49:49 -> a
-    2:3:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66:67 -> a
-    4:27:java.util.List getNewProgramClasses(java.util.List):71:94 -> a
-    4:27:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):67 -> a
-    28:47:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):113:132 -> a
-    28:47:java.util.List getNewProgramClasses(java.util.List):97 -> a
-    28:47:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):67 -> a
-    48:55:java.util.List getNewProgramClasses(java.util.List):98:105 -> a
-    48:55:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):67 -> a
-    56:56:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):67:67 -> a
-    57:76:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):150:169 -> a
-    77:84:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):175:182 -> a
-    77:84:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):170 -> a
-    85:101:void claimNestOwnership(com.android.tools.r8.graph.DexClass):203:219 -> a
-    85:101:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):183 -> a
-    85:101:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):170 -> a
-    102:102:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):171:171 -> a
-    103:103:boolean isTypeLive(com.android.tools.r8.graph.DexType):189:189 -> a
-    104:104:boolean isTypeLive(com.android.tools.r8.graph.DexType):189:189 -> a
-    104:104:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):137 -> a
-    105:111:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):138:144 -> a
-    112:113:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):195:196 -> a
-    114:115:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):198:199 -> a
-    116:119:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):225:228 -> a
-    120:124:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):232:236 -> a
-    125:125:boolean isTypeLive(com.android.tools.r8.graph.DexType):189:189 -> a
-    125:125:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):237 -> a
-    126:127:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):242:243 -> a
-    128:142:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):251:265 -> a
-    143:143:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
-    143:143:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):265 -> a
-    144:151:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):265:272 -> a
-    152:157:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):269:274 -> a
-    158:158:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
-    158:158:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):274 -> a
-    159:181:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):274:296 -> a
-    182:182:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    182:182:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> a
-    182:182:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):296 -> a
-    183:184:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> a
-    183:184:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):296 -> a
-    185:196:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):295:306 -> a
-    197:197:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):254:254 -> a
-    198:227:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):310:339 -> a
-    228:228:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):312:312 -> a
-    229:229:java.util.Collection getMethodsToKeepForConfigurationDebugging():347:347 -> a
-    1:1:java.util.Collection getRemovedClasses():343:343 -> b
-    1:6:com.android.tools.r8.graph.DexApplication run():55:60 -> c
-com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.N.O2:
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):40:40 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):37:50 -> <init>
+    1:1:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):48:48 -> a
+    2:3:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):65:66 -> a
+    4:27:java.util.List getNewProgramClasses(java.util.List):70:93 -> a
+    4:27:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66 -> a
+    28:35:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):112:119 -> a
+    28:35:java.util.List getNewProgramClasses(java.util.List):96 -> a
+    28:35:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66 -> a
+    36:36:int com.android.tools.r8.graph.DexTypeList.size():63:63 -> a
+    36:36:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):119 -> a
+    36:36:java.util.List getNewProgramClasses(java.util.List):96 -> a
+    36:36:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66 -> a
+    37:49:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):124:136 -> a
+    37:49:java.util.List getNewProgramClasses(java.util.List):96 -> a
+    37:49:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66 -> a
+    50:57:java.util.List getNewProgramClasses(java.util.List):97:104 -> a
+    50:57:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66 -> a
+    58:58:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66:66 -> a
+    59:78:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):140:159 -> a
+    79:86:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):165:172 -> a
+    79:86:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):160 -> a
+    87:103:void claimNestOwnership(com.android.tools.r8.graph.DexClass):193:209 -> a
+    87:103:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):173 -> a
+    87:103:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):160 -> a
+    104:104:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):161:161 -> a
+    105:105:boolean isTypeLive(com.android.tools.r8.graph.DexType):179:179 -> a
+    106:107:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):185:186 -> a
+    108:109:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):188:189 -> a
+    110:113:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):215:218 -> a
+    114:118:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):222:226 -> a
+    119:119:boolean isTypeLive(com.android.tools.r8.graph.DexType):179:179 -> a
+    119:119:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):227 -> a
+    120:121:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):232:233 -> a
+    122:136:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):241:255 -> a
+    137:137:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
+    137:137:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255 -> a
+    138:145:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255:262 -> a
+    146:151:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):259:264 -> a
+    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
+    152:152:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264 -> a
+    153:175:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264:286 -> a
+    176:176:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    176:176:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> a
+    176:176:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> a
+    177:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> a
+    177:178:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> a
+    179:190:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):285:296 -> a
+    191:191:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):244:244 -> a
+    192:221:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):300:329 -> a
+    222:222:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):302:302 -> a
+    223:223:java.util.Collection getMethodsToKeepForConfigurationDebugging():337:337 -> a
+    1:1:java.util.Collection getRemovedClasses():333:333 -> b
+    1:6:com.android.tools.r8.graph.DexApplication run():54:59 -> c
+com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.N.M2:
     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>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.UnusedArgumentRule$Builder builder():74:74 -> v
-com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.N.M2:
-com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.N.N2:
+com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.N.K2:
+com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.N.L2:
     1:1:void <init>(com.android.tools.r8.shaking.UnusedArgumentRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
-com.android.tools.r8.shaking.UsagePrinter -> com.android.tools.r8.N.Q2:
+com.android.tools.r8.shaking.UsagePrinter -> com.android.tools.r8.N.O2:
     com.android.tools.r8.graph.DexProgramClass enclosingClazz -> b
     java.util.function.Consumer consumer -> a
     boolean $assertionsDisabled -> e
@@ -61604,14 +61398,14 @@
     10:10:void append(java.lang.String):26:26 -> b
     10:10:void printClazzPrefixIfNecessary():51 -> b
     11:11:void printClazzPrefixIfNecessary():52:52 -> b
-com.android.tools.r8.shaking.UsagePrinter$NoOpUsagePrinter -> com.android.tools.r8.N.P2:
+com.android.tools.r8.shaking.UsagePrinter$NoOpUsagePrinter -> com.android.tools.r8.N.N2:
     1:1:void <init>():96:96 -> <init>
     void printUnusedClass(com.android.tools.r8.graph.DexProgramClass) -> a
     void printUnusedField(com.android.tools.r8.graph.DexEncodedField) -> a
     void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void visited() -> a
     void visiting(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.N.b3:
+com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.N.Z2:
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> b
     boolean $assertionsDisabled -> p
     com.android.tools.r8.graph.AppView appView -> c
@@ -61628,160 +61422,148 @@
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder renamedMembersLense -> m
     java.util.List synthesizedBridges -> n
     java.util.Set pinnedTypes -> l
-    1:1:void <clinit>():89:89 -> <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):258:258 -> <init>
-    2:41:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):231:270 -> <init>
-    1:1:java.util.Set access$100(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> a
-    2:2:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses getMergedClasses():274:274 -> a
-    3:5:void initializeMergeCandidates(java.lang.Iterable):278:280 -> a
-    6:23:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):333:350 -> a
-    24:25:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):357:358 -> a
-    26:27:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):813:814 -> a
-    26:27:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):358 -> a
-    28:34:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):364:370 -> a
-    35:43:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):379:387 -> a
-    44:44:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    44:44:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387 -> a
-    45:45:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    45:45:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387 -> a
-    46:46:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    46:46:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387 -> a
-    47:49:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387:389 -> a
-    50:70:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387:407 -> a
-    71:72:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):813:814 -> a
-    71:72:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):408 -> a
-    73:78:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):409:414 -> a
-    79:79:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isSerializable(com.android.tools.r8.graph.DexType):604:604 -> a
-    79:79:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):414 -> a
-    80:92:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):414:426 -> a
-    93:109:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1679:1695 -> a
-    93:109:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):427 -> a
-    110:118:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1694:1702 -> a
-    110:118:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):427 -> a
-    119:138:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):430:449 -> a
-    139:140:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):439:440 -> a
-    141:157:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):460:476 -> a
-    158:158:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
-    158:158:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):476 -> a
-    159:160:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):483:484 -> a
-    161:161:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLockCandidate(com.android.tools.r8.graph.DexType):611:611 -> a
-    161:161:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):484 -> a
-    162:164:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):484:486 -> a
-    165:165:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLockCandidate(com.android.tools.r8.graph.DexType):611:611 -> a
-    165:165:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):486 -> a
-    166:173:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):487:494 -> a
-    174:190:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):525:541 -> a
-    174:190:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    191:191:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
-    191:191:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):544 -> a
-    191:191:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    192:193:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):544:545 -> a
-    192:193:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    194:194:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    194:194:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):549 -> a
-    194:194:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    195:204:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):549:558 -> a
-    195:204:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    205:205:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    205:205:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):559 -> a
-    205:205:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    206:209:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):559:562 -> a
-    206:209:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):501 -> a
-    210:211:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):502:503 -> a
-    212:257:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):753:798 -> a
-    212:257:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):507 -> a
-    258:259:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):508:509 -> a
-    260:277:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):887:904 -> a
-    260:277:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):515 -> a
-    278:279:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):516:517 -> a
-    280:281:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):496:497 -> a
-    282:283:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):478:479 -> a
-    284:284:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):475:475 -> a
-    285:315:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):690:720 -> a
-    316:316:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    316:316:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):721 -> a
-    317:342:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):721:746 -> a
-    343:343:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    343:343:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):721 -> a
-    344:347:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1461:1464 -> a
-    344:347:void access$1200(com.android.tools.r8.graph.DexEncodedMethod):89 -> a
-    1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> b
-    2:9:void initializePinnedTypes(java.lang.Iterable):290:297 -> b
+    1:1:void <clinit>():88:88 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):249:249 -> <init>
+    2:41:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):222:261 -> <init>
+    1:1:java.util.Set access$100(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> a
+    2:2:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses getMergedClasses():265:265 -> a
+    3:5:void initializeMergeCandidates(java.lang.Iterable):269:271 -> a
+    6:23:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):324:341 -> a
+    24:25:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):348:349 -> a
+    26:27:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
+    26:27:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):349 -> a
+    28:34:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):355:361 -> a
+    35:58:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):370:393 -> a
+    59:60:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isPinned(com.android.tools.r8.graph.DexReference):791:792 -> a
+    59:60:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):394 -> a
+    61:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):395:400 -> a
+    67:67:boolean com.android.tools.r8.graph.AppInfoWithSubtyping.isSerializable(com.android.tools.r8.graph.DexType):602:602 -> a
+    67:67:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):400 -> a
+    68:68:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):400:400 -> a
+    69:69:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
+    69:69:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):409 -> a
+    70:71:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):409:410 -> a
+    72:72:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    72:72:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):414 -> a
+    73:77:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):414:418 -> a
+    78:87:boolean disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1655:1664 -> a
+    78:87:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):418 -> a
+    88:106:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):420:438 -> a
+    107:108:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):428:429 -> a
+    109:125:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):449:465 -> a
+    126:126:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    126:126:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):465 -> a
+    127:127:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):472:472 -> a
+    128:144:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):503:519 -> a
+    128:144:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    145:145:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> a
+    145:145:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):522 -> a
+    145:145:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    146:147:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):522:523 -> a
+    146:147:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    148:148:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    148:148:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):527 -> a
+    148:148:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    149:158:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):527:536 -> a
+    149:158:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    159:159:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    159:159:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):537 -> a
+    159:159:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    160:163:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):537:540 -> a
+    160:163:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):479 -> a
+    164:165:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):480:481 -> a
+    166:211:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):731:776 -> a
+    166:211:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):485 -> a
+    212:213:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):486:487 -> a
+    214:231:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):865:882 -> a
+    214:231:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):493 -> a
+    232:233:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):494:495 -> a
+    234:235:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):474:475 -> a
+    236:237:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):467:468 -> a
+    238:238:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):464:464 -> a
+    239:269:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):668:698 -> a
+    270:270:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    270:270:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):699 -> a
+    271:296:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):699:724 -> a
+    297:297:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    297:297:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):699 -> a
+    298:301:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1439:1442 -> a
+    298:301:void access$1200(com.android.tools.r8.graph.DexEncodedMethod):88 -> a
+    1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> b
+    2:9:void initializePinnedTypes(java.lang.Iterable):281:288 -> b
     10:10:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> b
-    10:10:void initializePinnedTypes(java.lang.Iterable):298 -> b
-    11:13:void initializePinnedTypes(java.lang.Iterable):298:300 -> b
+    10:10:void initializePinnedTypes(java.lang.Iterable):289 -> b
+    11:13:void initializePinnedTypes(java.lang.Iterable):289:291 -> b
     14:14:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> b
-    14:14:void initializePinnedTypes(java.lang.Iterable):298 -> b
-    15:24:void initializePinnedTypes(java.lang.Iterable):319:328 -> b
-    25:40:com.android.tools.r8.graph.GraphLense run():669:684 -> b
-    41:46:com.android.tools.r8.graph.GraphLense run():680:685 -> b
-    47:109:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):810:872 -> b
+    14:14:void initializePinnedTypes(java.lang.Iterable):289 -> b
+    15:24:void initializePinnedTypes(java.lang.Iterable):310:319 -> b
+    25:40:com.android.tools.r8.graph.GraphLense run():647:662 -> b
+    41:46:com.android.tools.r8.graph.GraphLense run():658:663 -> b
+    47:109:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):788:850 -> b
     110:110:java.lang.String com.android.tools.r8.graph.DexProgramClass.toSourceString():214:214 -> b
-    110:110:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):874 -> b
-    111:111:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):874:874 -> b
+    110:110:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):852 -> b
+    111:111:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):852:852 -> b
     112:112:java.lang.String com.android.tools.r8.graph.DexProgramClass.toSourceString():214:214 -> b
-    112:112:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):875 -> b
-    113:113:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):875:875 -> b
-    114:121:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):871:878 -> b
+    112:112:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):853 -> b
+    113:113:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):853:853 -> b
+    114:121:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):849:856 -> b
     122:122:java.lang.String com.android.tools.r8.graph.DexProgramClass.toSourceString():214:214 -> b
-    122:122:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):880 -> b
-    123:123:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):880:880 -> b
+    122:122:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):858 -> b
+    123:123:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):858:858 -> b
     124:124:java.lang.String com.android.tools.r8.graph.DexProgramClass.toSourceString():214:214 -> b
-    124:124:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):881 -> b
-    125:125:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):881:881 -> b
-    126:126:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):877:877 -> b
-    127:127:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):862:862 -> b
-    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1100(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> c
-    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1300(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> d
-    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> e
-    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> f
-    1:1:com.android.tools.r8.graph.DexApplication access$1600(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> g
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1700(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> h
-    1:1:java.util.List access$1800(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> i
-    1:4:java.util.Collection getInvokes():571:574 -> j
-    1:4:java.util.Collection access$1900(com.android.tools.r8.shaking.VerticalClassMerger):89 -> j
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> k
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> l
-    1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> m
-com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.N.R2:
+    124:124:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):859 -> b
+    125:125:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):859:859 -> b
+    126:126:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):855:855 -> b
+    127:127:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):840:840 -> b
+    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1100(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> c
+    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1300(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> d
+    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> e
+    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> f
+    1:1:com.android.tools.r8.graph.DexApplication access$1600(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> g
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1700(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> h
+    1:1:java.util.List access$1800(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> i
+    1:4:java.util.Collection getInvokes():549:552 -> j
+    1:4:java.util.Collection access$1900(com.android.tools.r8.shaking.VerticalClassMerger):88 -> j
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> k
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> l
+    1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> m
+com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.N.P2:
     int[] $SwitchMap$com$android$tools$r8$shaking$VerticalClassMerger$Rename -> b
     int[] $SwitchMap$com$android$tools$r8$ir$code$Invoke$Type -> c
     int[] $SwitchMap$com$android$tools$r8$shaking$VerticalClassMerger$AbortReason -> a
-    1:1:void <clinit>():1984:1984 -> <clinit>
-    2:2:void <clinit>():1401:1401 -> <clinit>
-    3:3:void <clinit>():155:155 -> <clinit>
-com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.N.S2:
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NO_SIDE_EFFECTS -> h
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NATIVE_METHOD -> g
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason MERGE_ACROSS_NESTS -> f
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason MAIN_DEX_ROOT_OUTSIDE_REFERENCE -> e
+    1:1:void <clinit>():1950:1950 -> <clinit>
+    2:2:void <clinit>():1379:1379 -> <clinit>
+    3:3:void <clinit>():152:152 -> <clinit>
+com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.N.Q2:
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason PINNED_SOURCE -> h
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NO_SIDE_EFFECTS -> g
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NATIVE_METHOD -> f
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason MERGE_ACROSS_NESTS -> e
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason ILLEGAL_ACCESS -> d
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason CONFLICT -> c
+    boolean $assertionsDisabled -> r
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason ALWAYS_INLINE -> b
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason ALREADY_MERGED -> a
-    boolean $assertionsDisabled -> t
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNHANDLED_INVOKE_SUPER -> p
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNHANDLED_INVOKE_DIRECT -> o
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason STATIC_INITIALIZERS -> n
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] $VALUES -> s
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason SOURCE_AND_TARGET_LOCK_CANDIDATES -> m
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason SERVICE_LOADER -> l
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason RESOLUTION_FOR_METHODS_MAY_CHANGE -> k
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason RESOLUTION_FOR_FIELDS_MAY_CHANGE -> j
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason PINNED_SOURCE -> i
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNSUPPORTED_ATTRIBUTES -> r
-    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNSAFE_INLINING -> q
-    1:19:void <clinit>():129:147 -> <clinit>
-    20:20:void <clinit>():129:129 -> <clinit>
-    1:1:void <init>(java.lang.String,int):129:129 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():129:129 -> a
-    2:2:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):150:150 -> a
-    3:61:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):155:213 -> a
-    3:61:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):150 -> a
-    62:62:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):150:150 -> a
-    63:63:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):211:211 -> a
-    63:63:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):150 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.N.T2:
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNSUPPORTED_ATTRIBUTES -> p
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNSAFE_INLINING -> o
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNHANDLED_INVOKE_SUPER -> n
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason UNHANDLED_INVOKE_DIRECT -> m
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason STATIC_INITIALIZERS -> l
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason SERVICE_LOADER -> k
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason RESOLUTION_FOR_METHODS_MAY_CHANGE -> j
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason RESOLUTION_FOR_FIELDS_MAY_CHANGE -> i
+    com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] $VALUES -> q
+    1:17:void <clinit>():128:144 -> <clinit>
+    18:18:void <clinit>():128:128 -> <clinit>
+    1:1:void <init>(java.lang.String,int):128:128 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():128:128 -> a
+    2:2:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):147:147 -> a
+    3:55:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):152:204 -> a
+    3:55:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):147 -> a
+    56:56:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):147:147 -> a
+    57:57:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):202:202 -> a
+    57:57:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):147 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.N.R2:
     com.android.tools.r8.graph.DexClass source -> a
     com.android.tools.r8.graph.DexClass target -> b
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder deferredRenamings -> c
@@ -61789,153 +61571,126 @@
     boolean abortMerge -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> f
-    1:1:void <clinit>():915:915 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):915:915 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):927:927 -> <init>
-    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):921:929 -> <init>
-    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):944:947 -> a
-    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1021:1023 -> a
-    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1022:1022 -> a
-    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1084:1084 -> a
-    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1128:1128 -> a
-    11:22:boolean restoreDebuggingState(java.util.stream.Stream):1134:1145 -> a
+    1:1:void <clinit>():893:893 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):893:893 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):905:905 -> <init>
+    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):899:907 -> <init>
+    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):922:925 -> a
+    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):999:1001 -> a
+    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1000:1000 -> a
+    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1062:1062 -> a
+    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1106:1106 -> a
+    11:22:boolean restoreDebuggingState(java.util.stream.Stream):1112:1123 -> a
     23:23:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    23:23:boolean restoreDebuggingState(java.util.stream.Stream):1145 -> a
-    24:24:boolean restoreDebuggingState(java.util.stream.Stream):1145:1145 -> a
+    23:23:boolean restoreDebuggingState(java.util.stream.Stream):1123 -> a
+    24:24:boolean restoreDebuggingState(java.util.stream.Stream):1123:1123 -> a
     25:25:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    25:25:boolean restoreDebuggingState(java.util.stream.Stream):1145 -> a
-    26:27:boolean restoreDebuggingState(java.util.stream.Stream):1145:1146 -> a
-    28:28:boolean restoreDebuggingState(java.util.stream.Stream):1145:1145 -> a
+    25:25:boolean restoreDebuggingState(java.util.stream.Stream):1123 -> a
+    26:27:boolean restoreDebuggingState(java.util.stream.Stream):1123:1124 -> a
+    28:28:boolean restoreDebuggingState(java.util.stream.Stream):1123:1123 -> a
     29:29:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    29:29:boolean restoreDebuggingState(java.util.stream.Stream):1145 -> a
-    30:31:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1136:1137 -> a
-    32:32:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1151:1151 -> a
-    33:36:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1331:1334 -> a
-    37:42:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1432:1437 -> a
-    37:42:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1335 -> a
-    43:43:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    43:43:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1440 -> a
-    43:43:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1335 -> a
-    44:51:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1440:1447 -> a
-    44:51:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1335 -> a
-    52:53:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1336:1337 -> a
-    54:54:void com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):312:312 -> a
-    54:54:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1337 -> a
-    55:60:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1338:1343 -> a
-    61:65:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1352:1356 -> a
-    66:66:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1386:1386 -> a
-    67:95: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):1396:1424 -> a
-    96:97: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):1403:1404 -> a
-    98:98:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
-    98:98: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):1412 -> a
-    99:114: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):1412:1427 -> a
-    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1141:1142 -> b
-    3:3:java.util.List getSynthesizedBridges():1155:1155 -> b
-    1:2:boolean merge():936:937 -> c
+    29:29:boolean restoreDebuggingState(java.util.stream.Stream):1123 -> a
+    30:30:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
+    30:30:boolean restoreDebuggingState(java.util.stream.Stream):1123 -> a
+    31:32:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1114:1115 -> a
+    33:33:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1129:1129 -> a
+    34:34:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287:1287 -> a
+    35:35:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> a
+    35:35:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> a
+    35:35:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287 -> a
+    36:36:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287:1287 -> a
+    37:40:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1309:1312 -> a
+    41:46:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1410:1415 -> a
+    41:46:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1313 -> a
+    47:47:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    47:47:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1418 -> a
+    47:47:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1313 -> a
+    48:55:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1418:1425 -> a
+    48:55:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1313 -> a
+    56:57:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1314:1315 -> a
+    58:58:void com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):312:312 -> a
+    58:58:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1315 -> a
+    59:64:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1316:1321 -> a
+    65:69:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1330:1334 -> a
+    70:70:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1364:1364 -> a
+    71:99: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):1374:1402 -> a
+    100:101: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):1381:1382 -> a
+    102:102:java.lang.String com.android.tools.r8.graph.DexItem.toSourceString():64:64 -> a
+    102:102: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):1390 -> a
+    103:118: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):1390:1405 -> a
+    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1119:1120 -> b
+    3:3:java.util.List getSynthesizedBridges():1133:1133 -> b
+    1:2:boolean merge():914:915 -> c
     3:3:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
-    3:3:boolean merge():937 -> c
-    4:4:boolean merge():937:937 -> c
-    5:6:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1314:1315 -> c
-    5:6:boolean merge():937 -> c
-    7:19:boolean merge():939:951 -> c
-    20:34:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1361:1375 -> c
-    20:34:boolean merge():954 -> c
+    3:3:boolean merge():915 -> c
+    4:4:boolean merge():915:915 -> c
+    5:6:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1292:1293 -> c
+    5:6:boolean merge():915 -> c
+    7:19:boolean merge():917:929 -> c
+    20:34:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1339:1353 -> c
+    20:34:boolean merge():932 -> c
     35:35:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    35:35:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1375 -> c
-    35:35:boolean merge():954 -> c
-    36:40:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1376:1380 -> c
-    36:40:boolean merge():954 -> c
-    41:41:boolean merge():955:955 -> c
-    42:42:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> c
-    42:42:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> c
-    42:42:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309 -> c
-    42:42:boolean merge():952 -> c
-    43:43:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309:1309 -> c
-    43:43:boolean merge():952 -> c
-    44:44:boolean merge():961:961 -> c
-    45:49:boolean merge():958:962 -> c
-    50:50:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> c
-    50:50:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> c
-    50:50:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309 -> c
-    50:50:boolean merge():962 -> c
-    51:51:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309:1309 -> c
-    51:51:boolean merge():962 -> c
-    52:52:boolean merge():963:963 -> c
-    53:53:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    53:53:boolean merge():963 -> c
-    54:57:boolean merge():964:967 -> c
-    58:58:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1235:1235 -> c
-    58:58:boolean merge():967 -> c
-    59:59:boolean merge():972:972 -> c
-    60:80:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1280:1300 -> c
-    60:80:boolean merge():973 -> c
-    81:81:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1295:1295 -> c
-    81:81:boolean merge():973 -> c
-    82:84:boolean merge():975:977 -> c
-    85:85:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    85:85:boolean merge():977 -> c
-    86:89:boolean merge():981:984 -> c
-    90:106:boolean merge():983:999 -> c
-    107:107:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> c
-    107:107:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> c
-    107:107:boolean merge():999 -> c
-    108:109:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> c
-    108:109:boolean merge():999 -> c
-    110:110:boolean merge():1001:1001 -> c
-    111:111:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    111:111:boolean merge():1001 -> c
-    112:113:boolean merge():1002:1003 -> c
-    114:114:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> c
-    114:114:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> c
-    114:114:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309 -> c
-    114:114:boolean merge():1003 -> c
-    115:115:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309:1309 -> c
-    115:115:boolean merge():1003 -> c
-    116:134:boolean merge():1009:1027 -> c
-    135:135:boolean merge():1018:1018 -> c
-    136:140:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1451:1455 -> c
-    136:140:boolean merge():1028 -> c
-    141:151:boolean merge():1031:1041 -> c
-    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> c
-    152:152:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> c
-    152:152:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309 -> c
-    152:152:boolean merge():1041 -> c
-    153:153:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309:1309 -> c
-    153:153:boolean merge():1041 -> c
-    154:154:boolean merge():1045:1045 -> c
-    155:209:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1159:1213 -> c
-    155:209:boolean merge():1045 -> c
-    210:210:boolean merge():1046:1046 -> c
-    211:211:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1235:1235 -> c
-    211:211:boolean merge():1046 -> c
-    212:245:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1240:1273 -> c
-    212:245:boolean merge():1054 -> c
-    246:247:boolean merge():1055:1056 -> c
-    248:248:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> c
-    248:248:com.android.tools.r8.graph.PresortedComparable com.android.tools.r8.graph.DexEncodedMethod.getKey():80 -> c
-    248:248:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309 -> c
-    248:248:boolean merge():1056 -> c
-    249:249:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309:1309 -> c
-    249:249:boolean merge():1056 -> c
-    250:250:boolean merge():1059:1059 -> c
-    251:251:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
-    251:251:boolean merge():1059 -> c
-    252:257:boolean merge():1060:1065 -> c
-    258:265:boolean merge():1064:1071 -> c
-    266:266:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> c
-    266:266:boolean merge():1071 -> c
-    267:285:boolean merge():1071:1089 -> c
-    286:295:boolean merge():1087:1096 -> c
-    296:303:boolean merge():1094:1101 -> c
-    304:306:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1320:1322 -> c
-    304:306:boolean merge():1101 -> c
-    307:332:boolean merge():1104:1129 -> c
-    333:333:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> c
-    333:333:boolean merge():1071 -> c
-    334:334:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
-    334:334:boolean merge():937 -> c
-    335:335:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1146:1146 -> c
-com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.N.U2:
+    35:35:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1353 -> c
+    35:35:boolean merge():932 -> c
+    36:40:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1354:1358 -> c
+    36:40:boolean merge():932 -> c
+    41:41:boolean merge():933:933 -> c
+    42:51:boolean merge():930:939 -> c
+    52:57:boolean merge():936:941 -> c
+    58:58:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
+    58:58:boolean merge():941 -> c
+    59:62:boolean merge():942:945 -> c
+    63:63:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1213:1213 -> c
+    63:63:boolean merge():945 -> c
+    64:64:boolean merge():950:950 -> c
+    65:85:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1258:1278 -> c
+    65:85:boolean merge():951 -> c
+    86:86:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1273:1273 -> c
+    86:86:boolean merge():951 -> c
+    87:89:boolean merge():953:955 -> c
+    90:90:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
+    90:90:boolean merge():955 -> c
+    91:94:boolean merge():959:962 -> c
+    95:111:boolean merge():961:977 -> c
+    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
+    112:112:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> c
+    112:112:boolean merge():977 -> c
+    113:114:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> c
+    113:114:boolean merge():977 -> c
+    115:115:boolean merge():979:979 -> c
+    116:116:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
+    116:116:boolean merge():979 -> c
+    117:142:boolean merge():980:1005 -> c
+    143:143:boolean merge():996:996 -> c
+    144:148:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1429:1433 -> c
+    144:148:boolean merge():1006 -> c
+    149:163:boolean merge():1009:1023 -> c
+    164:218:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1137:1191 -> c
+    164:218:boolean merge():1023 -> c
+    219:219:boolean merge():1024:1024 -> c
+    220:220:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1213:1213 -> c
+    220:220:boolean merge():1024 -> c
+    221:254:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1218:1251 -> c
+    221:254:boolean merge():1032 -> c
+    255:259:boolean merge():1033:1037 -> c
+    260:260:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> c
+    260:260:boolean merge():1037 -> c
+    261:266:boolean merge():1038:1043 -> c
+    267:274:boolean merge():1042:1049 -> c
+    275:275:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> c
+    275:275:boolean merge():1049 -> c
+    276:294:boolean merge():1049:1067 -> c
+    295:304:boolean merge():1065:1074 -> c
+    305:312:boolean merge():1072:1079 -> c
+    313:315:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1298:1300 -> c
+    313:315:boolean merge():1079 -> c
+    316:341:boolean merge():1082:1107 -> c
+    342:342:java.lang.Iterable com.android.tools.r8.graph.DexClass.fields():125:125 -> c
+    342:342:boolean merge():1049 -> c
+    343:343:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> c
+    343:343:boolean merge():915 -> c
+    344:344:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1124:1124 -> c
+com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.N.S2:
     java.util.Map seenPositions -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap sourceProtoCache -> c
     java.util.Collection invokes -> f
@@ -61944,157 +61699,157 @@
     boolean $assertionsDisabled -> h
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> g
     com.android.tools.r8.graph.DexType target -> e
-    1:1:void <clinit>():1568:1568 -> <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):1568:1568 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1579:1579 -> <init>
-    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1573:1585 -> <init>
-    1:22:boolean mayCollide():1589:1610 -> a
-    23:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1622:1623 -> a
-    25:56:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1642:1673 -> a
-    1:18:void fillSeenPositions():1615:1632 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.N.V2:
+    1:1:void <clinit>():1544:1544 -> <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):1544:1544 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1555:1555 -> <init>
+    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1549:1561 -> <init>
+    1:22:boolean mayCollide():1565:1586 -> a
+    23:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1598:1599 -> a
+    25:56:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1618:1649 -> a
+    1:18:void fillSeenPositions():1591:1608 -> b
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.N.T2:
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexMethod context -> d
     com.android.tools.r8.graph.DexClass source -> f
     boolean foundIllegalAccess -> c
-    1:1:void <clinit>():1787:1787 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1796:1796 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1789:1798 -> <init>
-    1:1:boolean foundIllegalAccess():1802:1802 -> a
-    2:2:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1806:1806 -> a
-    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1869:1872 -> a
-    7:7:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1906:1906 -> a
-    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1885:1888 -> b
-    5:5:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1901:1901 -> b
-    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1877:1880 -> c
-    5:5:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1911:1911 -> c
-    6:6:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1916:1916 -> c
-    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1893:1896 -> d
-    5:5:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1921:1921 -> d
-    6:6:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1926:1926 -> d
-    1:10:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1810:1819 -> e
-    11:17:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1846:1852 -> e
-    18:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1861:1864 -> e
-    1:12:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1827:1838 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.N.W2:
+    1:1:void <clinit>():1753:1753 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1762:1762 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1755:1764 -> <init>
+    1:1:boolean foundIllegalAccess():1768:1768 -> a
+    2:2:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1772:1772 -> a
+    3:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1835:1838 -> a
+    7:7:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1872:1872 -> a
+    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1851:1854 -> b
+    5:5:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1867:1867 -> b
+    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1843:1846 -> c
+    5:5:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1877:1877 -> c
+    6:6:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1882:1882 -> c
+    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1859:1862 -> d
+    5:5:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1887:1887 -> d
+    6:6:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1892:1892 -> d
+    1:10:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1776:1785 -> e
+    11:17:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1812:1818 -> e
+    18:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1827:1830 -> e
+    1:12:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1793:1804 -> f
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.N.U2:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set mergeeCandidates -> c
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap cache -> a
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):585:585 -> <init>
-    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):580:587 -> <init>
-    1:6:java.util.Collection get():592:597 -> a
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):563:563 -> <init>
+    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):558:565 -> <init>
+    1:6:java.util.Collection get():570:575 -> a
     7:7:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    7:7:java.util.Collection get():598 -> a
-    8:23:java.util.Collection get():598:613 -> a
+    7:7:java.util.Collection get():576 -> a
+    8:23:java.util.Collection get():576:591 -> a
     24:24:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods():135:135 -> a
-    24:24:java.util.Collection get():598 -> a
-    25:32:java.util.Collection get():619:626 -> a
-    33:33:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):610:610 -> a
-    34:48:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):634:648 -> a
-    49:56:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):654:661 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.N.X2:
+    24:24:java.util.Collection get():576 -> a
+    25:32:java.util.Collection get():597:604 -> a
+    33:33:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):588:588 -> a
+    34:48:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):612:626 -> a
+    49:56:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):632:639 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.N.V2:
     com.android.tools.r8.shaking.VerticalClassMerger$Rename[] $VALUES -> d
     com.android.tools.r8.shaking.VerticalClassMerger$Rename IF_NEEDED -> b
     com.android.tools.r8.shaking.VerticalClassMerger$Rename ALWAYS -> a
     com.android.tools.r8.shaking.VerticalClassMerger$Rename NEVER -> c
-    1:3:void <clinit>():218:220 -> <clinit>
-    4:4:void <clinit>():217:217 -> <clinit>
-    1:1:void <init>(java.lang.String,int):217:217 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():217:217 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.N.Y2:
+    1:3:void <clinit>():209:211 -> <clinit>
+    4:4:void <clinit>():208:208 -> <clinit>
+    1:1:void <init>(java.lang.String,int):208:208 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():208:208 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.N.W2:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
     com.android.tools.r8.graph.DexType target -> c
     com.android.tools.r8.graph.DexType source -> b
-    1:1:void <clinit>():1705:1705 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1710:1712 -> <init>
+    1:1:void <clinit>():1671:1671 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1676:1678 -> <init>
     boolean isContextFreeForMethods() -> a
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1717:1717 -> a
-    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1722:1722 -> a
-    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1727:1727 -> a
-    4:21: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):1749:1766 -> a
-    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1732:1732 -> b
-    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1737:1737 -> b
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1742:1742 -> b
-    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1776:1776 -> c
-    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1771:1771 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.N.Z2:
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1683:1683 -> a
+    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1688:1688 -> a
+    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1693:1693 -> a
+    4:21:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1715:1732 -> a
+    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1698:1698 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1703:1703 -> b
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1708:1708 -> b
+    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1742:1742 -> c
+    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1737:1737 -> f
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.N.X2:
     com.android.tools.r8.ir.code.Invoke$Type type -> f
     com.android.tools.r8.graph.DexMethod invocationTarget -> e
     boolean isInterface -> g
     com.android.tools.r8.graph.DexMethod originalMethod -> d
     com.android.tools.r8.graph.DexMethod method -> c
-    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):1943:1948 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1930:1930 -> a
-    2:3:void updateMethodSignatures(java.util.function.Function):1963:1964 -> a
-    4:14:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1984:1994 -> a
-    15:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1986:1986 -> a
-    1:1:java.util.function.Consumer getRegistryCallback():1983:1983 -> p
-    1:10:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1969:1978 -> q
-com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.N.a3:
+    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):1909:1914 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1896:1896 -> a
+    2:3:void updateMethodSignatures(java.util.function.Function):1929:1930 -> a
+    4:14:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1950:1960 -> a
+    15:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1952:1952 -> a
+    1:1:java.util.function.Consumer getRegistryCallback():1949:1949 -> p
+    1:10:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1935:1944 -> q
+com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.N.Y2:
     com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder lensBuilder -> a
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> c
-    1:5:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1467:1471 -> <init>
-    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1470:1472 -> <init>
-    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1467:1467 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1467:1467 -> a
-    2:12:com.android.tools.r8.graph.GraphLense fixupTypeReferences():1476:1486 -> a
-    13:15:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1494:1496 -> a
-    16:17:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1527:1528 -> a
-    16:17:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1497 -> a
-    18:21:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1532:1535 -> a
-    18:21:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528 -> a
-    18:21:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1497 -> a
-    22:24:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1560:1562 -> a
-    22:24:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1535 -> a
-    22:24:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528 -> a
-    22:24:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1497 -> a
-    25:26:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1536:1537 -> a
-    25:26:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528 -> a
-    25:26:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1497 -> a
-    27:27:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528:1528 -> a
-    27:27:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1497 -> a
-    28:28:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1527:1527 -> a
-    28:28:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1497 -> a
-    29:30:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1499:1500 -> a
-    31:31:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> a
-    31:31:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1500 -> a
-    32:34:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1500:1502 -> a
-    35:42:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1511:1518 -> a
-    43:43:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):299:299 -> a
-    43:43:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1518 -> a
-    44:44:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1519:1519 -> a
-    45:45:void com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):312:312 -> a
-    45:45:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1519 -> a
-    46:46:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1521:1521 -> a
-    47:48:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1527:1528 -> a
-    49:52:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1532:1535 -> a
-    49:52:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528 -> a
-    53:55:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1560:1562 -> a
-    53:55:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1535 -> a
-    53:55:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528 -> a
-    56:57:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1536:1537 -> a
-    56:57:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528 -> a
-    58:58:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1528:1528 -> a
-    59:59:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1527:1527 -> a
-    60:70:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1543:1553 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses -> com.android.tools.r8.N.b3$a:
+    1:5:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1445:1449 -> <init>
+    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1448:1450 -> <init>
+    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1445:1445 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1445:1445 -> a
+    2:11:com.android.tools.r8.graph.GraphLense fixupTypeReferences():1454:1463 -> a
+    12:14:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1470:1472 -> a
+    15:16:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1503:1504 -> a
+    15:16:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1473 -> a
+    17:20:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1508:1511 -> a
+    17:20:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504 -> a
+    17:20:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1473 -> a
+    21:23:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1536:1538 -> a
+    21:23:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1511 -> a
+    21:23:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504 -> a
+    21:23:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1473 -> a
+    24:25:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1512:1513 -> a
+    24:25:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504 -> a
+    24:25:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1473 -> a
+    26:26:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504:1504 -> a
+    26:26:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1473 -> a
+    27:27:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1503:1503 -> a
+    27:27:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1473 -> a
+    28:29:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1475:1476 -> a
+    30:30:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):316:316 -> a
+    30:30:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1476 -> a
+    31:33:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1476:1478 -> a
+    34:41:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1487:1494 -> a
+    42:42:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):299:299 -> a
+    42:42:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1494 -> a
+    43:43:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1495:1495 -> a
+    44:44:void com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):312:312 -> a
+    44:44:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1495 -> a
+    45:45:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1497:1497 -> a
+    46:47:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1503:1504 -> a
+    48:51:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1508:1511 -> a
+    48:51:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504 -> a
+    52:54:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1536:1538 -> a
+    52:54:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1511 -> a
+    52:54:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504 -> a
+    55:56:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1512:1513 -> a
+    55:56:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504 -> a
+    57:57:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1504:1504 -> a
+    58:58:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1503:1503 -> a
+    59:69:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1519:1529 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses -> com.android.tools.r8.N.Z2$a:
     java.util.Map mergedClasses -> a
     java.util.Map sources -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():91:91 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.shaking.VerticalClassMerger$1):91:91 -> <init>
-    2:8:void <init>(java.util.Map):96:102 -> <init>
-    1:1:void lambda$new$1(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):100:100 -> a
-    2:2:java.util.List getSourcesFor(com.android.tools.r8.graph.DexType):106:106 -> a
-    3:6:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):119:122 -> a
-    1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):110:111 -> b
-    1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):115:115 -> c
-    1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):100:100 -> d
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.N.e3:
+    1:1:void <clinit>():90:90 -> <clinit>
+    1:1:void <init>(java.util.Map,com.android.tools.r8.shaking.VerticalClassMerger$1):90:90 -> <init>
+    2:8:void <init>(java.util.Map):95:101 -> <init>
+    1:1:void lambda$new$1(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):99:99 -> a
+    2:2:java.util.List getSourcesFor(com.android.tools.r8.graph.DexType):105:105 -> a
+    3:6:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):118:121 -> a
+    1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):109:110 -> b
+    1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):114:114 -> c
+    1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):99:99 -> d
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.N.c3:
     boolean $assertionsDisabled -> o
     java.util.Map originalMethodSignaturesForBridges -> n
     java.util.Map contextualVirtualToDirectMethodMaps -> l
@@ -62112,8 +61867,8 @@
     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):121:121 -> b
     1:7:boolean isContextFreeForMethod(com.android.tools.r8.graph.DexMethod):147:153 -> c
     1:12:java.util.Set lookupMethodInAllContexts(com.android.tools.r8.graph.DexMethod):126:137 -> e
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense$1 -> com.android.tools.r8.N.c3:
-com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder -> com.android.tools.r8.N.d3:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense$1 -> com.android.tools.r8.N.a3:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder -> com.android.tools.r8.N.b3:
     java.util.Map methodMap -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.com.google.common.collect.BiMap fieldMap -> b
@@ -62156,7 +61911,7 @@
     104:117:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder):336:349 -> a
     1:1:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):308:308 -> b
     2:2:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):321:321 -> b
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.N.h3:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.N.f3:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -62186,7 +61941,7 @@
     32:36:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230 -> b
     37:43:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230:236 -> b
     44:44:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):235:235 -> b
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.N.f3:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.N.d3:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -62196,19 +61951,19 @@
     1:2:void indent():268:269 -> b
     3:5:void addReason(java.lang.String):274:276 -> b
     1:3:void startItem(java.lang.String):262:264 -> c
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.N.g3:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.N.e3:
     com.android.tools.r8.experimental.graphinfo.GraphNode node -> a
     com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath path -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():46:46 -> <clinit>
     1:4:void <init>(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath):50:53 -> <init>
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.N.k3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.N.i3:
     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.WhyAreYouNotInliningRule$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>
     java.lang.String typeString() -> u
     1:1:com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder builder():74:74 -> v
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.N.i3:
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.N.j3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.N.g3:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.N.h3:
     1:1:void <init>(com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> b
@@ -62388,7 +62143,7 @@
     1:1:com.android.tools.r8.utils.Reporter getReporter():424:424 -> c
     2:2:com.android.tools.r8.utils.AndroidApp$Builder addMainDexClasses(java.util.Collection):654:654 -> c
     3:11:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):724:732 -> c
-    12:13:boolean com.android.tools.r8.utils.FileUtils.isAarFile(java.nio.file.Path):71:72 -> c
+    12:13:boolean com.android.tools.r8.utils.FileUtils.isAarFile(java.nio.file.Path):66:67 -> c
     12:13:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):733 -> c
     14:14:com.android.tools.r8.utils.AarArchiveResourceProvider com.android.tools.r8.utils.AarArchiveResourceProvider.fromArchive(java.nio.file.Path):38:38 -> c
     14:14:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):734 -> c
@@ -62471,35 +62226,35 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():35:35 -> <clinit>
     1:5:void <init>(com.android.tools.r8.shaking.FilteredClassPath,boolean):46:50 -> <init>
-    1:16:java.util.List readArchive():54:69 -> a
-    17:28:java.util.List readArchive():68:79 -> a
-    29:37:java.util.List readArchive():75:83 -> a
-    38:67:java.util.List readArchive():61:90 -> a
-    68:68:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    68:68:java.util.List readArchive():90 -> a
-    69:73:java.util.List readArchive():90:94 -> a
-    74:105:java.util.List readArchive():56:87 -> a
-    106:106:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
-    106:106:java.util.List readArchive():87 -> a
-    107:107:java.util.List readArchive():87:87 -> a
-    108:108:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):85:85 -> a
-    1:7:void accept(com.android.tools.r8.DataResourceProvider$Visitor):113:119 -> accept
-    8:8:boolean isProgramResourceName(java.lang.String):137:137 -> accept
-    8:8:void accept(com.android.tools.r8.DataResourceProvider$Visitor):119 -> accept
-    9:10:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> accept
-    9:10:boolean isProgramResourceName(java.lang.String):137 -> accept
-    9:10:void accept(com.android.tools.r8.DataResourceProvider$Visitor):119 -> accept
-    11:11:boolean isProgramResourceName(java.lang.String):137:137 -> accept
-    11:11:void accept(com.android.tools.r8.DataResourceProvider$Visitor):119 -> accept
-    12:19:void accept(com.android.tools.r8.DataResourceProvider$Visitor):120:127 -> accept
-    20:39:void accept(com.android.tools.r8.DataResourceProvider$Visitor):113:132 -> accept
-    40:40:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> accept
-    40:40:void accept(com.android.tools.r8.DataResourceProvider$Visitor):132 -> accept
-    41:41:void accept(com.android.tools.r8.DataResourceProvider$Visitor):132:132 -> accept
-    42:43:void accept(com.android.tools.r8.DataResourceProvider$Visitor):128:129 -> accept
-    44:44:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> accept
-    44:44:void accept(com.android.tools.r8.DataResourceProvider$Visitor):129 -> accept
-    45:45:void accept(com.android.tools.r8.DataResourceProvider$Visitor):129:129 -> accept
+    1:15:java.util.List readArchive():54:68 -> a
+    16:27:java.util.List readArchive():67:78 -> a
+    28:36:java.util.List readArchive():74:82 -> a
+    37:66:java.util.List readArchive():60:89 -> a
+    67:67:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    67:67:java.util.List readArchive():89 -> a
+    68:72:java.util.List readArchive():89:93 -> a
+    73:103:java.util.List readArchive():56:86 -> a
+    104:104:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
+    104:104:java.util.List readArchive():86 -> a
+    105:105:java.util.List readArchive():86:86 -> a
+    106:106:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):84:84 -> a
+    1:6:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:117 -> accept
+    7:7:boolean isProgramResourceName(java.lang.String):135:135 -> accept
+    7:7:void accept(com.android.tools.r8.DataResourceProvider$Visitor):117 -> accept
+    8:9:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> accept
+    8:9:boolean isProgramResourceName(java.lang.String):135 -> accept
+    8:9:void accept(com.android.tools.r8.DataResourceProvider$Visitor):117 -> accept
+    10:10:boolean isProgramResourceName(java.lang.String):135:135 -> accept
+    10:10:void accept(com.android.tools.r8.DataResourceProvider$Visitor):117 -> accept
+    11:18:void accept(com.android.tools.r8.DataResourceProvider$Visitor):118:125 -> accept
+    19:37:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:130 -> accept
+    38:38:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> accept
+    38:38:void accept(com.android.tools.r8.DataResourceProvider$Visitor):130 -> accept
+    39:39:void accept(com.android.tools.r8.DataResourceProvider$Visitor):130:130 -> accept
+    40:41:void accept(com.android.tools.r8.DataResourceProvider$Visitor):126:127 -> accept
+    42:42:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> accept
+    42:42:void accept(com.android.tools.r8.DataResourceProvider$Visitor):127 -> accept
+    43:43:void accept(com.android.tools.r8.DataResourceProvider$Visitor):127:127 -> accept
     1:1:com.android.tools.r8.utils.ArchiveResourceProvider fromArchive(java.nio.file.Path,boolean):43:43 -> fromArchive
     2:2:com.android.tools.r8.shaking.FilteredClassPath com.android.tools.r8.shaking.FilteredClassPath.unfiltered(java.nio.file.Path):39:39 -> fromArchive
     2:2:com.android.tools.r8.utils.ArchiveResourceProvider fromArchive(java.nio.file.Path,boolean):43 -> fromArchive
@@ -62507,7 +62262,7 @@
     3:3:com.android.tools.r8.shaking.FilteredClassPath com.android.tools.r8.shaking.FilteredClassPath.unfiltered(java.nio.file.Path):39 -> fromArchive
     3:3:com.android.tools.r8.utils.ArchiveResourceProvider fromArchive(java.nio.file.Path,boolean):43 -> fromArchive
     4:4:com.android.tools.r8.utils.ArchiveResourceProvider fromArchive(java.nio.file.Path,boolean):43:43 -> fromArchive
-    1:3:java.util.Collection getProgramResources():100:102 -> getProgramResources
+    1:3:java.util.Collection getProgramResources():99:101 -> getProgramResources
 com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.utils.l:
     1:1:void <clinit>():8:8 -> <clinit>
     int intValue(boolean) -> a
@@ -62545,12 +62300,12 @@
     1:2:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):49:50 -> d
     1:1:java.lang.String toString():82:82 -> toString
 com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.utils.q:
-    java.util.Map classes -> a
+    java.util.concurrent.ConcurrentHashMap classes -> a
     java.util.concurrent.atomic.AtomicReference classProvider -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():34:34 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.utils.ClassProvider):58:58 -> <init>
-    2:7:void <init>(java.util.Map,com.android.tools.r8.utils.ClassProvider):56:61 -> <init>
+    1:1:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.utils.ClassProvider):58:58 -> <init>
+    2:7:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.utils.ClassProvider):56:61 -> <init>
     java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass) -> a
     com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass) -> a
     1:28:com.android.tools.r8.graph.DexClass get(com.android.tools.r8.graph.DexType):89:116 -> a
@@ -62611,7 +62366,7 @@
     19:19:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):105 -> a
     20:20:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):105:105 -> a
     21:23:java.util.Collection collectTypes():112:114 -> a
-    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1243:1243 -> a
+    24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.createType(java.lang.String):1223:1223 -> a
     24:24:java.util.Collection collectTypes():114 -> a
     25:25:java.util.Collection collectTypes():114:114 -> a
     1:1:java.lang.String toString():121:121 -> toString
@@ -62909,29 +62664,27 @@
     1:1:com.android.tools.r8.utils.FieldSignatureEquivalence get():28:28 -> c
     1:1:com.android.tools.r8.utils.FieldSignatureEquivalence getEquivalenceIgnoreName():32:32 -> d
 com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.utils.G:
-    boolean isAndroid -> a
-    boolean $assertionsDisabled -> b
-    1:14:void <clinit>():21:34 -> <clinit>
-    1:2:boolean isZipFile(java.nio.file.Path):61:62 -> a
-    1:2:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):101 -> a
-    3:4:boolean isJarFile(java.nio.file.Path):56:57 -> a
-    3:4:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):101 -> a
-    5:6:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):102:103 -> a
-    7:11:boolean isArchive(java.nio.file.Path):76:80 -> a
-    12:12:java.lang.String readTextFile(java.nio.file.Path,java.nio.charset.Charset):84:84 -> a
-    13:13:void writeToFile(java.nio.file.Path,java.io.OutputStream,byte[]):165:165 -> a
-    14:15:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):170:171 -> a
-    16:20:java.io.OutputStream openPathWithDefault(com.android.tools.r8.com.google.common.io.Closer,java.nio.file.Path,java.io.OutputStream,java.nio.file.OpenOption[]):129:133 -> a
-    16:20:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):172 -> a
-    21:22:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):179:180 -> a
-    23:33:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):170:180 -> a
-    34:47:java.util.zip.ZipFile createZipFile(java.io.File,java.nio.charset.Charset):194:207 -> a
-    1:6:boolean isClassFile(java.nio.file.Path):47:52 -> b
-    1:17:boolean isClassesDexFile(java.nio.file.Path):139:155 -> c
-    1:2:boolean isDexFile(java.nio.file.Path):37:38 -> d
-    1:2:boolean isVDexFile(java.nio.file.Path):42:43 -> e
-    1:2:boolean isZipFile(java.nio.file.Path):61:62 -> f
-    1:1:java.util.List readAllLines(java.nio.file.Path):88:88 -> g
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:2:boolean isZipFile(java.nio.file.Path):56:57 -> a
+    1:2:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):96 -> a
+    3:4:boolean isJarFile(java.nio.file.Path):51:52 -> a
+    3:4:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):96 -> a
+    5:6:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):97:98 -> a
+    7:11:boolean isArchive(java.nio.file.Path):71:75 -> a
+    12:12:java.lang.String readTextFile(java.nio.file.Path,java.nio.charset.Charset):79:79 -> a
+    13:13:void writeToFile(java.nio.file.Path,java.io.OutputStream,byte[]):160:160 -> a
+    14:15:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):165:166 -> a
+    16:20:java.io.OutputStream openPathWithDefault(com.android.tools.r8.com.google.common.io.Closer,java.nio.file.Path,java.io.OutputStream,java.nio.file.OpenOption[]):124:128 -> a
+    16:20:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):167 -> a
+    21:22:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):174:175 -> a
+    23:33:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):165:175 -> a
+    1:6:boolean isClassFile(java.nio.file.Path):42:47 -> b
+    1:17:boolean isClassesDexFile(java.nio.file.Path):134:150 -> c
+    1:2:boolean isDexFile(java.nio.file.Path):32:33 -> d
+    1:2:boolean isVDexFile(java.nio.file.Path):37:38 -> e
+    1:2:boolean isZipFile(java.nio.file.Path):56:57 -> f
+    1:1:java.util.List readAllLines(java.nio.file.Path):83:83 -> g
 com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.H:
     1:1:void <init>(com.android.tools.r8.shaking.FilteredClassPath):13:13 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.shaking.FilteredClassPath,java.lang.String):13:13 -> a
@@ -62985,116 +62738,114 @@
     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.O:
-    boolean invalidDebugInfoFatal -> f0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> S0
+    boolean hasMarker -> f0
     boolean passthroughDexCode -> i
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> W0
+    int callGraphCycleEliminatorMaxDepthThreshold -> K
+    boolean verbose -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
-    boolean enableRedundantFieldLoadElimination -> X
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> a1
+    boolean enableUninstantiatedTypeOptimization -> X
     boolean enableArgumentRemoval -> q
-    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> G0
-    boolean enableInliningOfInvokesWithNullableReceivers -> y
-    java.util.Set extensiveLoggingFilter -> i0
-    boolean enableNameReflectionOptimization -> G
-    boolean enableInheritanceClassInDexDistributor -> N0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> t0
+    boolean enableClassInlining -> y
+    java.util.List mainDexKeepRules -> J0
+    boolean enableTreeShakingOfLibraryMethodOverrides -> G
     boolean printMemory -> h
     java.util.Set neverMergePrefixes -> k
-    boolean debug -> J0
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> O0
-    boolean $assertionsDisabled -> f1
-    boolean ignoreMissingClasses -> E0
-    java.util.function.Consumer syntheticProguardRulesConsumer -> d1
-    boolean enableTreeShakingOfLibraryMethodOverrides -> I
+    int callGraphLikelySpuriousCallEdgeThreshold -> L
+    boolean encodeChecksums -> I
     boolean enableNeverMergePrefixes -> j
-    boolean enableTreeShaking -> A0
-    int minApiLevel -> l0
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> c1
+    boolean printCfg -> A0
     boolean enableUnusedArgumentRemoval -> r
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> Y0
-    boolean enableMainDexListCheck -> z0
-    java.util.Map missingEnclosingMembers -> P0
-    java.util.List logArgumentsFilter -> o0
-    boolean enableValuePropagation -> Y
-    java.util.List methodsFilter -> k0
-    boolean disableInliningOfLibraryMethodOverrides -> z
-    boolean enableGeneratedExtensionRegistryShrinking -> r0
-    boolean enableStringConcatenationOptimization -> H
-    boolean readCompileTimeAnnotations -> n0
-    java.util.Set reportedMissingForDesugaring -> e1
+    boolean enableMinification -> z0
+    java.util.Map warningInvalidDebugInfo -> P0
+    boolean processCovariantReturnTypeAnnotations -> v0
+    boolean enableRedundantConstNumberOptimization -> Y
+    boolean enableClassStaticizer -> z
+    boolean enableNestBasedAccessDesugaring -> r0
+    boolean enableCallSiteOptimizationInfoPropagation -> H
+    boolean enableLambdaMerging -> n0
     boolean enableHorizontalClassMerging -> o
-    int callGraphCycleEliminatorMaxDepthThreshold -> M
-    boolean ignoreMainDexMissingClasses -> g0
-    java.lang.String printCfgFile -> D0
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> T0
-    boolean useSmaliSyntax -> c0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> b1
-    boolean applyInliningToInlinee -> w
-    com.android.tools.r8.StringConsumer configurationConsumer -> X0
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> K0
-    boolean skipReadingDexCode -> S0
-    boolean enableDeterminismAnalysis -> E
+    int classInliningInstructionLimit -> M
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> T0
+    boolean quiet -> c0
+    boolean enableRedundantFieldLoadElimination -> V
+    boolean enableInliningOfInvokesWithNullableReceivers -> w
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> X0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> Y0
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> h0
+    boolean enableNameReflectionOptimization -> E
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    int callGraphLikelySpuriousCallEdgeThreshold -> N
-    boolean forceProguardCompatibility -> F0
+    boolean minimalMainDex -> K0
+    int inliningInstructionLimit -> N
+    boolean configurationDebugging -> F0
     boolean enableVerticalClassMerging -> p
-    boolean enableMinification -> B0
-    boolean enableInitializedClassesInInstanceMethodsAnalysis -> W
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> w0
+    boolean enableValuePropagation -> W
+    boolean disableInliningOfLibraryMethodOverrides -> x
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    int applyInliningToInlineeMaxDepth -> x
-    boolean enableGeneratedMessageLiteShrinking -> s0
-    boolean enableServiceLoaderRewriting -> F
+    boolean lookupLibraryBeforeProgram -> w0
+    boolean enableNestReduction -> s0
+    java.util.Map warningInvalidParameterAnnotations -> O0
+    boolean enableStringConcatenationOptimization -> F
     boolean printTimes -> g
+    boolean enableDesugaring -> o0
+    boolean intermediate -> k0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean enableDynamicTypeOptimization -> m
-    boolean verbose -> d0
-    int classInliningInstructionLimit -> O
-    java.util.function.BiPredicate dexClassChecksumFilter -> L
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> U0
+    boolean invalidDebugInfoFatal -> d0
+    int inliningInstructionAllowance -> O
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> U0
     boolean enableNonNullTracking -> u
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean enableStringSwitchConversion -> T
-    java.util.List mainDexKeepRules -> L0
-    boolean configurationDebugging -> H0
-    boolean enableInitializedClassesAnalysis -> C
-    int inliningInstructionLimit -> P
+    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> E0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> Z0
+    java.util.Set extensiveLoggingFilter -> g0
+    boolean enableInheritanceClassInDexDistributor -> L0
+    boolean debug -> H0
+    boolean enableDeterminismAnalysis -> C
+    int inliningMonitorEnterValuesAllowance -> P
+    java.util.function.Consumer syntheticProguardRulesConsumer -> b1
     boolean enableFieldBitAccessAnalysis -> n
-    int numberOfThreads -> b0
-    boolean printCfg -> C0
-    boolean enableEnumValueOptimization -> U
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> M0
+    boolean skipIR -> G0
+    boolean $assertionsDisabled -> d1
+    boolean ignoreMissingClasses -> C0
+    boolean enableInitializedClassesInInstanceMethodsAnalysis -> U
     boolean enableInlining -> v
-    boolean processCovariantReturnTypeAnnotations -> x0
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> v0
-    boolean enableNestBasedAccessDesugaring -> t0
-    java.util.Map warningInvalidDebugInfo -> R0
-    boolean enableLambdaMerging -> p0
-    boolean hasMarker -> h0
-    boolean enableSideEffectAnalysis -> D
-    int inliningInstructionAllowance -> Q
-    boolean quiet -> e0
-    boolean enableCallSiteOptimizationInfoPropagation -> J
-    boolean enableRedundantConstNumberOptimization -> a0
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> V0
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> Z0
+    int minApiLevel -> j0
+    boolean enableMainDexListCheck -> x0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> a1
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> W0
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> T
+    boolean enableGeneratedExtensionRegistryShrinking -> p0
+    java.util.List logArgumentsFilter -> m0
+    java.util.Map missingEnclosingMembers -> N0
+    boolean readCompileTimeAnnotations -> l0
+    java.util.Set reportedMissingForDesugaring -> c1
+    java.util.List methodsFilter -> i0
+    boolean enableServiceLoaderRewriting -> D
+    int inliningControlFlowResolutionBlocksThreshold -> Q
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> R0
+    boolean ignoreMainDexMissingClasses -> e0
+    boolean useSmaliSyntax -> a0
+    com.android.tools.r8.StringConsumer configurationConsumer -> V0
+    java.lang.String printCfgFile -> B0
+    boolean enableStringSwitchConversion -> R
     boolean enableUnusedInterfaceRemoval -> s
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> j0
-    boolean enableUninstantiatedTypeOptimization -> Z
-    boolean minimalMainDex -> M0
-    boolean enableClassInlining -> A
-    int inliningMonitorEnterValuesAllowance -> R
-    boolean skipIR -> I0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> I0
+    int numberOfThreads -> Z
+    boolean skipReadingDexCode -> Q0
+    java.util.function.BiPredicate dexClassChecksumFilter -> J
+    boolean enableInitializedClassesAnalysis -> A
+    boolean forceProguardCompatibility -> D0
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
-    boolean encodeChecksums -> K
     boolean libraryInterfacesMayHaveStaticInitialization -> l
-    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> V
-    boolean lookupLibraryBeforeProgram -> y0
+    boolean enableTreeShaking -> y0
+    boolean enableEnumValueOptimization -> S
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> u0
     boolean enableDevirtualization -> t
-    boolean enableNestReduction -> u0
-    java.util.Map warningInvalidParameterAnnotations -> Q0
-    boolean enableDesugaring -> q0
-    boolean intermediate -> m0
-    boolean enableClassStaticizer -> B
-    int inliningControlFlowResolutionBlocksThreshold -> S
+    boolean enableGeneratedMessageLiteShrinking -> q0
+    boolean enableSideEffectAnalysis -> B
     1:22:void <clinit>():66:87 -> <clinit>
     23:23:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():67:67 -> <clinit>
     23:23:void <clinit>():88 -> <clinit>
@@ -63102,192 +62853,192 @@
     25:25:com.android.tools.r8.utils.DexVersion com.android.tools.r8.utils.AndroidApiLevel.getDexVersion():67:67 -> <clinit>
     25:25:void <clinit>():88 -> <clinit>
     1:1:void <init>():112:112 -> <init>
-    2:525:void <init>():106:629 -> <init>
-    526:530:void <init>():113:117 -> <init>
-    531:531:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
-    532:1055:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:629 -> <init>
-    1056:1063:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
-    1064:1064:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
-    1065:1588:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:629 -> <init>
-    1589:1600:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
-    1:1:boolean isDesugaredLibraryCompilation():314:314 -> A
-    1:1:boolean isGeneratingClassFiles():335:335 -> B
-    1:1:boolean isGeneratingDexIndexed():327:327 -> C
-    1:1:boolean isGeneratingDex():323 -> C
-    2:2:boolean isGeneratingDexFilePerClassFile():331:331 -> C
-    2:2:boolean isGeneratingDex():323 -> C
-    1:1:boolean hasConsumer():298:298 -> D
-    1:1:boolean isInterfaceMethodDesugaringEnabled():1072 -> D
-    2:4:boolean isInterfaceMethodDesugaringEnabled():1075:1077 -> D
-    1:1:boolean isMinifying():430:430 -> E
-    1:1:boolean isProtoShrinkingEnabled():1085:1085 -> F
-    1:1:boolean isShrinking():426:426 -> G
-    1:1:boolean isStringSwitchConversionEnabled():1081:1081 -> H
-    1:32:boolean printWarnings():804:835 -> I
-    33:72:boolean printWarnings():831:870 -> I
-    1:4:boolean shouldDesugarNests():370:373 -> J
-    5:5:boolean isGeneratingClassFiles():335:335 -> J
-    5:5:boolean canUseNestBasedAccess():1055 -> J
-    5:5:boolean shouldDesugarNests():373 -> J
-    1:1:boolean isDesugaredLibraryCompilation():314:314 -> K
-    1:1:boolean shouldKeepStackMapTable():318 -> K
+    2:522:void <init>():106:626 -> <init>
+    523:527:void <init>():113:117 -> <init>
+    528:528:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
+    529:1049:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:626 -> <init>
+    1050:1057:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
+    1058:1058:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
+    1059:1579:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:626 -> <init>
+    1580:1591:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
+    1:1:boolean isDesugaredLibraryCompilation():311:311 -> A
+    1:1:boolean isGeneratingClassFiles():332:332 -> B
+    1:1:boolean isGeneratingDexIndexed():324:324 -> C
+    1:1:boolean isGeneratingDex():320 -> C
+    2:2:boolean isGeneratingDexFilePerClassFile():328:328 -> C
+    2:2:boolean isGeneratingDex():320 -> C
+    1:1:boolean hasConsumer():295:295 -> D
+    1:1:boolean isInterfaceMethodDesugaringEnabled():1067 -> D
+    2:4:boolean isInterfaceMethodDesugaringEnabled():1070:1072 -> D
+    1:1:boolean isMinifying():427:427 -> E
+    1:1:boolean isProtoShrinkingEnabled():1080:1080 -> F
+    1:1:boolean isShrinking():423:423 -> G
+    1:1:boolean isStringSwitchConversionEnabled():1076:1076 -> H
+    1:32:boolean printWarnings():801:832 -> I
+    33:72:boolean printWarnings():828:867 -> I
+    1:4:boolean shouldDesugarNests():367:370 -> J
+    5:5:boolean isGeneratingClassFiles():332:332 -> J
+    5:5:boolean canUseNestBasedAccess():1050 -> J
+    5:5:boolean shouldDesugarNests():370 -> J
+    1:1:boolean isDesugaredLibraryCompilation():311:311 -> K
+    1:1:boolean shouldKeepStackMapTable():315 -> K
     2:2:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> K
-    2:2:boolean shouldKeepStackMapTable():319 -> K
-    3:3:boolean shouldKeepStackMapTable():319:319 -> K
-    1:13:void signalFinishedToConsumers():351:363 -> L
-    1:1:boolean assertionsEnabled():624:624 -> M
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():491:499 -> N
-    1:9:java.util.Set getExtensiveLoggingFilter():465:473 -> O
-    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():461:461 -> P
+    2:2:boolean shouldKeepStackMapTable():316 -> K
+    3:3:boolean shouldKeepStackMapTable():316:316 -> K
+    1:13:void signalFinishedToConsumers():348:360 -> L
+    1:1:boolean assertionsEnabled():621:621 -> M
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():488:496 -> N
+    1:9:java.util.Set getExtensiveLoggingFilter():462:470 -> O
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():458:458 -> P
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:1:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273:273 -> a
-    2:8:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):281:287 -> a
-    2:8:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):276 -> a
-    9:9:boolean isGeneratingClassFiles():335:335 -> a
-    9:9:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):288 -> a
-    9:9:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):276 -> a
-    10:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):289:292 -> a
-    10:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):276 -> a
-    14:14:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632:632 -> a
-    15:15:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):654:654 -> a
-    16:17: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):748:749 -> a
+    1:1:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270:270 -> a
+    2:8:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):278:284 -> a
+    2:8:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    9:9:boolean isGeneratingClassFiles():332:332 -> a
+    9:9:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):285 -> a
+    9:9:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    10:13:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):286:289 -> a
+    10:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    14:14:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> a
+    15:15:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> a
+    16:17: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):745:746 -> a
     18:18:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    18:18: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):753 -> a
-    19:19: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):753:753 -> a
+    18:18: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):750 -> a
+    19:19: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):750:750 -> a
     20:20:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    20:20: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):754 -> a
-    21:21: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):754:754 -> a
-    22:22: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):749:749 -> a
-    23:24:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761:762 -> a
+    20:20: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):751 -> a
+    21:21: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):751:751 -> a
+    22:22: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):746:746 -> a
+    23:24:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):758:759 -> a
     25:25:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    25:25:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764 -> a
-    26:26:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764:764 -> a
+    25:25:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761 -> a
+    26:26:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761:761 -> a
     27:27:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    27:27:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):766 -> a
-    28:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):766:766 -> a
+    27:27:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763 -> a
+    28:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):763:763 -> a
     29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
+    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764 -> a
     30:30:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
-    31:31:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767:767 -> a
+    30:30:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764 -> a
+    31:31:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764:764 -> a
     32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    32:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):770 -> a
+    32:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
     33:33:java.lang.String com.android.tools.r8.graph.DexType.toDescriptorString():89:89 -> a
-    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):770 -> a
-    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):770:770 -> a
-    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762:762 -> a
-    36:39:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):775:778 -> a
-    40:44:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):783:787 -> a
-    45:51:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):792:798 -> a
-    52:52:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):793:793 -> a
+    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
+    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767:767 -> a
+    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):759:759 -> a
+    36:39:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):772:775 -> a
+    40:44:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):780:784 -> a
+    45:51:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789:795 -> a
+    52:52:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790:790 -> a
     53:53:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26:26 -> a
-    53:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):793 -> a
+    53:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790 -> a
     54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
     54:54:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable):26 -> a
-    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):793 -> a
-    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):793:793 -> a
-    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):797:797 -> a
-    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):884:889 -> a
-    63:64:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1026:1027 -> a
-    65:66:boolean canHaveArtInstanceOfVerifierBug():1361:1362 -> a
-    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643:646 -> b
+    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790 -> a
+    55:55:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790:790 -> a
+    56:56:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):794:794 -> a
+    57:62:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):881:886 -> a
+    63:64:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1021:1022 -> a
+    65:66:boolean canHaveArtInstanceOfVerifierBug():1356:1357 -> a
+    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):640:643 -> b
     5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):648 -> b
-    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):648:650 -> b
-    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):646:646 -> b
-    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632:632 -> b
-    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):644 -> b
-    11:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):670:674 -> b
-    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):654:654 -> b
-    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):675 -> b
-    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:680 -> b
+    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):645 -> b
+    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):645:647 -> b
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643:643 -> b
+    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> b
+    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):641 -> b
+    11:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):667:671 -> b
+    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> b
+    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):672 -> b
+    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:677 -> b
     19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):682 -> b
-    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):682:682 -> b
-    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):742:742 -> b
-    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):684 -> b
-    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):684:684 -> b
-    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680:680 -> b
-    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):786:786 -> b
-    25:25:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1438:1438 -> b
-    1:1:boolean isGeneratingClassFiles():335:335 -> c
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1452 -> c
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1452:1452 -> c
-    3:6:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):636:639 -> c
-    7:7:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632:632 -> c
-    7:7:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):637 -> c
-    8:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):658:660 -> c
-    11:11:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):654:654 -> c
-    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):661 -> c
-    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:665 -> c
-    13:13:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):742:742 -> c
-    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665 -> c
-    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:665 -> c
-    15:15:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):777:777 -> c
-    1:1:boolean isGeneratingClassFiles():335:335 -> d
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1108 -> d
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1108:1108 -> d
-    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):688:690 -> d
-    6:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):704:738 -> d
-    1:1:boolean isGeneratingClassFiles():335:335 -> e
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1059 -> e
-    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1059:1059 -> e
-    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):697:699 -> e
-    1:1:boolean isGeneratingClassFiles():335:335 -> f
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1098 -> f
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1098:1098 -> f
-    1:1:boolean isGeneratingClassFiles():335:335 -> g
-    1:1:boolean canUseConstantMethodHandle():1039 -> g
-    2:2:boolean canUseConstantMethodHandle():1039:1039 -> g
-    1:1:boolean isGeneratingClassFiles():335:335 -> h
-    1:1:boolean canUseConstantMethodType():1043 -> h
-    2:2:boolean canUseConstantMethodType():1043:1043 -> h
-    1:1:boolean isGeneratingClassFiles():335:335 -> i
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1051 -> i
-    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1051:1051 -> i
-    1:2:boolean canUseFilledNewArrayOfObjects():1120:1121 -> j
-    1:1:boolean isGeneratingClassFiles():335:335 -> k
-    1:1:boolean canUseInvokeCustom():1047 -> k
-    2:2:boolean canUseInvokeCustom():1047:1047 -> k
-    1:1:boolean isGeneratingClassFiles():335:335 -> l
-    1:1:boolean canUseInvokePolymorphic():1035 -> l
-    2:2:boolean canUseInvokePolymorphic():1035:1035 -> l
-    1:1:boolean isGeneratingClassFiles():335:335 -> m
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1031 -> m
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():1031:1031 -> m
-    1:2:boolean canUseMultidex():1089:1090 -> n
-    1:1:boolean isGeneratingClassFiles():335:335 -> o
-    1:1:boolean canUseNotInstruction():1156 -> o
-    2:2:boolean canUseNotInstruction():1156:1156 -> o
-    1:1:boolean isGeneratingClassFiles():335:335 -> p
-    1:1:boolean canUsePrivateInterfaceMethods():1067 -> p
-    2:2:boolean canUsePrivateInterfaceMethods():1067:1067 -> p
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1129:1130 -> q
-    1:1:boolean isGeneratingClassFiles():335:335 -> r
-    1:1:boolean canUseSuppressedExceptions():1094 -> r
-    2:2:boolean canUseSuppressedExceptions():1094:1094 -> r
-    1:1:boolean isGeneratingClassFiles():335:335 -> s
-    1:1:boolean canUseTwrCloseResourceMethod():1063 -> s
-    2:2:boolean canUseTwrCloseResourceMethod():1063:1063 -> s
+    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679 -> b
+    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:679 -> b
+    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):739:739 -> b
+    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681 -> b
+    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681:681 -> b
+    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):677:677 -> b
+    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):783:783 -> b
+    25:25:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1433:1433 -> b
+    1:1:boolean isGeneratingClassFiles():332:332 -> c
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1447 -> c
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1447:1447 -> c
+    3:6:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):633:636 -> c
+    7:7:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> c
+    7:7:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):634 -> c
+    8:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):655:657 -> c
+    11:11:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> c
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):658 -> c
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662:662 -> c
+    13:13:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):739:739 -> c
+    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662 -> c
+    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662:662 -> c
+    15:15:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):774:774 -> c
+    1:1:boolean isGeneratingClassFiles():332:332 -> d
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1103 -> d
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1103:1103 -> d
+    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):685:687 -> d
+    6:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):701:735 -> d
+    1:1:boolean isGeneratingClassFiles():332:332 -> e
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1054 -> e
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1054:1054 -> e
+    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):694:696 -> e
+    1:1:boolean isGeneratingClassFiles():332:332 -> f
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1093 -> f
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1093:1093 -> f
+    1:1:boolean isGeneratingClassFiles():332:332 -> g
+    1:1:boolean canUseConstantMethodHandle():1034 -> g
+    2:2:boolean canUseConstantMethodHandle():1034:1034 -> g
+    1:1:boolean isGeneratingClassFiles():332:332 -> h
+    1:1:boolean canUseConstantMethodType():1038 -> h
+    2:2:boolean canUseConstantMethodType():1038:1038 -> h
+    1:1:boolean isGeneratingClassFiles():332:332 -> i
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1046 -> i
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1046:1046 -> i
+    1:2:boolean canUseFilledNewArrayOfObjects():1115:1116 -> j
+    1:1:boolean isGeneratingClassFiles():332:332 -> k
+    1:1:boolean canUseInvokeCustom():1042 -> k
+    2:2:boolean canUseInvokeCustom():1042:1042 -> k
+    1:1:boolean isGeneratingClassFiles():332:332 -> l
+    1:1:boolean canUseInvokePolymorphic():1030 -> l
+    2:2:boolean canUseInvokePolymorphic():1030:1030 -> l
+    1:1:boolean isGeneratingClassFiles():332:332 -> m
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1026 -> m
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1026:1026 -> m
+    1:2:boolean canUseMultidex():1084:1085 -> n
+    1:1:boolean isGeneratingClassFiles():332:332 -> o
+    1:1:boolean canUseNotInstruction():1151 -> o
+    2:2:boolean canUseNotInstruction():1151:1151 -> o
+    1:1:boolean isGeneratingClassFiles():332:332 -> p
+    1:1:boolean canUsePrivateInterfaceMethods():1062 -> p
+    2:2:boolean canUsePrivateInterfaceMethods():1062:1062 -> p
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1124:1125 -> q
+    1:1:boolean isGeneratingClassFiles():332:332 -> r
+    1:1:boolean canUseSuppressedExceptions():1089 -> r
+    2:2:boolean canUseSuppressedExceptions():1089:1089 -> r
+    1:1:boolean isGeneratingClassFiles():332:332 -> s
+    1:1:boolean canUseTwrCloseResourceMethod():1058 -> s
+    2:2:boolean canUseTwrCloseResourceMethod():1058:1058 -> s
     1:4:void disableAllOptimizations():149:152 -> t
     1:17:void disableGlobalOptimizations():156:172 -> u
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302:302 -> v
-    2:2:boolean hasConsumer():298:298 -> v
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302 -> v
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302:302 -> v
-    4:4:boolean isGeneratingDexIndexed():327:327 -> v
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():303 -> v
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304:304 -> v
-    6:6:boolean isGeneratingDexFilePerClassFile():331:331 -> v
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():305 -> v
-    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():306:306 -> v
-    8:8:boolean isGeneratingClassFiles():335:335 -> v
-    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():307 -> v
-    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():308:310 -> v
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299:299 -> v
+    2:2:boolean hasConsumer():295:295 -> v
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299 -> v
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299:299 -> v
+    4:4:boolean isGeneratingDexIndexed():324:324 -> v
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():300 -> v
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():301:301 -> v
+    6:6:boolean isGeneratingDexFilePerClassFile():328:328 -> v
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302 -> v
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():303:303 -> v
+    8:8:boolean isGeneratingClassFiles():332:332 -> v
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304 -> v
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():305:307 -> v
     1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> w
-    1:1:boolean hasMethodsFilter():879:879 -> x
+    1:1:boolean hasMethodsFilter():876:876 -> x
     1:1:boolean hasProguardConfiguration():95:95 -> y
-    1:1:boolean hasUsageInformationConsumer():586:586 -> z
+    1:1:boolean hasUsageInformationConsumer():583:583 -> z
 com.android.tools.r8.utils.InternalOptions$AssertionProcessing -> com.android.tools.r8.utils.O$a:
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing LEAVE -> a
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing REMOVE -> b
@@ -63298,7 +63049,7 @@
     int expectedParameterCount -> b
     int actualParameterCount -> c
     com.android.tools.r8.graph.DexMethod method -> a
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):543:546 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):540:543 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.O$b:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
@@ -63309,21 +63060,21 @@
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():911:919 -> <init>
+    1:9:void <init>():908:916 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.Q:
     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>():904:908 -> <clinit>
-    6:6:void <clinit>():902:902 -> <clinit>
-    1:1:void <init>(java.lang.String,int):902:902 -> <init>
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():902:902 -> a
+    1:5:void <clinit>():901:905 -> <clinit>
+    6:6:void <clinit>():899:899 -> <clinit>
+    1:1:void <init>(java.lang.String,int):899:899 -> <init>
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():899:899 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.O$d:
     boolean invertConditionals -> m
     boolean dontCreateMarkerInD8 -> o
     boolean enableDeadSwitchCaseElimination -> i
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> J
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> G
     boolean forceRedundantConstNumberRemoval -> k
     boolean disallowLoadStoreOptimization -> u
     java.util.function.Consumer irModifier -> w
@@ -63331,18 +63082,16 @@
     com.android.tools.r8.utils.IROrdering irOrdering -> b
     boolean noLocalsTableOnInput -> s
     int basicBlockMuncherIterationLimit -> y
-    boolean verifyKeptGraphInfo -> E
+    boolean readInputStackMaps -> E
     boolean allowUnusedProguardConfigurationRules -> f
-    boolean allowOutlinerInterfaceArrayArguments -> G
     boolean alwaysUsePessimisticRegisterAllocation -> h
     boolean deterministicSortingBasedOnDexType -> A
-    boolean trackDesugaredAPIConversions -> C
+    boolean enableForceNestBasedAccessDesugaringForTest -> C
     boolean allowTypeErrors -> d
     boolean placeExceptionalBlocksLast -> n
     boolean forceJumboStringProcessing -> p
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> H
-    boolean measureProguardIfRuleEvaluations -> I
     boolean enableSwitchToIfRewriting -> j
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> I
     boolean forceAssumeNoneInsertion -> l
     boolean enableNarrowingChecksInD8 -> v
     boolean enableStatefulLambdaCreateInstanceMethod -> x
@@ -63350,26 +63099,27 @@
     byte[] forceDexVersionBytes -> a
     boolean dontReportFailingCheckDiscarded -> z
     boolean disableL8AnnotationRemoval -> e
-    boolean readInputStackMaps -> F
+    boolean allowOutlinerInterfaceArrayArguments -> F
     boolean reportUnusedProguardConfigurationRules -> g
     java.util.Set validInliningReasons -> r
+    boolean measureProguardIfRuleEvaluations -> H
     boolean addCallEdgesForLibraryInvokes -> c
     java.io.PrintStream whyAreYouNotInliningConsumer -> B
-    boolean enableForceNestBasedAccessDesugaringForTest -> D
-    1:87:void <init>():922:1008 -> <init>
+    boolean verifyKeptGraphInfo -> D
+    1:85:void <init>():919:1003 -> <init>
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.S:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():994:996 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1000:1001 -> 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):1001:1001 -> a
+    1:3:void <init>():989:991 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):995:996 -> 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):996:996 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.utils.T:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1011:1014 -> <init>
+    1:4:void <init>():1006:1009 -> <init>
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.U:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):555:557 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):552:554 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.V:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
@@ -63380,21 +63130,21 @@
     1:1:boolean isGeneratingDex():17:17 -> b
 com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.X:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):20:20 -> a
-    2:5:java.lang.Object peekNext(java.util.ListIterator):60:63 -> a
-    6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):103:115 -> a
-    1:3:java.lang.Object peekPrevious(java.util.ListIterator):53:55 -> b
-    4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):80:83 -> b
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):19:19 -> a
+    2:5:java.lang.Object peekNext(java.util.ListIterator):59:62 -> a
+    6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):92:104 -> a
+    1:3:java.lang.Object peekPrevious(java.util.ListIterator):52:54 -> b
+    4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):69:72 -> b
 com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.utils.W:
     java.util.Iterator val$iterator -> b
     java.util.function.Predicate val$predicate -> c
     java.lang.Object next -> a
-    1:3:void <init>(java.util.Iterator,java.util.function.Predicate):20:22 -> <init>
-    1:3:java.lang.Object advance():26:28 -> f
-    1:1:boolean hasNext():37:37 -> hasNext
-    1:5:java.lang.Object next():42:46 -> next
-    6:6:java.lang.Object next():44:44 -> next
+    1:3:void <init>(java.util.Iterator,java.util.function.Predicate):19:21 -> <init>
+    1:3:java.lang.Object advance():25:27 -> f
+    1:1:boolean hasNext():36:36 -> hasNext
+    1:5:java.lang.Object next():41:45 -> next
+    6:6:java.lang.Object next():43:43 -> next
 com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.Z:
     int columnCapacity -> b
     int rowCapacity -> a
@@ -63567,7 +63317,13 @@
     16:17:int access$900(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):105 -> a
 com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.h0:
     com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.j0:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.j0:
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:java.lang.Object first(java.util.List):16:16 -> a
+    2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):25:26 -> a
+    4:6:java.util.List map(java.util.Collection,java.util.function.Function):34:36 -> a
+    1:2:boolean verifyListIsOrdered(java.util.List):42:43 -> b
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.k0:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -63583,7 +63339,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.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.k0:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.utils.l0:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -63605,7 +63361,7 @@
     11:11:int doHash(java.lang.Object):15 -> a
     1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence get():30:30 -> c
     1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence getEquivalenceIgnoreName():34:34 -> d
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.l0:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.utils.m0:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     boolean ignoreName -> a
@@ -63619,14 +63375,14 @@
     7:10:int doHash(java.lang.Object):14 -> a
     1:1:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> c
     1:1:com.android.tools.r8.utils.MethodSignatureEquivalence getEquivalenceIgnoreName():32:32 -> d
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.m0:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.utils.n0:
     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.n0:
+com.android.tools.r8.utils.OneShotByteResource -> com.android.tools.r8.utils.o0:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.Set classDescriptors -> d
     boolean $assertionsDisabled -> e
@@ -63639,7 +63395,7 @@
     1:1:java.util.Set getClassDescriptors():54:54 -> getClassDescriptors
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
     1:1:com.android.tools.r8.origin.Origin getOrigin():36:36 -> getOrigin
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.o0:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.utils.p0:
     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
@@ -63647,14 +63403,14 @@
     19:19:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):41:41 -> a
     20:27:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):60:67 -> a
     1:11:java.util.List tryParseMulti(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):18:28 -> b
-com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.o0$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.utils.p0$a:
     java.lang.String[] args -> a
     int nextIndex -> b
     1:1:void <init>(java.lang.String[]):76:76 -> <init>
     2:5:void <init>(java.lang.String[]):74:77 -> <init>
     1:1:java.lang.String head():81:81 -> a
     1:5:java.lang.String next():85:89 -> b
-com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.p0:
+com.android.tools.r8.utils.OrderedMergingIterator -> com.android.tools.r8.utils.q0:
     java.util.List other -> b
     java.util.List one -> a
     int otherIndex -> d
@@ -63677,14 +63433,14 @@
     17:17:com.android.tools.r8.graph.KeyedDexItem next():44 -> next
     18:25:com.android.tools.r8.graph.KeyedDexItem next():46:53 -> next
     26:26:com.android.tools.r8.graph.KeyedDexItem next():51:51 -> next
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.q0:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.utils.r0:
     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.r0:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.utils.s0:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
@@ -63694,7 +63450,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.ProgramClassCollection -> com.android.tools.r8.utils.s0:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.utils.t0:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():24:24 -> <clinit>
@@ -63715,12 +63471,14 @@
     26:26:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):79:79 -> a
     27:27:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
     27:27:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> a
-    28:28:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80:80 -> a
-    29:31:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
-    29:31:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
+    28:28:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    28:28:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> a
+    29:29:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80:80 -> a
+    30:32:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
+    30:32:com.android.tools.r8.graph.DexProgramClass lambda$disallowClassConflictsResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():63:63 -> c
     1:1:java.lang.String toString():48:48 -> toString
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.u0:
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.utils.v0:
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.Diagnostic lastError -> c
     java.util.Collection suppressedExceptions -> d
@@ -63741,9 +63499,9 @@
     1:3:void error(com.android.tools.r8.Diagnostic):43:45 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):33:33 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):38:38 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.t0:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.utils.u0:
     1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.v0:
+com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.utils.w0:
     1:1:void <init>():11:11 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -63757,7 +63515,7 @@
     1:1:java.lang.String getDiagnosticMessage():53:53 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():43:43 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():48:48 -> getPosition
-com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.w0:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.utils.x0:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -63790,7 +63548,7 @@
     1:2:java.lang.String stripLeadingBOM(java.lang.String):279:280 -> c
     1:9:java.lang.String toASCIIString(java.lang.String):49:57 -> d
     1:9:java.lang.String trim(java.lang.String):288:296 -> e
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.w0$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.utils.x0$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
@@ -63799,7 +63557,7 @@
     1:4:void <clinit>():22:25 -> <clinit>
     5:5:void <clinit>():21:21 -> <clinit>
     1:1:void <init>(java.lang.String,int):21:21 -> <init>
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.y0:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.utils.z0:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -63808,31 +63566,31 @@
     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.x0:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.utils.y0:
     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.ThrowingBiConsumer -> com.android.tools.r8.utils.z0:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.A0:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.utils.A0:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.utils.B0:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.B0:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.C0:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.utils.C0:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.utils.D0:
     1:1:void <init>():9:9 -> <init>
     boolean hasNext() -> a
     1:4: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.D0:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.utils.E0:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.E0:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.utils.F0:
     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.F0:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.I0:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.utils.G0:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.utils.J0:
     java.util.Stack stack -> a
     boolean trackMemory -> b
     1:1:void <init>(java.lang.String):31:31 -> <init>
@@ -63865,10 +63623,10 @@
     12:12:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
     13:13:java.util.Map computeMemoryInformation():211:211 -> b
     13:13:java.util.Map access$100(com.android.tools.r8.utils.Timing):21 -> b
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.G0:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.utils.H0:
     long used -> a
     1:2:void <init>(long):43:44 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.H0:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.utils.I0:
     com.android.tools.r8.utils.Timing this$0 -> g
     java.util.Map children -> b
     java.lang.String title -> a
@@ -63915,9 +63673,9 @@
     3:3:java.lang.String com.android.tools.r8.utils.Timing.access$200(long):21 -> toString
     3:3:java.lang.String toString():96 -> toString
     4:4:java.lang.String toString():96:96 -> toString
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.J0:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.utils.K0:
     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.K0:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.utils.L0:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b

r8-master.jar

diff --git a/r8-master.jar b/r8-master.jar
index 0c8eb66..e583b08 100644
--- a/r8-master.jar
+++ b/r8-master.jar
Binary files differ

r8-master.jar.map

diff --git a/r8-master.jar.map b/r8-master.jar.map
index cb2f2cc..f06612e 100644
--- a/r8-master.jar.map
+++ b/r8-master.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 1.7.16-dev
+# compiler_version: 1.7.12-dev
 # compiler_hash: engineering
-# pg_map_id: afa5558
+# pg_map_id: bcf14ea
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.a:
     boolean $assertionsDisabled -> c
@@ -18,58 +18,58 @@
     java.util.zip.ZipFile zipFile -> b
     java.util.Set descriptors -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:1:void <init>(java.nio.file.Path):51:51 -> <init>
-    2:2:void <init>(java.nio.file.Path,java.util.function.Predicate):60:60 -> <init>
-    3:37:void <init>(java.nio.file.Path,java.util.function.Predicate):43:77 -> <init>
-    38:41:void <init>(java.nio.file.Path,java.util.function.Predicate):66:69 -> <init>
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:1:void <init>(java.nio.file.Path):50:50 -> <init>
+    2:2:void <init>(java.nio.file.Path,java.util.function.Predicate):59:59 -> <init>
+    3:37:void <init>(java.nio.file.Path,java.util.function.Predicate):42:76 -> <init>
+    38:41:void <init>(java.nio.file.Path,java.util.function.Predicate):65:68 -> <init>
     boolean lambda$new$0(java.lang.String) -> a
-    1:1:void close():112:112 -> close
-    1:2:void finalize():106:107 -> finalize
-    1:1:java.util.Set getClassDescriptors():84:84 -> getClassDescriptors
-    1:1:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):89:89 -> getProgramResource
-    2:2:java.util.zip.ZipEntry getZipEntryFromDescriptor(java.lang.String):116:116 -> getProgramResource
-    2:2:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):92 -> getProgramResource
-    3:8:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):93:98 -> getProgramResource
-    9:14:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):94:99 -> getProgramResource
-    15:22:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):93:100 -> getProgramResource
+    1:1:void close():111:111 -> close
+    1:2:void finalize():105:106 -> finalize
+    1:1:java.util.Set getClassDescriptors():83:83 -> getClassDescriptors
+    1:1:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):88:88 -> getProgramResource
+    2:2:java.util.zip.ZipEntry getZipEntryFromDescriptor(java.lang.String):115:115 -> getProgramResource
+    2:2:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):91 -> getProgramResource
+    3:8:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):92:97 -> getProgramResource
+    9:14:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):93:98 -> getProgramResource
+    15:22:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):92:99 -> getProgramResource
     23:23:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> getProgramResource
-    23:23:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):100 -> getProgramResource
-    24:24:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):100:100 -> getProgramResource
+    23:23:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):99 -> getProgramResource
+    24:24:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):99:99 -> getProgramResource
 com.android.tools.r8.ArchiveProgramResourceProvider -> com.android.tools.r8.ArchiveProgramResourceProvider:
     com.android.tools.r8.origin.Origin origin -> a
     java.util.function.Predicate include -> c
     com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier supplier -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier,java.util.function.Predicate):82:88 -> <init>
-    1:1:java.util.zip.ZipFile lambda$fromArchive$0(java.nio.file.Path):66:66 -> a
-    2:2:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):100:100 -> a
-    3:8:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):112:117 -> a
-    9:9:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):116:116 -> a
-    10:20:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):115:125 -> a
-    21:21:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):121:121 -> a
-    22:22: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
-    2:2:com.android.tools.r8.ArchiveProgramResourceProvider fromSupplier(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier,java.util.function.Predicate):78:78 -> fromSupplier
-    1:23:java.util.Collection getProgramResources():108:130 -> getProgramResources
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier,java.util.function.Predicate):81:87 -> <init>
+    1:1:java.util.zip.ZipFile lambda$fromArchive$0(java.nio.file.Path):65:65 -> a
+    2:2:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):99:99 -> a
+    3:8:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):111:116 -> a
+    9:9:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):115:115 -> a
+    10:20:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):114:124 -> a
+    21:21:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):120:120 -> a
+    22:22:void lambda$getProgramResources$1(java.util.List,java.util.List,com.android.tools.r8.origin.ArchiveEntryOrigin,java.io.InputStream):119:119 -> a
+    1:1:com.android.tools.r8.ArchiveProgramResourceProvider fromArchive(java.nio.file.Path):58:58 -> fromArchive
+    2:2:com.android.tools.r8.ArchiveProgramResourceProvider fromArchive(java.nio.file.Path,java.util.function.Predicate):63:63 -> fromArchive
+    1:1:com.android.tools.r8.ArchiveProgramResourceProvider fromSupplier(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier):71:71 -> fromSupplier
+    2:2:com.android.tools.r8.ArchiveProgramResourceProvider fromSupplier(com.android.tools.r8.origin.Origin,com.android.tools.r8.ArchiveProgramResourceProvider$ZipFileSupplier,java.util.function.Predicate):77:77 -> fromSupplier
+    1:23:java.util.Collection getProgramResources():107:129 -> getProgramResources
     24:24:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> getProgramResources
-    24:24:java.util.Collection getProgramResources():130 -> getProgramResources
-    25:32:java.util.Collection getProgramResources():130:137 -> getProgramResources
-    1:1:boolean includeClassFileEntries(java.lang.String):43:43 -> includeClassFileEntries
-    1:1:boolean includeClassFileOrDexEntries(java.lang.String):51:51 -> includeClassFileOrDexEntries
+    24:24:java.util.Collection getProgramResources():129 -> getProgramResources
+    25:32:java.util.Collection getProgramResources():129:136 -> getProgramResources
+    1:1:boolean includeClassFileEntries(java.lang.String):42:42 -> includeClassFileEntries
+    1:1:boolean includeClassFileOrDexEntries(java.lang.String):50:50 -> includeClassFileOrDexEntries
     2:3:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> includeClassFileOrDexEntries
-    2:3:boolean includeClassFileOrDexEntries(java.lang.String):51 -> includeClassFileOrDexEntries
+    2:3:boolean includeClassFileOrDexEntries(java.lang.String):50 -> includeClassFileOrDexEntries
     1:2:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> includeDexEntries
-    1:2:boolean includeDexEntries(java.lang.String):47 -> includeDexEntries
-    1:7:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):92:98 -> readArchive
-    8:12:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):96:100 -> readArchive
-    13:22:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):92:101 -> readArchive
+    1:2:boolean includeDexEntries(java.lang.String):46 -> includeDexEntries
+    1:7:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):91:97 -> readArchive
+    8:12:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):95:99 -> readArchive
+    13:22:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):91:100 -> readArchive
     23:23:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> readArchive
-    23:23:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):101 -> readArchive
-    24:24:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):101:101 -> readArchive
+    23:23:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):100 -> readArchive
+    24:24:void readArchive(com.android.tools.r8.ArchiveProgramResourceProvider$ArchiveEntryConsumer):100:100 -> readArchive
 com.android.tools.r8.BaseCommand -> com.android.tools.r8.BaseCommand:
     com.android.tools.r8.utils.AndroidApp app -> c
     boolean printHelp -> a
@@ -92,60 +92,62 @@
     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.Reporter getReporter():162:162 -> 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 setIgnoreDexInArchive(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
+    2:2:void lambda$addClasspathFiles$5(java.nio.file.Path[]):218:218 -> a
+    3:3:void lambda$addClasspathFiles$6(java.util.Collection):224:224 -> a
+    4:4:void addClasspathFile(java.nio.file.Path):229:229 -> a
+    5:5:void lambda$addClasspathResourceProvider$8(com.android.tools.r8.ClassFileResourceProvider):234:234 -> a
+    6:6:void lambda$addClassProgramData$9(byte[],com.android.tools.r8.origin.Origin):240:240 -> a
+    7:7:void lambda$addMainDexClasses$13(java.lang.String[]):297:297 -> a
+    8:8:void setIgnoreDexInArchive(boolean):352:352 -> a
+    9:11:void guard(java.lang.Runnable):366:368 -> a
+    1:2:com.android.tools.r8.BaseCommand$Builder addClassProgramData(byte[],com.android.tools.r8.origin.Origin):240:241 -> addClassProgramData
+    1:2:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.nio.file.Path[]):218:219 -> addClasspathFiles
+    3:4:com.android.tools.r8.BaseCommand$Builder addClasspathFiles(java.util.Collection):224:225 -> addClasspathFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addClasspathResourceProvider(com.android.tools.r8.ClassFileResourceProvider):234:235 -> addClasspathResourceProvider
+    1:2:com.android.tools.r8.BaseCommand$Builder addDexProgramData(byte[],com.android.tools.r8.origin.Origin):246:247 -> addDexProgramData
+    1:2:com.android.tools.r8.BaseCommand$Builder addLibraryFiles(java.nio.file.Path[]):196:197 -> addLibraryFiles
+    3:14:com.android.tools.r8.BaseCommand$Builder addLibraryFiles(java.util.Collection):202:213 -> addLibraryFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):190:191 -> addLibraryResourceProvider
+    1:2:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.lang.String[]):297:298 -> addMainDexClasses
+    3:4:com.android.tools.r8.BaseCommand$Builder addMainDexClasses(java.util.Collection):310:311 -> addMainDexClasses
+    1:9:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.nio.file.Path[]):260:268 -> addMainDexListFiles
+    10:18:com.android.tools.r8.BaseCommand$Builder addMainDexListFiles(java.util.Collection):277:285 -> 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
+    3:15:com.android.tools.r8.BaseCommand$Builder addProgramFiles(java.util.Collection):167:179 -> addProgramFiles
+    1:2:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):184:185 -> addProgramResourceProvider
     com.android.tools.r8.BaseCommand makeCommand() -> b
-    1:1:void lambda$addLibraryResourceProvider$1(com.android.tools.r8.ClassFileResourceProvider):189:189 -> b
-    2:6:void lambda$addLibraryFiles$2(java.util.Collection):203:207 -> b
-    7:7:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):358:358 -> b
-    7:7:void lambda$addLibraryFiles$2(java.util.Collection):207 -> b
-    8:8:void lambda$addClasspathFile$5(java.nio.file.Path):227:227 -> b
-    9:9:void lambda$addDexProgramData$8(byte[],com.android.tools.r8.origin.Origin):244:244 -> b
-    10:10:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):260:260 -> b
-    11:11:com.android.tools.r8.utils.AndroidApp$Builder com.android.tools.r8.utils.AndroidApp$Builder.addMainDexListFiles(java.nio.file.Path[]):628:628 -> b
-    11:11:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):260 -> b
-    12:13:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):262:263 -> b
-    14:14:void lambda$addMainDexListFiles$9(java.nio.file.Path[]):262:262 -> b
-    15:15:void lambda$setIgnoreDexInArchive$13(boolean):350:350 -> b
+    1:1:void lambda$addLibraryResourceProvider$2(com.android.tools.r8.ClassFileResourceProvider):190:190 -> b
+    2:2:void lambda$addLibraryFiles$4(java.util.Collection):204:204 -> b
+    3:3:void lambda$addClasspathFile$7(java.nio.file.Path):229:229 -> b
+    4:4:void lambda$addDexProgramData$10(byte[],com.android.tools.r8.origin.Origin):246:246 -> b
+    5:5:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):262:262 -> b
+    6:6:com.android.tools.r8.utils.AndroidApp$Builder com.android.tools.r8.utils.AndroidApp$Builder.addMainDexListFiles(java.nio.file.Path[]):628:628 -> b
+    6:6:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):262 -> b
+    7:8:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):264:265 -> b
+    9:9:void lambda$addMainDexListFiles$11(java.nio.file.Path[]):264:264 -> b
+    10:10:void lambda$setIgnoreDexInArchive$15(boolean):352:352 -> b
     1:6:com.android.tools.r8.BaseCommand build():138:143 -> build
     com.android.tools.r8.BaseCommand$Builder self() -> c
-    1:1:void lambda$addMainDexClasses$12(java.util.Collection):308:308 -> c
+    1:3:void lambda$addLibraryFiles$3(java.nio.file.Path):207:209 -> c
+    4:4:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):360:360 -> c
+    4:4:void lambda$addLibraryFiles$3(java.nio.file.Path):209 -> c
+    5:5:void lambda$addMainDexClasses$14(java.util.Collection):310:310 -> c
     void validate() -> 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: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
+    1:4:void lambda$addProgramFiles$0(java.nio.file.Path):172:175 -> d
+    5:5:void error(com.android.tools.r8.origin.Origin,java.lang.Throwable):360:360 -> d
+    5:5:void lambda$addProgramFiles$0(java.nio.file.Path):175 -> d
+    6:9:void lambda$addMainDexListFiles$12(java.util.Collection):279:282 -> d
+    10:10:void lambda$addMainDexListFiles$12(java.util.Collection):281:281 -> d
+    1:1:void lambda$addProgramFiles$1(java.util.Collection):169:169 -> e
+    1:1:void error(com.android.tools.r8.Diagnostic):338:338 -> error
+    1:1:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):347:347 -> fatalError
     2:4:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> fatalError
-    2:4:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):345 -> fatalError
+    2:4:java.lang.RuntimeException fatalError(com.android.tools.r8.Diagnostic):347 -> fatalError
     1:1:com.android.tools.r8.utils.AndroidApp$Builder getAppBuilder():152:152 -> getAppBuilder
-    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:1:boolean isPrintHelp():316:316 -> isPrintHelp
+    1:1:boolean isPrintVersion():327:327 -> isPrintVersion
+    1:2:com.android.tools.r8.BaseCommand$Builder setPrintHelp(boolean):321:322 -> setPrintHelp
+    1:2:com.android.tools.r8.BaseCommand$Builder setPrintVersion(boolean):332:333 -> 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>
@@ -332,13 +334,13 @@
     16:16:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):187:187 -> a
     17:17:void lambda$run$4(java.lang.String):197:197 -> a
     18:20: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):244:246 -> a
-    21:21: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):362:362 -> a
+    21:21: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):358:358 -> a
     21:21:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):246 -> a
     22:26: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):247:251 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):102:102 -> b
     1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141:143 -> c
     1:27:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150:176 -> d
-    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):358:358 -> d
+    28:28:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):354:354 -> d
     28:28:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):176 -> d
     29:39:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):177:187 -> d
     40:44:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):183:187 -> d
@@ -973,15 +975,15 @@
     2:2:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):50:50 -> a
     2:2: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):87 -> a
     3:10:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.D8Command,com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):93:100 -> a
-    11:38:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):106:133 -> a
-    11:38:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    39:39:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():347:347 -> a
-    39:39:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):135 -> a
-    39:39:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    40:48:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):135:143 -> a
-    40:48:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
-    49:54:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):138:143 -> a
-    49:54:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    11:42:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):106:137 -> a
+    11:42:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    43:43:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():344:344 -> a
+    43:43:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139 -> a
+    43:43:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    44:52:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):139:147 -> a
+    44:52:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
+    53:82:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):118:147 -> a
+    53:82:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):90 -> a
     1:5:void run(com.android.tools.r8.L8Command):43:47 -> run
     6:6:void run(com.android.tools.r8.L8Command):42:42 -> run
     7:11:void run(com.android.tools.r8.L8Command,java.util.concurrent.ExecutorService):59:63 -> run
@@ -1201,10 +1203,10 @@
     3:3:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> runForTesting
     3:3:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):226 -> runForTesting
     1:2:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):193:194 -> writeApplication
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> writeApplication
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> writeApplication
     3:3:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):195 -> writeApplication
     4:4:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):196:196 -> writeApplication
-    5:5:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():347:347 -> writeApplication
+    5:5:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():344:344 -> writeApplication
     5: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.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198 -> writeApplication
     6:20:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):198:212 -> writeApplication
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
@@ -1245,7 +1247,7 @@
     65:75:com.android.tools.r8.utils.InternalOptions getInternalOptions():826:836 -> getInternalOptions
     76:86:com.android.tools.r8.utils.InternalOptions getInternalOptions():833:843 -> getInternalOptions
     87:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():840:857 -> getInternalOptions
-    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> getInternalOptions
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> getInternalOptions
     105:105:com.android.tools.r8.utils.InternalOptions getInternalOptions():858 -> getInternalOptions
     106:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():859:873 -> getInternalOptions
     1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):663:663 -> parse
@@ -2061,12 +2063,12 @@
 com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.s.e:
     com.android.tools.r8.ir.code.Phi phi -> r
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
-    boolean isConstant() -> E
-    boolean needsRegister() -> R
+    boolean isConstant() -> D
+    boolean needsRegister() -> Q
     1:1:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26:26 -> a
     2:2:int com.android.tools.r8.cf.CfRegisterAllocator.getRegisterForValue(com.android.tools.r8.ir.code.Value,int):128:128 -> a
     2:2:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26 -> a
-    1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> c0
+    1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> b0
     1:1:java.lang.String toString():45:45 -> toString
 com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.s.g:
     com.android.tools.r8.graph.AppView appView -> a
@@ -2621,9 +2623,9 @@
     18:18:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):74:74 -> a
     19:19:void print(com.android.tools.r8.cf.CfPrinter):69:69 -> 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):89:93 -> a
-    25:25: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):1294:1294 -> a
+    25:25: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):1290:1290 -> 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):93 -> a
-    26:28: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):1292:1294 -> a
+    26:28: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):1288:1290 -> a
     26:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):93 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):102 -> a
@@ -2746,7 +2748,7 @@
     14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):61:61 -> a
     15:15:void print(com.android.tools.r8.cf.CfPrinter):66:66 -> 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):79:81 -> a
-    19:19:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    19:19:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     19:19:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):81 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():207:207 -> a
     20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):95 -> a
@@ -2973,35 +2975,35 @@
     159:174:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):183:198 -> a
     175:184:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):290:299 -> a
     175:184:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    185:185:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    185:185:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     185:185:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):299 -> a
     185:185:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     186:186:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):301:301 -> a
     186:186:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    187:187:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    187:187:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     187:187:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):301 -> a
     187:187:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     188:188:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):303:303 -> a
     188:188:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    189:189:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    189:189:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     189:189:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):303 -> a
     189:189:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     190:190:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):305:305 -> a
     190:190:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    191:191:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    191:191:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     191:191:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):305 -> a
     191:191:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     192:192:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):307:307 -> 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):203 -> a
-    193:193:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    193:193:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     193:193:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):307 -> a
     193:193:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     194:194:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):309:309 -> a
     194:194:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    195:195:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    195:195:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     195:195:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):309 -> a
     195:195:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
-    196:196:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    196:196:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     196:196:void dup2x2(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):299 -> a
     196:196:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):203 -> a
     197:197:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):199:199 -> a
@@ -3020,65 +3022,65 @@
     204:204:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):191:191 -> a
     205:213:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):154:162 -> a
     214:216:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):142:144 -> a
-    217:217:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    217:217:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     217:217:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):144 -> a
     218:219:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):146:147 -> a
-    220:220:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    220:220:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> 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):147 -> 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):148:148 -> a
-    222:222:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    222:222:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> 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):148 -> a
-    223:223:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    223:223:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     223:223:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):147 -> a
     224:232:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):128:136 -> a
     233:237:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):119:123 -> a
     238:240:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112:114 -> a
-    241:241:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    241:241:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     241:241:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):114 -> a
     242:245:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):103:106 -> a
     246:247:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):97:98 -> a
     248:253:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):226:231 -> a
-    254:254:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    254:254:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     254:254:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):231 -> a
     255:255:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):233:233 -> a
-    256:256:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    256:256:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     256:256:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):233 -> a
     257:257:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):235:235 -> a
-    258:258:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    258:258:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     258:258:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):235 -> a
-    259:259:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    259:259:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     259:259:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):231 -> a
     260:266: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):243:249 -> a
-    267:267:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    267:267:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     267:267: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):249 -> a
     268:268: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):251:251 -> a
-    269:269:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    269:269:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     269:269: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):251 -> a
     270:270: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):253:253 -> a
-    271:271:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    271:271:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     271:271: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):253 -> a
     272:272: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):255:255 -> a
-    273:273:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    273:273:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     273:273: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):255 -> a
-    274:274:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    274:274:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     274:274: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):249 -> a
     275:275:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):323:323 -> 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):262:269 -> b
-    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    9:9:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     9:9:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):269 -> b
     10:10: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):271:271 -> b
-    11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    11:11:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     11:11: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):271 -> b
     12:12: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):273:273 -> b
-    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    13:13:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     13:13: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):273 -> b
     14:14: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):275:275 -> b
-    15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    15:15:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     15:15: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):275 -> b
     16:16:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):277:277 -> b
-    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    17:17:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     17:17:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):277 -> b
-    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> b
+    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> b
     18:18:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):269 -> b
     boolean emitsIR() -> f
     1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():89:89 -> q
@@ -3107,7 +3109,7 @@
     14:14:void write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):61:61 -> a
     15:15:void print(com.android.tools.r8.cf.CfPrinter):66:66 -> 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):79:80 -> a
-    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1198:1198 -> a
+    18:18:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():259:259 -> a
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.AppView):94 -> a
@@ -5483,7 +5485,7 @@
     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[]):1428:1444 -> a
+    3:19:void com.android.tools.r8.ir.conversion.IRBuilder.addInvokeCustomRegisters(com.android.tools.r8.graph.DexCallSite,int,int[]):1424:1440 -> 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
@@ -5890,7 +5892,7 @@
     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):1198:1198 -> a
+    4:4:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     4:4: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() -> h
@@ -5903,7 +5905,7 @@
     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):1198:1198 -> a
+    4:4:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     4:4: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() -> h
@@ -5920,7 +5922,7 @@
     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):1198:1198 -> a
+    6:6:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1194:1194 -> a
     6:6: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() -> h
@@ -7131,23 +7133,35 @@
     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.t.a.a.a.o:
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.t.a.a.a.u:
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher whitespace():134:134 -> <clinit>
     1:1:void <clinit>():272 -> <clinit>
-    2:2:com.android.tools.r8.com.google.common.base.CharMatcher ascii():154:154 -> <clinit>
-    2:2:void <clinit>():294 -> <clinit>
-    3:3:com.android.tools.r8.com.google.common.base.CharMatcher digit():165:165 -> <clinit>
-    3:3:void <clinit>():306 -> <clinit>
-    4:4:com.android.tools.r8.com.google.common.base.CharMatcher javaIsoControl():227:227 -> <clinit>
-    4:4:void <clinit>():369 -> <clinit>
-    5:5:com.android.tools.r8.com.google.common.base.CharMatcher invisible():238:238 -> <clinit>
-    5:5:void <clinit>():380 -> <clinit>
-    6:6:com.android.tools.r8.com.google.common.base.CharMatcher singleWidth():252:252 -> <clinit>
-    6:6:void <clinit>():394 -> <clinit>
-    7:7:com.android.tools.r8.com.google.common.base.CharMatcher any():108:108 -> <clinit>
-    7:7:void <clinit>():403 -> <clinit>
-    8:8:com.android.tools.r8.com.google.common.base.CharMatcher none():117:117 -> <clinit>
-    8:8:void <clinit>():412 -> <clinit>
+    2:2:com.android.tools.r8.com.google.common.base.CharMatcher breakingWhitespace():145:145 -> <clinit>
+    2:2:void <clinit>():284 -> <clinit>
+    3:3:com.android.tools.r8.com.google.common.base.CharMatcher ascii():154:154 -> <clinit>
+    3:3:void <clinit>():294 -> <clinit>
+    4:4:com.android.tools.r8.com.google.common.base.CharMatcher digit():165:165 -> <clinit>
+    4:4:void <clinit>():306 -> <clinit>
+    5:5:com.android.tools.r8.com.google.common.base.CharMatcher javaDigit():176:176 -> <clinit>
+    5:5:void <clinit>():317 -> <clinit>
+    6:6:com.android.tools.r8.com.google.common.base.CharMatcher javaLetter():187:187 -> <clinit>
+    6:6:void <clinit>():329 -> <clinit>
+    7:7:com.android.tools.r8.com.google.common.base.CharMatcher javaLetterOrDigit():197:197 -> <clinit>
+    7:7:void <clinit>():339 -> <clinit>
+    8:8:com.android.tools.r8.com.google.common.base.CharMatcher javaUpperCase():207:207 -> <clinit>
+    8:8:void <clinit>():349 -> <clinit>
+    9:9:com.android.tools.r8.com.google.common.base.CharMatcher javaLowerCase():217:217 -> <clinit>
+    9:9:void <clinit>():359 -> <clinit>
+    10:10:com.android.tools.r8.com.google.common.base.CharMatcher javaIsoControl():227:227 -> <clinit>
+    10:10:void <clinit>():369 -> <clinit>
+    11:11:com.android.tools.r8.com.google.common.base.CharMatcher invisible():238:238 -> <clinit>
+    11:11:void <clinit>():380 -> <clinit>
+    12:12:com.android.tools.r8.com.google.common.base.CharMatcher singleWidth():252:252 -> <clinit>
+    12:12:void <clinit>():394 -> <clinit>
+    13:13:com.android.tools.r8.com.google.common.base.CharMatcher any():108:108 -> <clinit>
+    13:13:void <clinit>():403 -> <clinit>
+    14:14:com.android.tools.r8.com.google.common.base.CharMatcher none():117:117 -> <clinit>
+    14:14:void <clinit>():412 -> <clinit>
     1:1:void <init>():484:484 -> <init>
     boolean matches(char) -> a
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher ascii():154:154 -> a
@@ -7172,22 +7186,82 @@
     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.t.a.a.a.e:
+com.android.tools.r8.com.google.common.base.CharMatcher$BreakingWhitespace -> com.android.tools.r8.t.a.a.a.e:
+    com.android.tools.r8.com.google.common.base.CharMatcher INSTANCE -> a
+    1:1:void <clinit>():1351:1351 -> <clinit>
+    1:1:void <init>():1349:1349 -> <init>
+    boolean matches(char) -> a
+    1:1:boolean apply(java.lang.Object):1349:1349 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1349 -> apply
+    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():1349 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.t.a.a.a.f:
     com.android.tools.r8.com.google.common.base.CharMatcher$Digit INSTANCE -> d
     1:1:void <clinit>():1455:1455 -> <clinit>
     1:1:void <init>():1458:1458 -> <init>
     1:3:char[] nines():1448:1450 -> c
     1:1:char[] zeroes():1444:1444 -> d
-com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.t.a.a.a.f:
+com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.t.a.a.a.g:
     com.android.tools.r8.com.google.common.base.CharMatcher$Invisible INSTANCE -> d
     1:1:void <clinit>():1567:1567 -> <clinit>
     1:1:void <init>():1570:1570 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.t.a.a.a.g:
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaDigit -> com.android.tools.r8.t.a.a.a.h:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaDigit INSTANCE -> a
+    1:1:void <clinit>():1465:1465 -> <clinit>
+    1:1:void <init>():1463:1463 -> <init>
+    1:1:boolean matches(char):1469:1469 -> a
+    1:1:boolean apply(java.lang.Object):1463:1463 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1463 -> apply
+    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():1463 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.t.a.a.a.i:
     com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl INSTANCE -> b
     1:1:void <clinit>():1545:1545 -> <clinit>
     1:1:void <init>():1548:1548 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.t.a.a.a.h:
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaLetter -> com.android.tools.r8.t.a.a.a.j:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaLetter INSTANCE -> a
+    1:1:void <clinit>():1481:1481 -> <clinit>
+    1:1:void <init>():1479:1479 -> <init>
+    1:1:boolean matches(char):1485:1485 -> a
+    1:1:boolean apply(java.lang.Object):1479:1479 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1479 -> apply
+    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():1479 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaLetterOrDigit -> com.android.tools.r8.t.a.a.a.k:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaLetterOrDigit INSTANCE -> a
+    1:1:void <clinit>():1497:1497 -> <clinit>
+    1:1:void <init>():1495:1495 -> <init>
+    1:1:boolean matches(char):1501:1501 -> a
+    1:1:boolean apply(java.lang.Object):1495:1495 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1495 -> apply
+    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():1495 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaLowerCase -> com.android.tools.r8.t.a.a.a.l:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaLowerCase INSTANCE -> a
+    1:1:void <clinit>():1529:1529 -> <clinit>
+    1:1:void <init>():1527:1527 -> <init>
+    1:1:boolean matches(char):1533:1533 -> a
+    1:1:boolean apply(java.lang.Object):1527:1527 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1527 -> apply
+    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():1527 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaUpperCase -> com.android.tools.r8.t.a.a.a.m:
+    com.android.tools.r8.com.google.common.base.CharMatcher$JavaUpperCase INSTANCE -> a
+    1:1:void <clinit>():1513:1513 -> <clinit>
+    1:1:void <init>():1511:1511 -> <init>
+    1:1:boolean matches(char):1517:1517 -> a
+    1:1:boolean apply(java.lang.Object):1511:1511 -> apply
+    2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher.apply(java.lang.Character):1018:1018 -> apply
+    2:2:boolean apply(java.lang.Object):1511 -> apply
+    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():1511 -> negate
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.t.a.a.a.n:
     java.lang.String description -> a
     1:1:void com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.<init>():1047:1047 -> <init>
     1:1:void <init>(java.lang.String):1065 -> <init>
@@ -7202,7 +7276,7 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():1056:1056 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():0 -> negate
     1:1:java.lang.String toString():1071:1071 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.t.a.a.a.i:
+com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.t.a.a.a.o:
     com.android.tools.r8.com.google.common.base.CharMatcher original -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1594:1595 -> <init>
     1:1:boolean matches(char):1600:1600 -> a
@@ -7213,9 +7287,9 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1629:1629 -> negate
     2:2:java.util.function.Predicate negate():1590 -> negate
     1:1:java.lang.String toString():1634:1634 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.t.a.a.a.j:
+com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.t.a.a.a.p:
     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.t.a.a.a.k:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.t.a.a.a.q:
     com.android.tools.r8.com.google.common.base.CharMatcher$None INSTANCE -> b
     1:1:void <clinit>():1216:1216 -> <clinit>
     1:1:void <init>():1219:1219 -> <init>
@@ -7225,7 +7299,7 @@
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():108:108 -> negate
     2:2:com.android.tools.r8.com.google.common.base.CharMatcher negate():1312 -> negate
     2:2:java.util.function.Predicate negate():1214 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.t.a.a.a.l:
+com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.t.a.a.a.r:
     char[] rangeStarts -> b
     char[] rangeEnds -> c
     java.lang.String description -> a
@@ -7237,24 +7311,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.t.a.a.a.m:
+com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.t.a.a.a.s:
     com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth INSTANCE -> d
     1:1:void <clinit>():1577:1577 -> <clinit>
     1:2:void <init>():1582:1583 -> <init>
     3:3:void <init>():1580:1580 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.t.a.a.a.n:
+com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.t.a.a.a.t:
     com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace INSTANCE -> c
     int SHIFT -> b
     1:3:void <clinit>():1326:1328 -> <clinit>
     1:1:void <init>():1331:1331 -> <init>
     1:1:boolean matches(char):1336:1336 -> a
-com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.t.a.a.a.p:
+com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.t.a.a.a.v:
     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.t.a.a.a.q:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.t.a.a.a.w:
     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.t.a.a.a.v:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.t.a.a.a.B:
     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
@@ -7265,14 +7339,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.t.a.a.a.r:
-com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.t.a.a.a.s:
+com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.t.a.a.a.x:
+com.android.tools.r8.com.google.common.base.Equivalence$Equals -> com.android.tools.r8.t.a.a.a.y:
     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.t.a.a.a.t:
+com.android.tools.r8.com.google.common.base.Equivalence$EquivalentToPredicate -> com.android.tools.r8.t.a.a.a.z:
     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>
@@ -7282,12 +7356,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.t.a.a.a.u:
+com.android.tools.r8.com.google.common.base.Equivalence$Identity -> com.android.tools.r8.t.a.a.a.A:
     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.t.a.a.a.v$a:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.t.a.a.a.B$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>
@@ -7296,8 +7370,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.t.a.a.a.w:
-com.android.tools.r8.com.google.common.base.FunctionalEquivalence -> com.android.tools.r8.t.a.a.a.x:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.t.a.a.a.C:
+com.android.tools.r8.com.google.common.base.FunctionalEquivalence -> com.android.tools.r8.t.a.a.a.D:
     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>
@@ -7308,19 +7382,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.t.a.a.a.z:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.t.a.a.a.F:
     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.t.a.a.a.y:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.t.a.a.a.E:
     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.t.a.a.a.D:
+com.android.tools.r8.com.google.common.base.MoreObjects -> com.android.tools.r8.t.a.a.a.J:
     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$ObjectPredicate.withNarrowedType():0:0 -> a
     2:2:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.alwaysFalse():62 -> a
@@ -7387,8 +7461,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.t.a.a.a.A:
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.t.a.a.a.C:
+com.android.tools.r8.com.google.common.base.MoreObjects$1 -> com.android.tools.r8.t.a.a.a.G:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper -> com.android.tools.r8.t.a.a.a.I:
     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
@@ -7405,18 +7479,18 @@
     5:5:com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper addHolder(java.lang.String,java.lang.Object):372 -> b
     1:20:java.lang.String toString():331:350 -> toString
     21:39:java.lang.String toString():336:354 -> toString
-com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> com.android.tools.r8.t.a.a.a.B:
+com.android.tools.r8.com.google.common.base.MoreObjects$ToStringHelper$ValueHolder -> com.android.tools.r8.t.a.a.a.H:
     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.t.a.a.a.E:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.t.a.a.a.K:
     1:1:void <init>():150:150 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional com.android.tools.r8.com.google.common.base.Absent.withType():33:33 -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional absent():93 -> a
-com.android.tools.r8.com.google.common.base.PairwiseEquivalence -> com.android.tools.r8.t.a.a.a.F:
+com.android.tools.r8.com.google.common.base.PairwiseEquivalence -> com.android.tools.r8.t.a.a.a.L:
     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
@@ -7428,7 +7502,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.t.a.a.a.I:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.t.a.a.a.O:
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> b
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():35:35 -> <clinit>
@@ -7448,21 +7522,21 @@
     2:2:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66 -> a
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     3:3:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):65 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.t.a.a.a.G:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.t.a.a.a.H:
+com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.t.a.a.a.M:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.t.a.a.a.N:
     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.t.a.a.a.J:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.t.a.a.a.P:
     1:1:boolean test(java.lang.Object):80:80 -> test
-com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.t.a.a.a.K:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.t.a.a.a.L:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.t.a.a.a.Q:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.t.a.a.a.S:
     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.t.a.a.a.Q:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.t.a.a.a.X:
     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
@@ -7470,15 +7544,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.t.a.a.a.M:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.t.a.a.a.T:
     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.t.a.a.a.N:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.t.a.a.a.U:
     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.t.a.a.a.O:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.t.a.a.a.V:
     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.t.a.a.a.P:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.t.a.a.a.W:
     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.t.a.a.a.S:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.t.a.a.a.Y:
     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>
@@ -7489,7 +7563,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.t.a.a.a.U:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.t.a.a.a.a0:
     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
@@ -7502,24 +7576,24 @@
     10:10:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> a
     10:10:com.android.tools.r8.com.google.common.base.Splitter on(com.android.tools.r8.com.google.common.base.CommonPattern):218 -> a
     10:10:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.t.a.a.a.T:
+com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.t.a.a.a.Z:
     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.t.a.a.a.V:
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.t.a.a.a.W:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.t.a.a.a.b0:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.t.a.a.a.c0:
     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.t.a.a.a.X:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.t.a.a.a.d0:
     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.t.a.a.a.Y:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.t.a.a.a.e0:
     java.lang.Object jla -> a
     1:3:java.lang.Object getJLA():482:484 -> <clinit>
     1:3:void <clinit>():452 -> <clinit>
@@ -8223,7 +8297,8 @@
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.BiMap inverse() -> i
 com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.t.a.a.b.q:
-    java.util.stream.Collector TO_IMMUTABLE_SET -> a
+    java.util.stream.Collector TO_IMMUTABLE_SET -> b
+    java.util.stream.Collector TO_IMMUTABLE_LIST -> a
     1:25:void <clinit>():44:68 -> <clinit>
     1:1:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):60:60 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
@@ -9089,33 +9164,31 @@
     1:1:void <init>():483:483 -> <init>
     1:1:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):80:80 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):132:132 -> a
-    3:3:com.android.tools.r8.com.google.common.collect.RegularImmutableMap com.android.tools.r8.com.google.common.collect.RegularImmutableMap.fromEntries(java.util.Map$Entry[]):54:54 -> a
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object):132 -> a
-    4:4:void checkNoConflict(boolean,java.lang.String,java.util.Map$Entry,java.util.Map$Entry):190:190 -> a
-    5:13:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):392:400 -> a
-    14:18:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOfEnumMap(java.util.EnumMap):436:440 -> a
-    14:18:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):400 -> a
-    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403:403 -> a
-    20:20:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418:418 -> a
-    20:20:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    21:23:java.util.Collection com.android.tools.r8.com.google.common.collect.Iterables.castOrCopyToCollection(java.lang.Iterable):318:320 -> a
-    21:23:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):297 -> a
-    21:23:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418 -> a
-    21:23:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    24:24:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):298:298 -> a
-    24:24:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418 -> a
-    24:24:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    25:37:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418:430 -> a
-    25:37:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    38:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):423:424 -> a
-    38:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    40:40:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):73:73 -> a
-    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object):123 -> a
-    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):424 -> a
+    3:3:void checkNoConflict(boolean,java.lang.String,java.util.Map$Entry,java.util.Map$Entry):190:190 -> a
+    4:12:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):392:400 -> a
+    13:17:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOfEnumMap(java.util.EnumMap):436:440 -> a
+    13:17:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):400 -> a
+    18:18:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403:403 -> a
+    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418:418 -> a
+    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    20:22:java.util.Collection com.android.tools.r8.com.google.common.collect.Iterables.castOrCopyToCollection(java.lang.Iterable):318:320 -> a
+    20:22:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):297 -> a
+    20:22:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418 -> a
+    20:22:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    23:23:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable,java.lang.Object[]):298:298 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    24:36:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):418:430 -> a
+    24:36:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    37:38:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):423:424 -> a
+    37:38:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):73:73 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object):123 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):424 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
+    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap of():113:113 -> a
+    40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):421 -> a
     40:40:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
-    41:41:com.android.tools.r8.com.google.common.collect.ImmutableMap of():113:113 -> a
-    41:41:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.lang.Iterable):421 -> a
-    41:41:com.android.tools.r8.com.google.common.collect.ImmutableMap copyOf(java.util.Map):403 -> a
     1:2:java.util.Map$Entry entryOf(java.lang.Object,java.lang.Object):175:176 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of(java.lang.Object,java.lang.Object):73:73 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap of(java.lang.Object,java.lang.Object):123 -> c
@@ -10410,6 +10483,7 @@
     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$StrongValueEntry -> com.android.tools.r8.t.a.a.b.m1:
 com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$ValueIterator -> com.android.tools.r8.t.a.a.b.Y0$f:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap):2656:2656 -> <init>
     1:1:java.lang.Object next():2660:2660 -> next
@@ -10425,7 +10499,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.t.a.a.b.n1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry -> com.android.tools.r8.t.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>
@@ -10437,7 +10511,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.t.a.a.b.m1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueEntry$Helper -> com.android.tools.r8.t.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>
@@ -10457,7 +10531,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.t.a.a.b.o1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyStrongValueSegment -> com.android.tools.r8.t.a.a.b.p1:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2149:2149 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2142:2142 -> <init>
@@ -10465,7 +10539,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.t.a.a.b.q1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry -> com.android.tools.r8.t.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>
@@ -10476,7 +10550,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.t.a.a.b.p1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper -> com.android.tools.r8.t.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>
@@ -10496,7 +10570,7 @@
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):931:931 -> a
     12:12:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$Segment newSegment(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):906 -> a
     1:1:com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueEntry$Helper instance():913:913 -> b
-com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.t.a.a.b.r1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakKeyWeakValueSegment -> com.android.tools.r8.t.a.a.b.s1:
     java.lang.ref.ReferenceQueue queueForKeys -> h
     java.lang.ref.ReferenceQueue queueForValues -> i
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MapMakerInternalMap,int,int):2189:2189 -> <init>
@@ -10506,12 +10580,12 @@
     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.t.a.a.b.s1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueEntry -> com.android.tools.r8.t.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.t.a.a.b.t1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReference -> com.android.tools.r8.t.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.t.a.a.b.u1:
+com.android.tools.r8.com.google.common.collect.MapMakerInternalMap$WeakValueReferenceImpl -> com.android.tools.r8.t.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
@@ -10526,13 +10600,13 @@
     1:1:java.lang.Object getValue():2684:2684 -> getValue
     1:1:int hashCode():2700:2700 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):2705:2706 -> setValue
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.t.a.a.b.v1:
-com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.t.a.a.b.w1:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.t.a.a.b.w1:
+com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.t.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.t.a.a.b.x1:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.t.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
@@ -10545,23 +10619,23 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1446 -> next
     3:3:java.util.Map$Entry next():1470 -> next
     3:3:java.lang.Object next():1462 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.t.a.a.b.A1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.t.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.t.a.a.b.y1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.t.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.t.a.a.b.z1:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.t.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.t.a.a.b.B1:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.t.a.a.b.C1:
     1:1:void <init>():4112:4112 -> <init>
     java.util.Map map() -> a
     1:1:void clear():4122:4122 -> clear
@@ -10581,11 +10655,11 @@
     4:4:boolean retainAll(java.util.Collection):4166 -> retainAll
     5:11:boolean retainAll(java.util.Collection):4167:4173 -> retainAll
     1:1:int size():4117:4117 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.t.a.a.b.D1:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.t.a.a.b.E1:
     1:1:void <init>():3653:3653 -> <init>
     1:1:java.util.Set entrySet():3666:3666 -> entrySet
     java.util.Iterator entryIterator() -> f
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.t.a.a.b.C1:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.t.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 -> a
@@ -10598,7 +10672,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.t.a.a.b.E1:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.t.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
@@ -10638,7 +10712,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.t.a.a.b.F1:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.t.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
@@ -10699,7 +10773,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.t.a.a.b.G1:
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.t.a.a.b.H1:
     java.util.Collection values -> b
     java.util.Set entrySet -> a
     1:1:void <init>():3612:3612 -> <init>
@@ -10711,31 +10785,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.t.a.a.b.H1:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.t.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.t.a.a.b.I1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.t.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.t.a.a.b.J1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.t.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.t.a.a.b.K1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.t.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.t.a.a.b.M1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.t.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.t.a.a.b.L1:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.t.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>
@@ -10748,12 +10822,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.t.a.a.b.N1:
+com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.t.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.t.a.a.b.O1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.t.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
@@ -10771,7 +10845,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.t.a.a.b.R1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.t.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
@@ -10798,17 +10872,17 @@
     4:4:java.util.Iterator iterator():1744 -> iterator
     1:1:java.util.Set elementSet():1786:1786 -> k
     1:1:java.util.Spliterator spliterator():1672:1672 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.t.a.a.b.Q1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.t.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.t.a.a.b.P1:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.t.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.t.a.a.b.R1$a:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.t.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 -> a
@@ -10821,7 +10895,7 @@
     1:1:int size():1705:1705 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.Multimaps$Keys.distinctElements():1683:1683 -> size
     2:2:int size():1705 -> size
-com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.t.a.a.b.S1:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.t.a.a.b.T1:
     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
@@ -10833,22 +10907,22 @@
     3:3:void forEach(java.util.function.Consumer):490 -> forEach
     java.util.Set elementSet() -> k
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.t.a.a.b.S1$a:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.t.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.t.a.a.b.T1:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.t.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.t.a.a.b.U1:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.t.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.t.a.a.b.W1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.t.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
@@ -10878,25 +10952,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.t.a.a.b.V1:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.t.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.t.a.a.b.X1:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.t.a.a.b.Y1:
     1:1:void <init>():1021:1021 -> <init>
     com.android.tools.r8.com.google.common.collect.Multiset multiset() -> a
     1:1:void clear():1061:1061 -> clear
     1:11:boolean contains(java.lang.Object):1026:1036 -> contains
     1:9:boolean remove(java.lang.Object):1045:1053 -> remove
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.t.a.a.b.Y1:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.t.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.t.a.a.b.Z1:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.t.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>
@@ -10910,11 +10984,11 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> compare
     4:4:int compare(java.lang.Comparable,java.lang.Comparable):35 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):25 -> compare
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.t.a.a.b.a2:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.t.a.a.b.b2:
     1:1:void <init>():390:390 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering from(java.util.Comparator):181:181 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Ordering reverse():404:404 -> a
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.t.a.a.b.b2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.t.a.a.b.c2:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> c
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList):35:37 -> <init>
@@ -10926,7 +11000,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator listIterator(int):56:56 -> listIterator
     2:2:java.util.ListIterator listIterator(int):29 -> listIterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.t.a.a.b.e2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.t.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
@@ -10972,8 +11046,8 @@
     boolean isHashCodeFast() -> l
     boolean isPartialView() -> m
     1:1:int size():179:179 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.t.a.a.b.c2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.t.a.a.b.e2$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.t.a.a.b.d2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.t.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>
@@ -10997,7 +11071,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> size
     1:1:int size():199 -> size
     2:2:int size():199:199 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.t.a.a.b.e2$a$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.t.a.a.b.f2$a$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):240:240 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():268:268 -> c
@@ -11008,7 +11082,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():258:258 -> iterator
     2:2:java.util.Iterator iterator():239 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():243:243 -> j
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.t.a.a.b.d2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.t.a.a.b.e2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):268:268 -> <init>
     1:2:java.util.Map$Entry get(int):271:272 -> get
@@ -11017,7 +11091,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 -> h
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.t.a.a.b.f2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.t.a.a.b.g2:
     java.lang.Object[] array -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -11030,7 +11104,7 @@
     2:2:java.util.ListIterator listIterator(int):28 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.t.a.a.b.i2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.t.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
@@ -11074,7 +11148,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> k
     boolean isPartialView() -> m
     1:1:int size():159:159 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.t.a.a.b.g2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.t.a.a.b.h2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):181:182 -> <init>
     boolean isPartialView() -> b
@@ -11083,13 +11157,13 @@
     2:2:boolean contains(java.lang.Object):192 -> contains
     1:1:java.lang.Object get(int):187:187 -> get
     1:1:int size():202:202 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.t.a.a.b.h2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.t.a.a.b.i2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):236:237 -> <init>
     boolean isPartialView() -> b
     1:1:java.lang.Object get(int):242:242 -> get
     1:1:int size():247:247 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.t.a.a.b.k2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.t.a.a.b.l2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset EMPTY -> i
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> e
     int size -> f
@@ -11108,8 +11182,8 @@
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():140:141 -> k
     3:4:java.util.Set elementSet():34 -> k
     1:1:int size():135:135 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.t.a.a.b.j2:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.t.a.a.b.k2$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.t.a.a.b.k2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.t.a.a.b.l2$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset):145:145 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset,com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1):145:145 -> <init>
@@ -11119,11 +11193,11 @@
     2:2:boolean contains(java.lang.Object):154 -> contains
     1:1:java.lang.Object get(int):149:149 -> get
     1:1:int size():164:164 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.t.a.a.b.l2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.t.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.t.a.a.b.m2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.t.a.a.b.n2:
     java.lang.Object[] table -> d
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> g
     java.lang.Object[] elements -> c
@@ -11144,7 +11218,7 @@
     2:2:java.util.Iterator iterator():30 -> iterator
     1:1:int size():69:69 -> size
     1:1:java.util.Spliterator spliterator():79:79 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.t.a.a.b.n2:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.t.a.a.b.o2:
     com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet NATURAL_EMPTY_SET -> f
     com.android.tools.r8.com.google.common.collect.ImmutableList elements -> e
     1:2:void <clinit>():44:45 -> <clinit>
@@ -11249,7 +11323,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.t.a.a.b.o2:
+com.android.tools.r8.com.google.common.collect.ReverseNaturalOrdering -> com.android.tools.r8.t.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>
@@ -11261,7 +11335,7 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> compare
     3:3:int compare(java.lang.Comparable,java.lang.Comparable):33 -> compare
     3:3:int compare(java.lang.Object,java.lang.Object):26 -> compare
-com.android.tools.r8.com.google.common.collect.ReverseOrdering -> com.android.tools.r8.t.a.a.b.p2:
+com.android.tools.r8.com.google.common.collect.ReverseOrdering -> com.android.tools.r8.t.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 -> a
@@ -11269,7 +11343,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.t.a.a.b.r2:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.t.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>
@@ -11281,13 +11355,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.t.a.a.b.q2:
+com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.t.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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.t.a.a.b.t2:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.t.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>
@@ -11299,12 +11373,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.t.a.a.b.s2:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.t.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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.t.a.a.b.v2:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.t.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>
@@ -11317,12 +11391,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.t.a.a.b.u2:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.t.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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.t.a.a.b.z2:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.t.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>
@@ -11330,31 +11404,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.t.a.a.b.y2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.t.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 -> f
     1:29:java.lang.Object computeNext():1688 -> f
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.t.a.a.b.x2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.t.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.t.a.a.b.w2:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.t.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 -> f
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.t.a.a.b.A2:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.t.a.a.b.B2:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean removeAll(java.util.Collection):80:80 -> removeAll
     1:1:boolean retainAll(java.util.Collection):85:85 -> retainAll
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> retainAll
     2:2:boolean retainAll(java.util.Collection):85 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.t.a.a.b.B2:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.t.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
@@ -11364,7 +11438,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.t.a.a.b.C2:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.t.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
@@ -11392,7 +11466,7 @@
     1:2:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1911 -> subSet
     3:3:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1910 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):1921:1921 -> tailSet
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.t.a.a.b.D2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.t.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
@@ -11413,7 +11487,7 @@
     1:3:com.android.tools.r8.com.google.common.collect.BiMap inverse():34 -> i
     4:6:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():100:102 -> i
     boolean isPartialView() -> m
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.t.a.a.b.E2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.t.a.a.b.F2:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> b
@@ -11428,7 +11502,7 @@
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> subList
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList subList(int,int):65 -> subList
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.t.a.a.b.F2:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.t.a.a.b.G2:
     java.lang.Object element -> c
     int cachedHashCode -> d
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -11444,22 +11518,22 @@
     3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.singletonIterator(java.lang.Object):1104:1104 -> iterator
     3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():66 -> iterator
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.t.a.a.b.G2:
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.t.a.a.b.H2:
+com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.t.a.a.b.H2:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.t.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.t.a.a.b.I2:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.t.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.t.a.a.b.J2:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.t.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.t.a.a.b.K2:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.t.a.a.b.L2:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -11473,17 +11547,17 @@
     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.t.a.a.b.L2:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.t.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.t.a.a.b.M2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.t.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.t.a.a.b.N2:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.t.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
@@ -11858,12 +11932,10 @@
     1:3:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):55:57 -> a
     4:4:com.android.tools.r8.com.google.gson.JsonElement createJsonElement(java.lang.Object):122:122 -> a
     4:4:void addProperty(java.lang.String,java.lang.Number):90 -> a
-    5:5:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):57:57 -> a
-    5:5:void addProperty(java.lang.String,java.lang.Number):90 -> a
+    5:5:void addProperty(java.lang.String,java.lang.Number):90:90 -> a
     6:6:com.android.tools.r8.com.google.gson.JsonElement createJsonElement(java.lang.Object):122:122 -> a
     6:6:void addProperty(java.lang.String,java.lang.String):79 -> a
-    7:7:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):57:57 -> a
-    7:7:void addProperty(java.lang.String,java.lang.String):79 -> a
+    7:7:void addProperty(java.lang.String,java.lang.String):79:79 -> a
     8:8:com.android.tools.r8.com.google.gson.JsonElement get(java.lang.String):161:161 -> a
     1:1:com.android.tools.r8.com.google.gson.JsonArray getAsJsonArray(java.lang.String):181:181 -> b
     1:1:boolean has(java.lang.String):151:151 -> c
@@ -12508,7 +12580,7 @@
     253:255:void processDirectory(java.io.File,java.util.List):613:615 -> a
     253:255:void processPath(java.io.File,java.util.List):599 -> a
     256:257:void processPath(java.io.File,java.util.List):602:603 -> a
-    258:259:boolean com.android.tools.r8.utils.FileUtils.isApkFile(java.nio.file.Path):66:67 -> a
+    258:259:boolean com.android.tools.r8.utils.FileUtils.isApkFile(java.nio.file.Path):61:62 -> a
     258:259:void processPath(java.io.File,java.util.List):607 -> a
     260:260:void processPath(java.io.File,java.util.List):608:608 -> a
     261:261:void processPath(java.io.File,java.util.List):604:604 -> a
@@ -12794,10 +12866,10 @@
     177:185:void write(java.util.concurrent.ExecutorService):369:377 -> a
     186:186:void lambda$write$0(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):305:305 -> a
     187:191:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):316:320 -> a
-    192:192:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():343:343 -> a
+    192:192:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():340:340 -> a
     192:192:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):320 -> a
     193:200:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):323:330 -> a
-    201:201:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():339:339 -> a
+    201:201:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():336:336 -> a
     201:201:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):330 -> a
     202:205:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):334:337 -> a
     206:206:java.lang.Boolean lambda$write$1(com.android.tools.r8.dex.VirtualFile):336:336 -> a
@@ -12854,10 +12926,10 @@
     501:501:void lambda$writeMainDexList$4(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):649:649 -> a
     502:507:java.lang.String writeMainDexList(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):645:650 -> a
     1:1:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190:190 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():331:331 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():328:328 -> b
     2:2:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):190 -> b
     3:3:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):191:191 -> b
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():343:343 -> b
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():340:340 -> b
     4:4:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):192 -> b
     5:15:java.lang.Iterable distribute(java.util.concurrent.ExecutorService):192:202 -> b
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.dex.b$a:
@@ -12917,6 +12989,8 @@
     14:14:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
     14:14:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
     15:15:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):74:74 -> a
+    16:16:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
+    16:16:com.android.tools.r8.dex.ClassesChecksum parse(com.android.tools.r8.graph.DexString):73 -> a
     1:1:void lambda$new$0(java.util.Map$Entry):31:31 -> b
     1:7:java.lang.String toString():54:60 -> toString
 com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.dex.f:
@@ -12927,7 +13001,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):24:25 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26 -> a
     4:6:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
 com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.dex.d:
@@ -13246,7 +13320,7 @@
     150:150:void ensureCodesInited(int):159 -> a
     150:150:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):640 -> a
     151:165:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):641:655 -> a
-    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    166:166:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     166:166:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):655 -> a
     167:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean,boolean):656:659 -> a
     171:171:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
@@ -13450,7 +13524,7 @@
     33:33:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():460 -> c
     34:34:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():460:460 -> c
     1:10:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():364:373 -> d
-    11:11:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):56:56 -> d
+    11:11:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> d
     11:11:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():373 -> d
     12:12:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):475:475 -> d
     13:15:java.lang.Object cacheAt(int,java.util.function.Supplier,java.util.function.Supplier):401:403 -> d
@@ -13913,7 +13987,7 @@
     245:248:void writeChecksum(com.android.tools.r8.dex.FileWriter$Layout):834:837 -> b
     245:248:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():224 -> b
     249:250:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():227:228 -> b
-    251:251:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> b
+    251:251:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
     251:251:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228 -> b
     252:257:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():228:233 -> b
     258:258:void writeSignature(com.android.tools.r8.dex.FileWriter$Layout):828:828 -> b
@@ -14362,6 +14436,8 @@
     22:22:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
     22:22:com.android.tools.r8.dex.Marker internalParse(com.android.tools.r8.dex.Marker$Tool,java.lang.String):168 -> a
     23:23:com.android.tools.r8.dex.Marker internalParse(com.android.tools.r8.dex.Marker$Tool,java.lang.String):169:169 -> a
+    24:24:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> a
+    24:24:com.android.tools.r8.dex.Marker internalParse(com.android.tools.r8.dex.Marker$Tool,java.lang.String):168 -> a
     1:1:java.lang.Long getMinApi():81:81 -> b
     2:3:com.android.tools.r8.dex.Marker setSha1(java.lang.String):95:96 -> b
     1:2:com.android.tools.r8.dex.Marker setVersion(java.lang.String):75:76 -> c
@@ -15350,109 +15426,109 @@
     1:8:void add(com.android.tools.r8.graph.DexEncodedMethod):659:666 -> a
     9:12:com.android.tools.r8.graph.ResolutionResult build():671:674 -> a
 com.android.tools.r8.graph.AppInfoWithSubtyping -> com.android.tools.r8.graph.c:
-    1:8:void <clinit>():28:35 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication):134:134 -> <init>
-    2:23:void <init>(com.android.tools.r8.graph.DexApplication):116:137 -> <init>
-    24:24:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):141:141 -> <init>
-    25:54:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):116:145 -> <init>
-    1:1:java.util.Set access$000():28:28 -> a
-    2:3:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):215:216 -> a
-    4:27:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):221:244 -> a
-    28:36:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):250:258 -> a
-    37:71:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):263:297 -> a
-    37:71:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):258 -> a
-    72:81:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):522:531 -> a
-    82:91:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):539:548 -> a
-    92:104:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):624:636 -> a
-    105:138:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):734:767 -> a
-    1:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):150:171 -> addSynthesizedClass
-    1:9:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):563:571 -> allImmediateExtendsSubtypes
-    1:5:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):587:591 -> allImmediateImplementsSubtypes
-    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):457:457 -> allImmediateSubtypes
-    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):206:209 -> b
-    5:5:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):516:516 -> b
-    6:6:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):566:566 -> b
-    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):569:569 -> c
-    1:49:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):662:710 -> computeLeastUpperBoundOfClasses
-    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):589:589 -> d
-    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):206:206 -> e
-    1:1:void forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):559:559 -> forAllImmediateExtendsSubtypes
-    1:1:void forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):583:583 -> forAllImmediateImplementsSubtypes
-    1:2:java.util.Set getMissingClasses():192:193 -> getMissingClasses
-    1:4:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):641:644 -> getSingleSubtype
+    1:8:void <clinit>():27:34 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication):133:133 -> <init>
+    2:23:void <init>(com.android.tools.r8.graph.DexApplication):115:136 -> <init>
+    24:24:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):140:140 -> <init>
+    25:54:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping):115:144 -> <init>
+    1:1:java.util.Set access$000():27:27 -> a
+    2:2:com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo getTypeInfo(com.android.tools.r8.graph.DexType):214:214 -> a
+    3:26:void populateAllSuperTypes(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):219:242 -> a
+    27:35:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):248:256 -> a
+    36:70:boolean validateLevelsAreCorrect(java.util.function.Function,com.android.tools.r8.graph.DexItemFactory):261:295 -> a
+    36:70:void populateSubtypeMap(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DexItemFactory):256 -> a
+    71:80:boolean isInterfaceSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):520:529 -> a
+    81:90:boolean isSubtypeOfClass(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo,boolean):537:546 -> a
+    91:103:void implementedInterfaces(com.android.tools.r8.graph.DexType,java.util.Set):622:634 -> a
+    104:135:boolean computeMayHaveFinalizeMethodDirectlyOrIndirectlyIfAbsent(com.android.tools.r8.graph.DexType,boolean):723:754 -> a
+    1:22:void addSynthesizedClass(com.android.tools.r8.graph.DexProgramClass):149:170 -> addSynthesizedClass
+    1:9:java.lang.Iterable allImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType):561:569 -> allImmediateExtendsSubtypes
+    1:5:java.lang.Iterable allImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType):585:589 -> allImmediateImplementsSubtypes
+    1:1:java.util.Set allImmediateSubtypes(com.android.tools.r8.graph.DexType):455:455 -> allImmediateSubtypes
+    1:4:void populateSuperType(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.util.function.Function):205:208 -> b
+    5:5:boolean lambda$isStrictSubtypeOf$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):514:514 -> b
+    6:6:boolean lambda$allImmediateExtendsSubtypes$2(com.android.tools.r8.graph.DexType):564:564 -> b
+    1:1:boolean lambda$allImmediateExtendsSubtypes$3(com.android.tools.r8.graph.DexType):567:567 -> c
+    1:49:com.android.tools.r8.graph.DexType computeLeastUpperBoundOfClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):660:708 -> computeLeastUpperBoundOfClasses
+    1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):587:587 -> d
+    1:1:java.util.Set lambda$populateSuperType$0(com.android.tools.r8.graph.DexType):205:205 -> e
+    1:1:void forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):557:557 -> forAllImmediateExtendsSubtypes
+    1:1:void forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):581:581 -> forAllImmediateImplementsSubtypes
+    1:2:java.util.Set getMissingClasses():191:192 -> getMissingClasses
+    1:4:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):639:642 -> getSingleSubtype
     5:5:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809:809 -> getSingleSubtype
-    5:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):644 -> getSingleSubtype
+    5:5:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642 -> getSingleSubtype
     6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):888:888 -> getSingleSubtype
     6:6:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):809 -> getSingleSubtype
-    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):644 -> getSingleSubtype
-    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):644:644 -> getSingleSubtype
-    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):338:338 -> hasAnyInstantiatedLambdas
-    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):470:470 -> hasSubtypes
-    1:1:boolean hasSubtyping():446:446 -> hasSubtyping
-    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):609:620 -> implementedInterfaces
-    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):619:619 -> implementedInterfaces
-    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):716:716 -> inDifferentHierarchy
-    1:3:boolean isDirectSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):652:654 -> isDirectSubtype
-    1:1:boolean isExternalizable(com.android.tools.r8.graph.DexType):600:600 -> isExternalizable
-    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):465:465 -> isMarkedAsInterface
-    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):595:595 -> isMissingOrHasMissingSuperType
+    6:6:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642 -> getSingleSubtype
+    7:7:com.android.tools.r8.graph.DexType getSingleSubtype(com.android.tools.r8.graph.DexType):642:642 -> getSingleSubtype
+    1:1:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):336:336 -> hasAnyInstantiatedLambdas
+    1:1:boolean hasSubtypes(com.android.tools.r8.graph.DexType):468:468 -> hasSubtypes
+    1:1:boolean hasSubtyping():444:444 -> hasSubtyping
+    1:12:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):607:618 -> implementedInterfaces
+    13:13:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):617:617 -> implementedInterfaces
+    1:1:boolean inDifferentHierarchy(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):714:714 -> inDifferentHierarchy
+    1:3:boolean isDirectSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):650:652 -> isDirectSubtype
+    1:1:boolean isExternalizable(com.android.tools.r8.graph.DexType):598:598 -> isExternalizable
+    1:1:boolean isMarkedAsInterface(com.android.tools.r8.graph.DexType):463:463 -> isMarkedAsInterface
+    1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):593:593 -> isMissingOrHasMissingSuperType
     2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithSubtyping):697:701 -> isMissingOrHasMissingSuperType
-    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):596 -> isMissingOrHasMissingSuperType
-    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):604:604 -> isSerializable
-    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):486:489 -> isStrictSubtypeOf
-    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:178 -> isStrictSubtypeOf
-    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):490 -> isStrictSubtypeOf
-    8:23:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):503:518 -> isStrictSubtypeOf
-    1:4:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):431:434 -> isStringConcat
-    1:4:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):475:478 -> isSubtype
-    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:178 -> isSubtype
-    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):479 -> isSubtype
-    1:1:boolean isUnknown(com.android.tools.r8.graph.DexType):461:461 -> isUnknown
-    2:2:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():103:103 -> isUnknown
-    2:2:boolean isUnknown(com.android.tools.r8.graph.DexType):461 -> isUnknown
-    1:1:java.lang.Iterable libraryClasses():187:187 -> libraryClasses
-    2:2:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApplication():183:183 -> libraryClasses
-    2:2:java.lang.Iterable libraryClasses():188 -> libraryClasses
-    3:3:java.lang.Iterable libraryClasses():188:188 -> libraryClasses
-    1:11:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):390:400 -> lookupLambdaImplementedMethods
-    12:12:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():103:103 -> lookupLambdaImplementedMethods
-    12:12:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):400 -> lookupLambdaImplementedMethods
-    13:26:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):411:424 -> lookupLambdaImplementedMethods
-    27:27:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):393:393 -> lookupLambdaImplementedMethods
-    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):327:331 -> lookupSuperTarget
+    2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):594 -> isMissingOrHasMissingSuperType
+    1:1:boolean isSerializable(com.android.tools.r8.graph.DexType):602:602 -> isSerializable
+    1:4:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):484:487 -> isStrictSubtypeOf
+    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> isStrictSubtypeOf
+    5:7:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):488 -> isStrictSubtypeOf
+    8:23:boolean isStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):501:516 -> isStrictSubtypeOf
+    1:4:boolean isStringConcat(com.android.tools.r8.graph.DexMethodHandle):429:432 -> isStringConcat
+    1:4:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):473:476 -> isSubtype
+    5:7:boolean isSynthesizedClassStrictSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175:177 -> isSubtype
+    5:7:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):477 -> isSubtype
+    1:1:boolean isUnknown(com.android.tools.r8.graph.DexType):459:459 -> isUnknown
+    2:2:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> isUnknown
+    2:2:boolean isUnknown(com.android.tools.r8.graph.DexType):459 -> isUnknown
+    1:1:java.lang.Iterable libraryClasses():186:186 -> libraryClasses
+    2:2:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApplication():182:182 -> libraryClasses
+    2:2:java.lang.Iterable libraryClasses():187 -> libraryClasses
+    3:3:java.lang.Iterable libraryClasses():187:187 -> libraryClasses
+    1:11:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):388:398 -> lookupLambdaImplementedMethods
+    12:12:boolean com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo.isUnknown():102:102 -> lookupLambdaImplementedMethods
+    12:12:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):398 -> lookupLambdaImplementedMethods
+    13:26:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):409:422 -> lookupLambdaImplementedMethods
+    27:27:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):391:391 -> lookupLambdaImplementedMethods
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:329 -> lookupSuperTarget
     6:6:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> lookupSuperTarget
-    6:6:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332 -> lookupSuperTarget
-    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332:332 -> lookupSuperTarget
+    6:6:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330 -> lookupSuperTarget
+    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330:330 -> lookupSuperTarget
     8:8:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> lookupSuperTarget
-    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332 -> lookupSuperTarget
-    9:11:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):332:334 -> lookupSuperTarget
-    1:10:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):720:729 -> mayHaveFinalizeMethodDirectlyOrIndirectly
-    1:7:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):356:362 -> methodDefinedInInterface
+    8:8:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330 -> lookupSuperTarget
+    9:11:com.android.tools.r8.graph.DexEncodedMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):330:332 -> lookupSuperTarget
+    1:1:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):718:718 -> mayHaveFinalizeMethodDirectlyOrIndirectly
+    1:7:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):354:360 -> methodDefinedInInterface
     8:8:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):103:103 -> methodDefinedInInterface
-    8:8:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):362 -> methodDefinedInInterface
-    9:15:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):362:368 -> methodDefinedInInterface
-    1:6:boolean methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):343:348 -> methodDefinedInInterfaces
-    1:3:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):439:441 -> registerNewType
-    1:4:java.util.Set subtypes(com.android.tools.r8.graph.DexType):197:200 -> subtypes
-    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():452:452 -> withSubtyping
+    8:8:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):360 -> methodDefinedInInterface
+    9:15:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):360:366 -> methodDefinedInInterface
+    1:6:boolean methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):341:346 -> methodDefinedInInterfaces
+    1:3:void registerNewType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):437:439 -> registerNewType
+    1:4:java.util.Set subtypes(com.android.tools.r8.graph.DexType):196:199 -> subtypes
+    1:1:com.android.tools.r8.graph.AppInfoWithSubtyping withSubtyping():450:450 -> withSubtyping
 com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo -> com.android.tools.r8.graph.c$a:
     java.util.Set directSubtypes -> c
     java.util.Set implementedInterfaces -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType type -> a
     int hierarchyLevel -> b
-    1:1:void <clinit>():37:37 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType):51:51 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.DexType):41:52 -> <init>
-    1:11:void setLevel(int):67:77 -> a
-    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):82:85 -> a
-    16:18:boolean isInterface():97:99 -> a
-    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):109:111 -> a
-    1:1:com.android.tools.r8.graph.DexType access$100(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):37:37 -> b
-    2:2:void tagAsInterface():93:93 -> b
-    1:1:void tagAsSubtypeRoot():89:89 -> c
-    1:2:void ensureDirectSubTypeSet():61:62 -> d
-    1:1:java.lang.String toString():57:57 -> toString
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType):50:50 -> <init>
+    2:13:void <init>(com.android.tools.r8.graph.DexType):40:51 -> <init>
+    1:11:void setLevel(int):66:76 -> a
+    12:15:void addDirectSubtype(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):81:84 -> a
+    16:18:boolean isInterface():96:98 -> a
+    19:21:void addInterfaceSubtype(com.android.tools.r8.graph.DexType):108:110 -> a
+    1:1:com.android.tools.r8.graph.DexType access$100(com.android.tools.r8.graph.AppInfoWithSubtyping$TypeInfo):36:36 -> b
+    2:2:void tagAsInterface():92:92 -> b
+    1:1:void tagAsSubtypeRoot():88:88 -> c
+    1:2:void ensureDirectSubTypeSet():60:61 -> d
+    1:1:java.lang.String toString():56:56 -> toString
 com.android.tools.r8.graph.AppServices -> com.android.tools.r8.graph.d:
     java.util.Map services -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -15606,7 +15682,7 @@
     8:19:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):101:112 -> a
     20:21:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):121:122 -> a
     20:21:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):113 -> a
-    22:22: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):362:362 -> a
+    22:22: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):358:358 -> a
     22:22:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):122 -> a
     22:22:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):113 -> a
     23:24:void writeIR(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):123:124 -> a
@@ -15649,10 +15725,10 @@
     13:13:void com.android.tools.r8.cf.code.CfLabel.write(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens):47:47 -> a
     13:13:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):200 -> a
     14:15:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):202:203 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():318 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():315 -> a
     16:16:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):205 -> a
-    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():319:319 -> a
+    17:17:boolean com.android.tools.r8.utils.InternalOptions.shouldKeepStackMapTable():316:316 -> a
     17:17:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):205 -> a
     18:34:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):208:224 -> a
     35:48:void write(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.AppView,int):218:231 -> a
@@ -15757,7 +15833,8 @@
     2:2:void <init>(int):53:53 -> f
     2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):68 -> f
     1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):61:63 -> g
-com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.graph.n:
+com.android.tools.r8.graph.ClassHierarchy -> com.android.tools.r8.graph.m:
+com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.graph.o:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set visited -> c
@@ -15771,7 +15848,7 @@
     com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
     1:22:void visit(java.lang.Iterable,java.util.function.Consumer):65:86 -> a
     23:36:void visit(java.lang.Iterable,java.util.function.Consumer):69:82 -> a
-com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> com.android.tools.r8.graph.m:
+com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> com.android.tools.r8.graph.n:
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ALL_CLASSES -> a
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_LIBRARY_CLASSES -> b
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_LIBRARY_AND_CLASSPATH_CLASSES -> c
@@ -15780,7 +15857,7 @@
     1:4:void <clinit>():19:22 -> <clinit>
     5:5:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):18:18 -> <init>
-com.android.tools.r8.graph.ClassKind -> com.android.tools.r8.graph.o:
+com.android.tools.r8.graph.ClassKind -> com.android.tools.r8.graph.p:
     com.android.tools.r8.graph.ClassKind CLASSPATH -> d
     com.android.tools.r8.graph.ClassKind LIBRARY -> e
     java.util.function.Predicate check -> b
@@ -15796,9 +15873,9 @@
     5:5:boolean isOfKind(com.android.tools.r8.graph.DexClass):87:87 -> a
     5:5:void lambda$bridgeConsumer$0(java.util.function.Consumer,com.android.tools.r8.graph.DexClass):92 -> a
     6:8:void lambda$bridgeConsumer$0(java.util.function.Consumer,com.android.tools.r8.graph.DexClass):92:94 -> a
-com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.graph.o$a:
+com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.graph.p$a:
     com.android.tools.r8.graph.DexClass create(com.android.tools.r8.graph.DexType,com.android.tools.r8.ProgramResource$Kind,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.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) -> a
-com.android.tools.r8.graph.Code -> com.android.tools.r8.graph.p:
+com.android.tools.r8.graph.Code -> com.android.tools.r8.graph.q:
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.graph.CfCode asCfCode():71:71 -> asCfCode
     1:1:com.android.tools.r8.graph.DexCode asDexCode():79:79 -> asDexCode
@@ -15810,7 +15887,7 @@
     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):40:40 -> collectParameterInfo
     1:1:boolean estimatedSizeForInliningAtMost(int):67:67 -> estimatedSizeForInliningAtMost
     1:1:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):35:35 -> registerArgumentReferences
-com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.graph.q:
+com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.graph.r:
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexString signature -> c
     com.android.tools.r8.graph.DexType type -> b
@@ -15825,7 +15902,7 @@
     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.q$a:
+com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> com.android.tools.r8.graph.r$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
@@ -15833,12 +15910,12 @@
     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.DefaultUseRegistry -> com.android.tools.r8.graph.r:
+com.android.tools.r8.graph.DefaultUseRegistry -> com.android.tools.r8.graph.s:
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):10:10 -> <init>
-com.android.tools.r8.graph.Descriptor -> com.android.tools.r8.graph.s:
+com.android.tools.r8.graph.Descriptor -> com.android.tools.r8.graph.t:
     1:1:void <init>():6:6 -> <init>
     boolean match(com.android.tools.r8.graph.DexItem) -> a
-com.android.tools.r8.graph.DexAnnotation -> com.android.tools.r8.graph.t:
+com.android.tools.r8.graph.DexAnnotation -> com.android.tools.r8.graph.u:
     com.android.tools.r8.graph.DexEncodedAnnotation annotation -> b
     com.android.tools.r8.graph.DexAnnotation[] EMPTY_ARRAY -> c
     boolean $assertionsDisabled -> d
@@ -15884,7 +15961,6 @@
     118:140:java.util.Collection readAnnotationSynthesizedClassMap(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):348:370 -> a
     141:144:java.lang.String getInvalidSynthesizedClassMapMessage(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):376:379 -> a
     145:151:com.android.tools.r8.graph.DexAnnotation createAnnotationSynthesizedClassMap(java.util.TreeSet,com.android.tools.r8.graph.DexItemFactory):385:391 -> a
-    152:159:com.android.tools.r8.graph.DexAnnotation rewrite(java.util.function.Function):403:410 -> a
     1:4:com.android.tools.r8.graph.DexMethod getEnclosingMethodFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):115:118 -> b
     1:3:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):157:159 -> c
     4:4:void com.android.tools.r8.utils.Pair.<init>():20:20 -> c
@@ -15905,7 +15981,7 @@
     1:1:int hashCode():45:45 -> hashCode
     1:1:boolean isSignatureAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):273:273 -> i
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.graph.DexAnnotationDirectory -> com.android.tools.r8.graph.u:
+com.android.tools.r8.graph.DexAnnotationDirectory -> com.android.tools.r8.graph.v:
     java.util.List methodAnnotations -> b
     java.util.List fieldAnnotations -> d
     com.android.tools.r8.graph.DexProgramClass clazz -> a
@@ -15925,7 +16001,7 @@
     1:1:java.util.List getMethodAnnotations():58:58 -> h
     1:4:int hashCode():93:96 -> hashCode
     1:1:java.util.List getParameterAnnotations():62:62 -> i
-com.android.tools.r8.graph.DexAnnotationElement -> com.android.tools.r8.graph.v:
+com.android.tools.r8.graph.DexAnnotationElement -> com.android.tools.r8.graph.w:
     com.android.tools.r8.graph.DexAnnotationElement[] EMPTY_ARRAY -> c
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexValue value -> b
@@ -15942,7 +16018,7 @@
     1:3:boolean equals(java.lang.Object):30:32 -> equals
     1:1:int hashCode():22:22 -> hashCode
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.graph.DexAnnotationSet -> com.android.tools.r8.graph.w:
+com.android.tools.r8.graph.DexAnnotationSet -> com.android.tools.r8.graph.x:
     com.android.tools.r8.graph.DexAnnotationSet THE_EMPTY_ANNOTATIONS_SET -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexAnnotationSet[] EMPTY_ARRAY -> c
@@ -15952,27 +16028,26 @@
     1:1:void <init>(com.android.tools.r8.graph.DexAnnotation[]):27:27 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DexAnnotation[]):25:28 -> <init>
     1:1:com.android.tools.r8.graph.DexType findDuplicateEntryType(com.android.tools.r8.graph.DexAnnotation[]):32:32 -> a
-    2:2:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):88:88 -> a
+    2:2:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):84:84 -> a
     3:3:int com.android.tools.r8.graph.DexType.compareTo(com.android.tools.r8.graph.DexType):160:160 -> a
-    3:3:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):88 -> a
-    4:5:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):96:97 -> a
-    6:6:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):146:146 -> a
-    7:7:com.android.tools.r8.graph.DexAnnotation lambda$keepIf$1(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):146:146 -> a
-    8:18:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):150:160 -> a
+    3:3:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation):84 -> a
+    4:5:com.android.tools.r8.graph.DexAnnotation getFirstMatching(com.android.tools.r8.graph.DexType):92:93 -> a
+    6:6:com.android.tools.r8.graph.DexAnnotationSet keepIf(java.util.function.Predicate):142:142 -> a
+    7:7:com.android.tools.r8.graph.DexAnnotation lambda$keepIf$1(java.util.function.Predicate,com.android.tools.r8.graph.DexAnnotation):142:142 -> a
+    8:18:com.android.tools.r8.graph.DexAnnotationSet rewrite(java.util.function.Function):146:156 -> a
     1:4:com.android.tools.r8.graph.DexType findDuplicateEntryType(java.util.List):36:39 -> b
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):70:70 -> collectIndexedItems
-    1:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):75:76 -> collectMixedSectionItems
-    1:3:boolean computeEquals(java.lang.Object):60:62 -> computeEquals
-    1:1:int computeHashCode():55:55 -> computeHashCode
-    1:1:boolean isEmpty():80:80 -> f
-    1:1:int size():50:50 -> g
-    1:2:void sort():84:85 -> h
-    3:3:int sortedHashCode():121:121 -> h
-    3:3:void sort():85 -> h
-    4:11:void sort():85:92 -> h
-    1:1:com.android.tools.r8.graph.DexAnnotationSet empty():46:46 -> i
-    1:1:java.lang.String toString():165:165 -> toString
-com.android.tools.r8.graph.DexApplication -> com.android.tools.r8.graph.x:
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> collectIndexedItems
+    1:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):71:72 -> collectMixedSectionItems
+    1:3:boolean computeEquals(java.lang.Object):56:58 -> computeEquals
+    1:1:int computeHashCode():51:51 -> computeHashCode
+    1:1:boolean isEmpty():76:76 -> f
+    1:2:void sort():80:81 -> g
+    3:3:int sortedHashCode():117:117 -> g
+    3:3:void sort():81 -> g
+    4:11:void sort():81:88 -> g
+    1:1:com.android.tools.r8.graph.DexAnnotationSet empty():46:46 -> h
+    1:1:java.lang.String toString():161:161 -> toString
+com.android.tools.r8.graph.DexApplication -> com.android.tools.r8.graph.y:
     com.android.tools.r8.dex.ClassesChecksum checksums -> g
     com.android.tools.r8.naming.ClassNameMapper proguardMap -> c
     boolean $assertionsDisabled -> i
@@ -15998,7 +16073,7 @@
     1:1:com.android.tools.r8.naming.ClassNameMapper getProguardMap():123:123 -> e
     java.util.List programClasses() -> f
     com.android.tools.r8.graph.DirectMappedDexApplication toDirect() -> g
-com.android.tools.r8.graph.DexApplication$Builder -> com.android.tools.r8.graph.x$a:
+com.android.tools.r8.graph.DexApplication$Builder -> com.android.tools.r8.graph.y$a:
     java.util.List dataResourceProviders -> b
     com.android.tools.r8.utils.Timing timing -> g
     java.util.List programClasses -> a
@@ -16031,12 +16106,12 @@
     1:1:java.util.Collection getProgramClasses():211:211 -> c
     1:1:java.util.Collection getSynthesizedClasses():215:215 -> d
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.DexApplication$ReorderBox -> com.android.tools.r8.graph.x$b:
+com.android.tools.r8.graph.DexApplication$ReorderBox -> com.android.tools.r8.graph.y$b:
     java.util.List classes -> a
     1:2:void <init>(java.util.List):74:75 -> <init>
     1:1:java.util.List getClasses():88:88 -> a
     1:3:boolean reorderClasses():80:82 -> b
-com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.graph.y:
+com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.graph.z:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     1:3:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):25:27 -> <init>
@@ -16067,9 +16142,9 @@
     void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
     void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> d
     1:8:void writeClass(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):86:93 -> e
-com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.graph.y$a:
+com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.graph.z$a:
     java.io.PrintStream get(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.graph.A:
+com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.graph.B:
     com.android.tools.r8.graph.DexString methodName -> c
     java.util.List bootstrapArgs -> f
     boolean $assertionsDisabled -> j
@@ -16102,8 +16177,8 @@
     1:1:java.lang.String getHash():155:155 -> i
     1:1:java.lang.String toSmaliString():151:151 -> toSmaliString
     1:11:java.lang.String toString():104:114 -> toString
-com.android.tools.r8.graph.DexCallSite$1 -> com.android.tools.r8.graph.z:
-com.android.tools.r8.graph.DexCallSite$HashBuilder -> com.android.tools.r8.graph.A$a:
+com.android.tools.r8.graph.DexCallSite$1 -> com.android.tools.r8.graph.A:
+com.android.tools.r8.graph.DexCallSite$HashBuilder -> com.android.tools.r8.graph.B$a:
     java.io.ByteArrayOutputStream bytes -> a
     com.android.tools.r8.graph.DexCallSite this$0 -> c
     java.io.ObjectOutputStream out -> b
@@ -16147,7 +16222,7 @@
     35:35:void write(java.util.List):225 -> a
     36:68:void write(java.util.List):229:261 -> a
     69:85:java.lang.String build():267:283 -> a
-com.android.tools.r8.graph.DexClass -> com.android.tools.r8.graph.B:
+com.android.tools.r8.graph.DexClass -> com.android.tools.r8.graph.C:
     com.android.tools.r8.graph.DexEncodedField[] instanceFields -> j
     com.android.tools.r8.graph.DexEncodedField[] staticFields -> i
     com.android.tools.r8.graph.DexTypeList interfaces -> f
@@ -16170,39 +16245,37 @@
     1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):90:90 -> <init>
     2:81:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):40:119 -> <init>
     82:82:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):109:109 -> <init>
-    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():836:837 -> A
-    1:1:java.util.List getInnerClasses():810:810 -> B
+    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():832:833 -> A
+    1:1:java.util.List getInnerClasses():806:806 -> B
     com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> C
-    1:5:com.android.tools.r8.graph.DexType getNestHost():898:902 -> D
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():908:908 -> E
-    1:1:java.util.List getNestMembersClassAttributes():912:912 -> F
+    1:5:com.android.tools.r8.graph.DexType getNestHost():894:898 -> D
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():904:904 -> E
+    1:1:java.util.List getNestMembersClassAttributes():908:908 -> F
     1:1:com.android.tools.r8.graph.DexType getType():671:671 -> G
     1:1:boolean hasClassInitializer():675:675 -> H
     1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():693:693 -> I
     1:1:boolean hasDefaultInitializer():679 -> I
-    1:1:boolean hasKotlinInfo():919:919 -> J
-    1:2:boolean hasStaticSynchronizedMethods():933:934 -> K
-    3:3:boolean com.android.tools.r8.graph.MethodAccessFlags.isSynchronized():110:110 -> K
-    3:3:boolean hasStaticSynchronizedMethods():934 -> K
-    1:5:java.util.List instanceFields():454:458 -> L
-    1:4:boolean isAnonymousClass():870:873 -> M
-    boolean isClasspathClass() -> N
-    1:1:boolean isEnum():597:597 -> O
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isEnum():161:161 -> O
-    2:2:boolean isEnum():597 -> O
-    1:1:boolean isInANest():877:877 -> P
-    1:1:boolean isInterface():593:593 -> Q
-    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> Q
-    2:2:boolean isInterface():593 -> Q
-    boolean isLibraryClass() -> R
-    1:3:boolean isLocalClass():857:859 -> S
-    1:3:boolean isMemberClass():863:865 -> T
-    1:1:boolean isNestHost():890:890 -> U
-    1:1:boolean isNestMember():894:894 -> V
-    boolean isNotProgramClass() -> W
-    boolean isProgramClass() -> X
-    1:1:java.lang.Iterable methods():135:135 -> Y
-    1:5:java.util.List staticFields():396:400 -> Z
+    1:1:boolean hasKotlinInfo():915:915 -> J
+    1:5:java.util.List instanceFields():454:458 -> K
+    1:4:boolean isAnonymousClass():866:869 -> L
+    boolean isClasspathClass() -> M
+    1:1:boolean isEnum():597:597 -> N
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isEnum():161:161 -> N
+    2:2:boolean isEnum():597 -> N
+    1:1:boolean isInANest():873:873 -> O
+    1:1:boolean isInterface():593:593 -> P
+    2:2:boolean com.android.tools.r8.graph.ClassAccessFlags.isInterface():125:125 -> P
+    2:2:boolean isInterface():593 -> P
+    boolean isLibraryClass() -> Q
+    1:3:boolean isLocalClass():853:855 -> R
+    1:3:boolean isMemberClass():859:861 -> S
+    1:1:boolean isNestHost():886:886 -> T
+    1:1:boolean isNestMember():890:890 -> U
+    boolean isNotProgramClass() -> V
+    boolean isProgramClass() -> W
+    1:1:java.lang.Iterable methods():135:135 -> X
+    1:5:java.util.List staticFields():396:400 -> Y
+    1:5:java.util.List virtualMethods():204:208 -> Z
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> a
     java.util.Iterator lambda$allImmediateSupertypes$3(java.util.Iterator) -> a
     1:3:java.lang.Iterable fields(java.util.function.Predicate):129:131 -> a
@@ -16238,10 +16311,10 @@
     93:101:boolean hasClassInitializerThatCannotBePostponed():763:771 -> a
     93:101:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):753 -> a
     102:105:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):756:759 -> a
-    106:106:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$4(com.android.tools.r8.graph.DexEncodedField):806:806 -> a
-    107:115:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):845:853 -> a
-    116:117:void setNestHost(com.android.tools.r8.graph.DexType):885:886 -> a
-    1:5:java.util.List virtualMethods():204:208 -> a0
+    106:106:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$4(com.android.tools.r8.graph.DexEncodedField):802:802 -> a
+    107:115:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):841:849 -> a
+    116:117:void setNestHost(com.android.tools.r8.graph.DexType):881:882 -> a
+    1:3:com.android.tools.r8.graph.DexEncodedMethod[] virtualMethodsSorted():321:323 -> a0
     1:6:void appendVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):212:217 -> b
     7:16:void appendVirtualMethods(java.util.Collection):221:230 -> b
     17:19:void setVirtualMethod(int,com.android.tools.r8.graph.DexEncodedMethod):242:244 -> b
@@ -16262,21 +16335,21 @@
     46:47:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):570 -> b
     48:48:boolean isSerializable(com.android.tools.r8.graph.AppView):729:729 -> b
     49:54:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):789:794 -> b
-    55:55:boolean isValid(com.android.tools.r8.utils.InternalOptions):923:923 -> b
+    55:55:boolean isValid(com.android.tools.r8.utils.InternalOptions):919:919 -> b
     56:56:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):272:272 -> b
-    56:56:boolean isValid(com.android.tools.r8.utils.InternalOptions):923 -> b
+    56:56:boolean isValid(com.android.tools.r8.utils.InternalOptions):919 -> b
     57:57:boolean isAbstract():589:589 -> b
     57:57:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):273 -> b
-    57:57:boolean isValid(com.android.tools.r8.utils.InternalOptions):923 -> b
+    57:57:boolean isValid(com.android.tools.r8.utils.InternalOptions):919 -> b
     58:59:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):274:275 -> b
-    58:59:boolean isValid(com.android.tools.r8.utils.InternalOptions):923 -> b
+    58:59:boolean isValid(com.android.tools.r8.utils.InternalOptions):919 -> b
     60:60:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> b
     60:60:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):275 -> b
-    60:60:boolean isValid(com.android.tools.r8.utils.InternalOptions):923 -> b
+    60:60:boolean isValid(com.android.tools.r8.utils.InternalOptions):919 -> b
     61:62:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):275:276 -> b
-    61:62:boolean isValid(com.android.tools.r8.utils.InternalOptions):923 -> b
-    63:67:boolean isValid(com.android.tools.r8.utils.InternalOptions):924:928 -> b
-    1:3:com.android.tools.r8.graph.DexEncodedMethod[] virtualMethodsSorted():321:323 -> b0
+    61:62:boolean isValid(com.android.tools.r8.utils.InternalOptions):919 -> b
+    63:67:boolean isValid(com.android.tools.r8.utils.InternalOptions):920:924 -> b
+    1:4:boolean verifyNoDuplicateFields():521:524 -> b0
     1:3:java.lang.Iterable methods(java.util.function.Predicate):139:141 -> c
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
     4:4:java.lang.Iterable methods(java.util.function.Predicate):139 -> c
@@ -16286,11 +16359,10 @@
     20:20:int lambda$virtualMethodsSorted$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):324:324 -> c
     21:21:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):531:531 -> c
     22:22:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):565:565 -> c
-    1:4:boolean verifyNoDuplicateFields():521:524 -> c0
+    1:4:boolean verifyNoDuplicateMethods():284:287 -> c0
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):146:146 -> collectMixedSectionItems
-    1:2:void removeEnclosingMethod(java.util.function.Predicate):822:823 -> d
-    1:4:boolean verifyNoDuplicateMethods():284:287 -> d0
-    1:1:void removeInnerClasses(java.util.function.Predicate):832:832 -> e
+    1:2:void removeEnclosingMethod(java.util.function.Predicate):818:819 -> d
+    1:1:void removeInnerClasses(java.util.function.Predicate):828:828 -> e
     com.android.tools.r8.graph.DexClass asDexClass() -> f
     boolean isDexClass() -> i
     boolean isStaticMember() -> l
@@ -16301,30 +16373,30 @@
     1:6:com.android.tools.r8.graph.DexEncodedMethod[] allMethodsSorted():302:307 -> o
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> p
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> q
-    1:1:void clearEnclosingMethod():818:818 -> r
-    1:1:void clearInnerClasses():828:828 -> s
-    1:1:void clearNestHost():881:881 -> t
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():805:806 -> u
+    1:1:void clearEnclosingMethod():814:814 -> r
+    1:1:void clearInnerClasses():824:824 -> s
+    1:1:void clearNestHost():877:877 -> t
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():801:802 -> u
     1:5:java.util.List directMethods():150:154 -> v
     1:3:com.android.tools.r8.graph.DexEncodedMethod[] directMethodsSorted():313:315 -> w
     1:1:java.lang.Iterable fields():125:125 -> x
     1:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():654:663 -> y
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():814:814 -> z
-com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.graph.B$a:
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethod():810:810 -> z
+com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.graph.C$a:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.graph.DexClass$MethodSetter -> com.android.tools.r8.graph.B$b:
+com.android.tools.r8.graph.DexClass$MethodSetter -> com.android.tools.r8.graph.C$b:
     void setMethod(int,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.graph.C:
+com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.graph.D:
     boolean $assertionsDisabled -> s
     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>
     1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():90:90 -> C
-    boolean isClasspathClass() -> N
-    boolean isNotProgramClass() -> W
+    boolean isClasspathClass() -> M
+    boolean isNotProgramClass() -> V
     1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):70:70 -> a
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):59:59 -> collectIndexedItems
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.D:
+com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.E:
     com.android.tools.r8.graph.DexCode$Try[] tries -> d
     com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> i
     boolean $assertionsDisabled -> j
@@ -16361,7 +16433,7 @@
     1:1:java.lang.String toString():262:262 -> toString
     2:63:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):267:328 -> toString
     64:64:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):309:309 -> toString
-com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.graph.D$a:
+com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.graph.E$a:
     boolean $assertionsDisabled -> e
     int handlerIndex -> d
     int startAddress -> b
@@ -16373,7 +16445,7 @@
     1:9:boolean equals(java.lang.Object):477:485 -> equals
     1:1:int hashCode():469:469 -> hashCode
     1:4:java.lang.String toString():492:495 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.graph.D$b:
+com.android.tools.r8.graph.DexCode$TryHandler -> com.android.tools.r8.graph.E$b:
     com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair[] pairs -> a
     int catchAllAddr -> b
     boolean $assertionsDisabled -> c
@@ -16384,7 +16456,7 @@
     1:6:boolean equals(java.lang.Object):536:541 -> equals
     1:1:int hashCode():528:528 -> hashCode
     1:16:java.lang.String toString():560:575 -> toString
-com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.graph.D$b$a:
+com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair -> com.android.tools.r8.graph.E$b$a:
     com.android.tools.r8.graph.DexType type -> a
     int addr -> b
     boolean $assertionsDisabled -> c
@@ -16394,7 +16466,7 @@
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):597:597 -> collectMixedSectionItems
     1:3:boolean equals(java.lang.Object):610:612 -> equals
     1:1:int hashCode():602:602 -> hashCode
-com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.graph.E:
+com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.graph.F:
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexString sourceFile -> d
     boolean $assertionsDisabled -> j
@@ -16409,7 +16481,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.F:
+com.android.tools.r8.graph.DexDebugEntryBuilder -> com.android.tools.r8.graph.G:
     com.android.tools.r8.graph.DexDebugPositionState positionState -> h
     java.util.Map locals -> c
     boolean $assertionsDisabled -> i
@@ -16454,8 +16526,8 @@
     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.F$a:
-com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> com.android.tools.r8.graph.F$b:
+com.android.tools.r8.graph.DexDebugEntryBuilder$1 -> com.android.tools.r8.graph.G$a:
+com.android.tools.r8.graph.DexDebugEntryBuilder$LocalEntry -> com.android.tools.r8.graph.G$b:
     com.android.tools.r8.graph.DebugLocalInfo current -> a
     com.android.tools.r8.graph.DebugLocalInfo last -> b
     1:1:void <init>():24:24 -> <init>
@@ -16561,7 +16633,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.G:
+com.android.tools.r8.graph.DexDebugEventBuilder -> com.android.tools.r8.graph.H:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexItemFactory factory -> b
     int startLine -> l
@@ -16628,7 +16700,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.H:
+com.android.tools.r8.graph.DexDebugEventVisitor -> com.android.tools.r8.graph.I:
     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
@@ -16639,7 +16711,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.I:
+com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.graph.J:
     com.android.tools.r8.graph.DexString[] parameters -> b
     com.android.tools.r8.graph.DexDebugEvent[] events -> c
     boolean $assertionsDisabled -> d
@@ -16652,12 +16724,12 @@
     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.J:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.graph.K:
     1:4:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:20 -> <init>
     5: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 -> c
-com.android.tools.r8.graph.DexDebugPositionState -> com.android.tools.r8.graph.K:
+com.android.tools.r8.graph.DexDebugPositionState -> com.android.tools.r8.graph.L:
     com.android.tools.r8.graph.DexString currentFile -> c
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod currentMethod -> d
@@ -16682,7 +16754,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.L:
+com.android.tools.r8.graph.DexDefinition -> com.android.tools.r8.graph.M:
     1:1:void <init>():13:13 -> <init>
     1:1:java.util.stream.Stream filterDexEncodedField(java.util.stream.Stream):71:71 -> a
     2:2:java.util.stream.Stream filter(java.util.stream.Stream,java.util.function.Predicate,java.util.function.Function):63:63 -> a
@@ -16698,8 +16770,8 @@
     boolean isDexEncodedMethod() -> k
     boolean isStaticMember() -> l
     com.android.tools.r8.graph.DexReference toReference() -> m
-com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.graph.M:
-com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.graph.N:
+com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.graph.N:
+com.android.tools.r8.graph.DexEncodedAnnotation -> com.android.tools.r8.graph.O:
     com.android.tools.r8.graph.DexAnnotationElement[] elements -> b
     com.android.tools.r8.graph.DexType type -> a
     int sorted -> c
@@ -16710,7 +16782,6 @@
     1:1:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):66:66 -> a
     2:2:int com.android.tools.r8.graph.DexString.compareTo(com.android.tools.r8.graph.DexString):241:241 -> a
     2:2:int lambda$sort$0(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):66 -> a
-    3:9:com.android.tools.r8.graph.DexEncodedAnnotation rewrite(java.util.function.Function,java.util.function.Function):81:87 -> a
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):29:30 -> collectIndexedItems
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):36:36 -> collectMixedSectionItems
     1:3:boolean equals(java.lang.Object):54:56 -> equals
@@ -16723,7 +16794,7 @@
     11:11:void sort():70:70 -> f
     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.O:
+com.android.tools.r8.graph.DexEncodedArray -> com.android.tools.r8.graph.P:
     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
@@ -16731,7 +16802,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.P:
+com.android.tools.r8.graph.DexEncodedField -> com.android.tools.r8.graph.Q:
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
     com.android.tools.r8.graph.DexEncodedField[] EMPTY_ARRAY -> f
     com.android.tools.r8.graph.DexField field -> a
@@ -16762,16 +16833,16 @@
     33:33:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     33:33:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):163 -> a
     34:38:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):164:168 -> a
-    39:39:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):166:166 -> a
+    39:39:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> a
     39:39:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):168 -> a
     40:40:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):169:169 -> a
-    41:41:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):166:166 -> a
+    41:41:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> a
     41:41:com.android.tools.r8.ir.code.ConstInstruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):168 -> a
     42:42:boolean lambda$mayTriggerClassInitializationSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):190:190 -> a
     43:43:java.lang.Boolean lambda$mayTriggerClassInitializationSideEffects$1(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):195:195 -> a
     44:51:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):202:209 -> a
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):65:66 -> collectIndexedItems
-    3:3:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):70:70 -> collectIndexedItems
+    3:3:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> collectIndexedItems
     3:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66 -> collectIndexedItems
     4:5:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):67:68 -> collectIndexedItems
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):74:74 -> collectMixedSectionItems
@@ -16792,7 +16863,7 @@
     1:1:java.lang.String toSmaliString():84:84 -> toSmaliString
     1:1:java.lang.String toSourceString():89:89 -> toSourceString
     1:1:java.lang.String toString():79:79 -> toString
-com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.Q:
+com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.S:
     com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo callSiteOptimizationInfo -> h
     boolean obsolete -> m
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
@@ -16858,8 +16929,8 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$402(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):80:80 -> a
     2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):80:80 -> a
     3:5:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):235:237 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1055 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
     6:6:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1317 -> a
     7:7:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):1318:1318 -> a
     8:8:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> a
@@ -16931,7 +17002,7 @@
     377:377:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):709 -> a
     378:382:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):714:718 -> a
     383:387:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):717:721 -> a
-    388:388:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    388:388:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     388:388:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):721 -> a
     389:389:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):721:721 -> a
     390:391:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):816:817 -> a
@@ -17059,12 +17130,12 @@
     1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1158:1162 -> x
     1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1153:1154 -> y
     1:1:java.util.Map getParameterInfo():504:504 -> z
-com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.Q$a:
+com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.S$a:
     int[] $SwitchMap$com$android$tools$r8$ir$optimize$Inliner$Constraint -> b
     int[] $SwitchMap$com$android$tools$r8$graph$DexEncodedMethod$CompilationState -> a
     1:1:void <clinit>():427:427 -> <clinit>
     2:2:void <clinit>():379:379 -> <clinit>
-com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.Q$b:
+com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.S$b:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> f
     com.android.tools.r8.graph.DexAnnotationSet annotations -> c
     com.android.tools.r8.graph.Code code -> e
@@ -17094,10 +17165,10 @@
     2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():216:216 -> c
     2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1273 -> c
     1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1278:1282 -> d
-com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> com.android.tools.r8.graph.Q$c:
+com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility -> com.android.tools.r8.graph.S$c:
     boolean returnsReceiver -> a
     1:2:void <init>(boolean):1102:1103 -> <init>
-com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.Q$d:
+com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.S$d:
     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
@@ -17110,21 +17181,21 @@
     25:25:void <clinit>():90:90 -> <clinit>
     1:1:void <init>(java.lang.String,int):90:90 -> <init>
     1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState[] values():90:90 -> a
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> com.android.tools.r8.graph.Q$e:
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer -> com.android.tools.r8.graph.S$e:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod$1):1107:1107 -> <init>
     2:2:void <init>():1109:1109 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
     boolean isTrivialInstanceInitializer() -> b
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> com.android.tools.r8.graph.Q$e$a:
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer -> com.android.tools.r8.graph.S$e$a:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):1141:1142 -> <init>
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialClassInitializer asTrivialClassInitializer() -> a
-com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.graph.S:
+com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer -> com.android.tools.r8.graph.T:
     com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer$TrivialInstanceInitializer INSTANCE -> a
     1:1:void <clinit>():1124:1124 -> <clinit>
     1:1:void <init>():1127:1127 -> <init>
     boolean isTrivialInstanceInitializer() -> b
-com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.T:
+com.android.tools.r8.graph.DexField -> com.android.tools.r8.graph.U:
     com.android.tools.r8.graph.DexString name -> e
     com.android.tools.r8.graph.DexType type -> d
     com.android.tools.r8.graph.DexType holder -> c
@@ -17163,7 +17234,7 @@
     1:1:java.lang.String toSmaliString():136:136 -> toSmaliString
     1:1:java.lang.String toSourceString():141:141 -> toSourceString
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.graph.DexItem -> com.android.tools.r8.graph.U:
+com.android.tools.r8.graph.DexItem -> com.android.tools.r8.graph.V:
     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
@@ -17177,253 +17248,251 @@
     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.V:
+com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.W:
     com.android.tools.r8.graph.DexString getDeclaredFieldName -> A0
     com.android.tools.r8.graph.DexString unboxLongMethodName -> Q
     com.android.tools.r8.graph.DexString mathDescriptor -> b1
-    com.android.tools.r8.graph.DexType methodHandleType -> F2
+    com.android.tools.r8.graph.DexType invocationHandlerType -> F2
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> m
+    com.android.tools.r8.kotlin.Kotlin kotlin -> r3
     java.util.concurrent.ConcurrentHashMap classTypeLatticeInterfaces -> q
     com.android.tools.r8.graph.DexString assertionErrorDescriptor -> I0
     com.android.tools.r8.graph.DexString proxyDescriptor -> j1
     com.android.tools.r8.graph.DexString nameMethodName -> r0
     com.android.tools.r8.graph.DexString shortDescriptor -> A
-    java.util.Map fields -> c
-    com.android.tools.r8.graph.DexType externalizableType -> W3
     com.android.tools.r8.graph.DexType intType -> V1
     com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> w2
+    java.util.concurrent.ConcurrentHashMap strings -> a
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> Z3
     com.android.tools.r8.graph.DexString getFieldName -> z0
-    java.util.Set libraryMethodsReturningNonNull -> g4
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> O3
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> g4
+    com.android.tools.r8.graph.DexType callSiteType -> O3
     com.android.tools.r8.graph.DexType classArrayType -> o2
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> a0
-    com.android.tools.r8.graph.DexType annotationSignature -> G3
+    com.android.tools.r8.graph.DexType annotationThrows -> G3
     com.android.tools.r8.graph.DexString unboxFloatMethodName -> R
     com.android.tools.r8.graph.DexType boxedShortType -> g2
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> p3
     com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> I1
     com.android.tools.r8.graph.DexString valueOfMethodName -> i0
     com.android.tools.r8.graph.DexString classLoaderDescriptor -> Q0
     com.android.tools.r8.graph.DexString comparatorDescriptor -> r1
     com.android.tools.r8.graph.DexString voidDescriptor -> B
-    java.util.Map protos -> d
-    com.android.tools.r8.graph.DexType runtimeExceptionType -> W2
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> i3
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> W2
     java.util.concurrent.ConcurrentHashMap referenceTypeLatticeElements -> p
     com.android.tools.r8.graph.DexString objectsDescriptor -> Y0
     com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> z1
-    com.android.tools.r8.graph.DexType mapEntryType -> O2
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> b4
-    boolean skipNameValidationForTesting -> l4
+    com.android.tools.r8.graph.DexType comparatorType -> O2
+    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> b4
+    java.util.IdentityHashMap internalSentinels -> m4
     com.android.tools.r8.graph.DexString icceDescriptor -> A1
     com.android.tools.r8.graph.DexString unboxDoubleMethodName -> S
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> k3
     com.android.tools.r8.graph.DexString booleanDescriptor -> t
     com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> i1
-    com.android.tools.r8.graph.DexType varHandleType -> E2
+    com.android.tools.r8.graph.DexType methodTypeType -> E2
     com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> H0
     com.android.tools.r8.graph.DexString classDescriptor -> P0
     com.android.tools.r8.graph.DexString collectionDescriptor -> q1
     com.android.tools.r8.graph.DexString ordinalMethodName -> q0
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> j3
     com.android.tools.r8.graph.DexType floatType -> U1
     com.android.tools.r8.graph.DexType strictMathType -> v2
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> C
-    com.android.tools.r8.graph.DexType serializableType -> V3
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> Y3
+    com.android.tools.r8.graph.DexType comparableType -> V3
     com.android.tools.r8.graph.DexString getDeclaredConstructorName -> y0
-    java.util.Set libraryMethodsReturningReceiver -> f4
     com.android.tools.r8.graph.DexType objectArrayType -> n2
-    java.util.Map methods -> e
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> N3
+    com.android.tools.r8.graph.DexType metafactoryType -> N3
     com.android.tools.r8.graph.DexString iterableDescriptor -> a1
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> d3
     com.android.tools.r8.graph.DexType boxedLongType -> f2
     com.android.tools.r8.graph.DexString isEmptyMethodName -> T
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> Z3
     com.android.tools.r8.graph.DexString byteDescriptor -> u
     com.android.tools.r8.graph.DexString trimName -> h0
     com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> H1
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> F3
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> s3
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> F3
     com.android.tools.r8.graph.DexString finalizeMethodName -> p0
     com.android.tools.r8.graph.DexString throwableArrayDescriptor -> P1
-    com.android.tools.r8.graph.DexType optionalType -> V2
+    com.android.tools.r8.graph.DexType throwableType -> V2
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> D
     com.android.tools.r8.graph.DexString annotationDescriptor -> X0
     com.android.tools.r8.graph.DexString throwableDescriptor -> y1
-    com.android.tools.r8.graph.DexType mapType -> N2
-    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> p3
-    java.util.Map methodHandles -> f
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> a4
-    com.android.tools.r8.graph.DexMethod stringConcatMethod -> e4
+    com.android.tools.r8.graph.DexType collectionType -> N2
     com.android.tools.r8.graph.DexString getDeclaredMethodName -> C0
     com.android.tools.r8.graph.DexString stringBuilderDescriptor -> d1
-    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> e3
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> z3
     java.util.Map setInlineFrames -> o
-    com.android.tools.r8.graph.DexType stringBufferType -> D2
+    com.android.tools.r8.graph.DexType methodHandleType -> D2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap defaults -> i
     com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> K0
     com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> l1
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> v3
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> l
     com.android.tools.r8.graph.DexString forNameMethodName -> t0
-    com.android.tools.r8.graph.DexType enumerationType -> U3
+    java.util.concurrent.ConcurrentHashMap methods -> e
+    com.android.tools.r8.graph.DexType externalizableType -> U3
     com.android.tools.r8.graph.DexType doubleType -> T1
     com.android.tools.r8.graph.DexType mathType -> u2
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> i4
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> M3
+    java.util.Set libraryClassesWithoutStaticInitialization -> i4
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> M3
     com.android.tools.r8.graph.DexString unboxByteMethodName -> M
     com.android.tools.r8.graph.DexType objectType -> m2
     com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> C1
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> c0
     com.android.tools.r8.graph.DexType boxedIntType -> e2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advancePCs -> h
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> E3
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> e3
+    com.android.tools.r8.graph.DexType annotationSignature -> E3
     com.android.tools.r8.graph.DexString constructorMethodName -> K1
     com.android.tools.r8.graph.DexString internMethodName -> k0
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> u3
     com.android.tools.r8.graph.DexString classArrayDescriptor -> S0
     com.android.tools.r8.graph.DexString supplierDescriptor -> t1
-    com.android.tools.r8.graph.DexType runnableType -> U2
-    com.android.tools.r8.graph.DexType setType -> M2
-    java.util.IdentityHashMap internalSentinels -> o4
+    java.util.concurrent.ConcurrentHashMap protos -> d
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> U2
+    com.android.tools.r8.graph.DexType mapEntryType -> M2
     com.android.tools.r8.graph.DexString unboxCharMethodName -> N
-    com.android.tools.r8.graph.DexMethod stringConcatWithConstantsMethod -> d4
+    boolean $assertionsDisabled -> n4
     com.android.tools.r8.graph.DexString strictMathDescriptor -> c1
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> q3
     com.android.tools.r8.graph.DexString getMethodName -> B0
-    com.android.tools.r8.graph.DexType stringBuilderType -> C2
-    com.android.tools.r8.graph.DexType npeType -> d3
+    com.android.tools.r8.graph.DexType varHandleType -> C2
     com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> k1
     com.android.tools.r8.graph.DexString charSequenceDescriptor -> J0
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap restartLocals -> k
-    java.util.Map strings -> a
     com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> s0
     com.android.tools.r8.graph.DexType charType -> S1
     com.android.tools.r8.graph.DexType iterableType -> t2
-    com.android.tools.r8.graph.DexType listIteratorType -> T3
+    java.util.concurrent.ConcurrentHashMap fields -> c
+    com.android.tools.r8.graph.DexType serializableType -> T3
+    java.util.Set libraryTypesAssumedToBePresent -> h4
     com.android.tools.r8.graph.DexType stringArrayType -> l2
-    com.android.tools.r8.graph.DexType nullValueType -> m4
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods utilArraysMethods -> i3
     com.android.tools.r8.graph.DexString unboxShortMethodName -> O
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> L3
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> L3
     com.android.tools.r8.graph.DexString unboxIntMethodName -> P
     com.android.tools.r8.graph.DexString indexOfMethodName -> b0
     com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> B1
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> X3
     com.android.tools.r8.graph.DexType boxedFloatType -> d2
-    com.android.tools.r8.graph.DexType annotationInnerClass -> D3
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> f3
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> D3
+    com.android.tools.r8.graph.DexString unknownTypeName -> l4
     com.android.tools.r8.graph.DexString toStringMethodName -> j0
     com.android.tools.r8.graph.DexString newUpdaterName -> J1
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap endLocals -> j
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> q3
     com.android.tools.r8.graph.DexString autoCloseableDescriptor -> R0
     com.android.tools.r8.graph.DexString callableDescriptor -> s1
-    java.util.Map types -> b
-    com.android.tools.r8.graph.DexType consumerType -> T2
+    com.android.tools.r8.graph.DexType optionalType -> T2
+    java.util.concurrent.ConcurrentHashMap types -> b
     com.android.tools.r8.graph.DexString collectionsDescriptor -> Z0
-    com.android.tools.r8.graph.DexType listType -> L2
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> n3
+    com.android.tools.r8.graph.DexItemFactory$EnumMethods enumMethods -> n3
+    com.android.tools.r8.graph.DexType mapType -> L2
+    com.android.tools.r8.graph.DexMethod stringConcatMethod -> c4
     com.android.tools.r8.graph.DexString assertionsDisabled -> E0
     com.android.tools.r8.graph.DexString varHandleDescriptor -> f1
-    com.android.tools.r8.graph.DexType autoCloseableType -> B2
-    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> c3
+    com.android.tools.r8.graph.DexType stringBufferType -> B2
+    com.android.tools.r8.graph.DexType reflectiveOperationExceptionType -> c3
     com.android.tools.r8.graph.DexString equalsMethodName -> Y
     com.android.tools.r8.graph.DexString longDescriptor -> z
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> m3
     com.android.tools.r8.graph.DexString stringArrayDescriptor -> M0
     com.android.tools.r8.graph.DexString setDescriptor -> n1
     com.android.tools.r8.graph.DexType boxedBooleanType -> Z1
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> t3
     com.android.tools.r8.graph.DexString getCanonicalNameName -> v0
-    java.util.Set libraryClassesWithoutStaticInitialization -> k4
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> Y3
-    com.android.tools.r8.graph.DexType iteratorType -> S3
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> s3
+    com.android.tools.r8.graph.DexType enumerationType -> S3
     com.android.tools.r8.graph.DexType byteType -> R1
     com.android.tools.r8.graph.DexType collectionsType -> s2
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> I
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> K3
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> k3
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> K3
     com.android.tools.r8.graph.DexType stringType -> k2
     com.android.tools.r8.graph.DexString npeDescriptor -> E1
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> r
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> e0
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> g3
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> C3
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> C3
     com.android.tools.r8.graph.DexType boxedDoubleType -> c2
-    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> j3
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> Z
     com.android.tools.r8.graph.DexString thisName -> M1
     com.android.tools.r8.graph.DexString wrapperFieldName -> m0
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> w3
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> w3
     com.android.tools.r8.graph.DexString fieldDescriptor -> U0
     com.android.tools.r8.graph.DexString runnableDescriptor -> v1
-    com.android.tools.r8.graph.DexType supplierType -> S2
-    boolean $assertionsDisabled -> p4
+    com.android.tools.r8.graph.DexType runnableType -> S2
     com.android.tools.r8.graph.DexString boxedShortDescriptor -> J
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> x3
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> K2
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> x3
+    com.android.tools.r8.graph.DexType setType -> K2
     com.android.tools.r8.graph.DexString stringBufferDescriptor -> e1
-    com.android.tools.r8.graph.DexType proxyType -> I2
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> h3
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> I2
     com.android.tools.r8.graph.DexString newInstanceName -> D0
+    java.util.Map libraryMethodsWithoutSideEffects -> f4
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap advanceLines -> g
-    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> b3
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> o3
+    com.android.tools.r8.graph.DexType npeType -> b3
     com.android.tools.r8.graph.DexString stringDescriptor -> L0
     com.android.tools.r8.graph.DexString listDescriptor -> m1
-    com.android.tools.r8.graph.DexType methodType -> A2
+    com.android.tools.r8.graph.DexType stringBuilderType -> A2
     com.android.tools.r8.graph.DexType voidType -> Y1
-    com.android.tools.r8.graph.DexType fieldType -> z2
+    com.android.tools.r8.graph.DexType autoCloseableType -> z2
     com.android.tools.r8.graph.DexString getNameName -> u0
-    java.util.Set libraryTypesAssumedToBePresent -> j4
     com.android.tools.r8.graph.DexType booleanType -> Q1
     com.android.tools.r8.graph.DexType objectsType -> r2
-    com.android.tools.r8.graph.DexType lookupType -> R3
+    com.android.tools.r8.graph.DexType listIteratorType -> R3
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> K
     com.android.tools.r8.graph.DexType charSequenceArrayType -> j2
+    com.android.tools.r8.graph.DexType nullValueType -> k4
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> l3
     com.android.tools.r8.graph.DexString compareToMethodName -> d0
     com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> D1
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> J3
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> J3
     java.util.Map setFiles -> n
     com.android.tools.r8.graph.DexType boxedCharType -> b2
-    com.android.tools.r8.graph.DexString unknownTypeName -> n4
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> c4
     com.android.tools.r8.graph.DexString convertMethodName -> l0
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> B3
+    com.android.tools.r8.graph.DexType annotationInnerClass -> B3
     com.android.tools.r8.graph.DexString classConstructorMethodName -> L1
-    com.android.tools.r8.graph.DexType icceType -> Z2
+    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> Z2
+    java.util.concurrent.ConcurrentHashMap methodHandles -> f
     com.android.tools.r8.graph.DexString constructorDescriptor -> T0
     com.android.tools.r8.graph.DexString consumerDescriptor -> u1
-    com.android.tools.r8.graph.DexType callableType -> R2
+    com.android.tools.r8.graph.DexType consumerType -> R2
     com.android.tools.r8.graph.DexString unboxBooleanMethodName -> L
-    com.android.tools.r8.graph.DexType serviceLoaderType -> J2
-    com.android.tools.r8.graph.DexType invocationHandlerType -> H2
+    com.android.tools.r8.graph.DexType listType -> J2
+    com.android.tools.r8.graph.DexType serviceLoaderType -> H2
+    boolean skipNameValidationForTesting -> j4
     com.android.tools.r8.graph.DexString lengthMethodName -> U
     com.android.tools.r8.graph.DexString charDescriptor -> v
     com.android.tools.r8.graph.DexString invokeExactMethodName -> G0
     com.android.tools.r8.graph.DexString methodTypeDescriptor -> h1
-    com.android.tools.r8.kotlin.Kotlin kotlin -> t3
-    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> a3
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> o3
+    com.android.tools.r8.graph.DexType noSuchFieldErrorType -> a3
     com.android.tools.r8.graph.DexString objectArrayDescriptor -> O0
     com.android.tools.r8.graph.DexString mapEntryDescriptor -> p1
     com.android.tools.r8.graph.DexType shortType -> X1
     com.android.tools.r8.graph.DexType classLoaderType -> y2
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> E
     com.android.tools.r8.graph.DexString getTypeNameName -> x0
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> u3
-    com.android.tools.r8.graph.DexType callSiteType -> Q3
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> W3
+    com.android.tools.r8.graph.DexType iteratorType -> Q3
     com.android.tools.r8.graph.DexType annotationType -> q2
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> m3
+    java.util.Set libraryMethodsReturningNonNull -> e4
     com.android.tools.r8.graph.DexType charSequenceType -> i2
-    com.android.tools.r8.graph.DexType annotationThrows -> I3
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> r3
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> I3
     com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> G1
     com.android.tools.r8.graph.DexString containsMethodName -> V
     com.android.tools.r8.graph.DexString doubleDescriptor -> w
     com.android.tools.r8.graph.DexString substringName -> g0
     com.android.tools.r8.graph.DexType boxedByteType -> a2
-    com.android.tools.r8.graph.DexType annotationDefault -> A3
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> A3
     com.android.tools.r8.graph.DexString getClassMethodName -> o0
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> Y2
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> y3
+    com.android.tools.r8.graph.DexItemFactory$StringMethods stringMethods -> h3
+    com.android.tools.r8.graph.DexType exceptionInInitializerErrorType -> Y2
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethods objectMethods -> g3
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> z3
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> F
     com.android.tools.r8.graph.DexString enumDescriptor -> W0
     com.android.tools.r8.graph.DexString arraysDescriptor -> x1
-    com.android.tools.r8.graph.DexType comparatorType -> Q2
-    com.android.tools.r8.graph.DexType methodTypeType -> G2
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> v3
+    com.android.tools.r8.graph.DexType supplierType -> Q2
+    com.android.tools.r8.graph.DexType proxyType -> G2
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> f3
     com.android.tools.r8.graph.DexString methodHandleDescriptor -> g1
     com.android.tools.r8.graph.DexString invokeMethodName -> F0
     com.android.tools.r8.graph.DexString startsWithMethodName -> W
@@ -17433,191 +17502,186 @@
     boolean sorted -> s
     com.android.tools.r8.graph.DexType longType -> W1
     com.android.tools.r8.graph.DexType classType -> x2
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> l3
-    com.android.tools.r8.graph.DexType comparableType -> X3
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> G
     com.android.tools.r8.graph.DexString getSimpleNameName -> w0
     com.android.tools.r8.graph.DexType charArrayType -> O1
     com.android.tools.r8.graph.DexType enumType -> p2
-    com.android.tools.r8.graph.DexType metafactoryType -> P3
-    java.util.Map libraryMethodsWithoutSideEffects -> h4
+    com.android.tools.r8.graph.DexType lookupType -> P3
+    java.util.Set libraryMethodsReturningReceiver -> d4
     com.android.tools.r8.graph.DexType boxedNumberType -> h2
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> H3
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> H3
     com.android.tools.r8.graph.DexString cloneMethodName -> f0
     com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> F1
     com.android.tools.r8.graph.DexString endsWithMethodName -> X
     com.android.tools.r8.graph.DexString intDescriptor -> y
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> a4
     com.android.tools.r8.graph.DexString initMethodName -> n0
     com.android.tools.r8.graph.DexString charArrayDescriptor -> N1
-    com.android.tools.r8.graph.DexType throwableType -> X2
+    com.android.tools.r8.graph.DexType icceType -> X2
+    com.android.tools.r8.graph.DexType annotationDefault -> y3
     com.android.tools.r8.graph.DexString methodDescriptor -> V0
     com.android.tools.r8.graph.DexString optionalDescriptor -> w1
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> H
-    com.android.tools.r8.graph.DexType collectionType -> P2
+    com.android.tools.r8.graph.DexType callableType -> P2
     1:41:void <clinit>():61:101 -> <clinit>
     1:1:void <init>():105:105 -> <init>
-    2:366:void <init>():65:429 -> <init>
-    367:415:void <init>():419:467 -> <init>
-    416:432:void <init>():457:473 -> <init>
-    433:451:void <init>():470:488 -> <init>
-    452:472:void <init>():479:499 -> <init>
-    473:505:void <init>():492:524 -> <init>
-    506:510:void <init>():523:527 -> <init>
-    511:514:void <init>():526:529 -> <init>
-    515:552:void <init>():520:557 -> <init>
-    553:555:void <init>():106:108 -> <init>
-    556:556:void <init>():107:107 -> <init>
+    2:364:void <init>():65:427 -> <init>
+    365:413:void <init>():417:465 -> <init>
+    414:430:void <init>():455:471 -> <init>
+    431:449:void <init>():468:486 -> <init>
+    450:470:void <init>():477:497 -> <init>
+    471:503:void <init>():490:522 -> <init>
+    504:508:void <init>():521:525 -> <init>
+    509:512:void <init>():524:527 -> <init>
+    513:550:void <init>():518:555 -> <init>
+    551:553:void <init>():106:108 -> <init>
+    554:554:void <init>():107:107 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$4(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:com.android.tools.r8.graph.DexType access$1900(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     2:2:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):432:433 -> a
-    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):445:447 -> a
-    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):534:534 -> a
-    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):534:534 -> a
-    10:10:void setSkipNameValidationForTesting(boolean):560:560 -> a
-    11:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1176:1177 -> a
+    3:4:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):430:431 -> a
+    5:7:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):443:445 -> a
+    8:8:com.android.tools.r8.utils.Pair lambda$mapToPredicate$1(java.util.function.Predicate,com.android.tools.r8.graph.DexMethod):532:532 -> a
+    9:9:java.util.stream.Stream mapToPredicate(java.util.Set,java.util.function.Predicate):532:532 -> a
+    10:10:void setSkipNameValidationForTesting(boolean):558:558 -> a
+    11:12:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1156:1157 -> a
     13:13:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
-    13:13:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1177 -> a
-    14:15:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1177:1178 -> a
-    16:17:com.android.tools.r8.graph.DexString createString(int,byte[]):1183:1184 -> a
-    18:19:com.android.tools.r8.graph.DexString createString(java.lang.String):1188:1189 -> a
-    20:20:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1225:1225 -> a
-    21:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1251:1252 -> a
-    23:25: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):1256:1258 -> a
-    26:26:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1262:1262 -> a
-    27:29: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):1266:1268 -> a
-    30:33:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1272:1275 -> a
-    34:39:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1341:1346 -> a
-    34:39:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1276 -> a
-    40:40:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1273:1273 -> a
-    41:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1280:1280 -> a
-    42:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1290:1293 -> a
-    46:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1292:1294 -> a
-    49:53:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1307:1311 -> a
-    54:63:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1328:1337 -> a
-    54:63:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1311 -> a
-    64:70:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1312:1318 -> a
-    71:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1317:1321 -> a
-    76:78: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):1350:1352 -> a
-    79:79:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1356:1356 -> a
-    80:82:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1363:1365 -> a
-    83:84: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):1374:1375 -> a
-    85:94: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[]):1383:1392 -> a
-    95:97:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1396:1398 -> a
-    98:100:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1434:1436 -> a
-    101:103:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1441:1443 -> a
-    104:104:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1451:1451 -> a
-    105:107:void clearTypeLatticeElementsCache():1455:1457 -> a
-    108:115:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1484:1491 -> a
-    116:144:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1490:1518 -> a
-    145:153:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1498:1506 -> a
-    154:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1505:1516 -> a
-    166:167:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1523:1524 -> a
-    168:169:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1527:1528 -> a
-    170:174:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1535:1539 -> a
-    175:175:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1536:1536 -> a
-    176:182:void sort(com.android.tools.r8.naming.NamingLens):1544:1550 -> a
-    183:183:void forAllTypes(java.util.function.Consumer):1567:1567 -> a
-    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1229:1235 -> b
-    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1234:1236 -> b
+    13:13:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1157 -> a
+    14:15:com.android.tools.r8.graph.DexItem canonicalize(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexItem):1157:1158 -> a
+    16:17:com.android.tools.r8.graph.DexString createString(int,byte[]):1163:1164 -> a
+    18:19:com.android.tools.r8.graph.DexString createString(java.lang.String):1168:1169 -> a
+    20:20:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$3(com.android.tools.r8.dex.ClassesChecksum,com.android.tools.r8.dex.ClassesChecksum):1205:1205 -> a
+    21:22:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1231:1232 -> a
+    23:25: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):1236:1238 -> a
+    26:26:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1242:1242 -> a
+    27:29: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):1246:1248 -> a
+    30:33:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1252:1255 -> a
+    34:39:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1321:1326 -> a
+    34:39:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1256 -> a
+    40:40:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):1253:1253 -> a
+    41:41:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):1260:1260 -> a
+    42:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1270:1273 -> a
+    46:48:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):1272:1274 -> a
+    49:53:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1287:1291 -> a
+    54:63:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):1308:1317 -> a
+    54:63:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1291 -> a
+    64:70:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1292:1298 -> a
+    71:75:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):1297:1301 -> a
+    76:78: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):1330:1332 -> a
+    79:79:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):1336:1336 -> a
+    80:82:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.Descriptor,boolean):1343:1345 -> a
+    83:84: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):1354:1355 -> a
+    85:94: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[]):1363:1372 -> a
+    95:97:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):1376:1378 -> a
+    98:100:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):1414:1416 -> a
+    101:103:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):1421:1423 -> a
+    104:104:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):1431:1431 -> a
+    105:107:void clearTypeLatticeElementsCache():1435:1437 -> a
+    108:115:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1464:1471 -> a
+    116:144:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement createReferenceTypeLatticeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):1470:1498 -> a
+    145:153:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1478:1486 -> a
+    154:165:com.android.tools.r8.ir.analysis.type.ReferenceTypeLatticeElement lambda$createReferenceTypeLatticeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DexType):1485:1496 -> a
+    166:167:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1503:1504 -> a
+    168:169:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1507:1508 -> a
+    170:174:void assignSortedIndices(java.util.Collection,com.android.tools.r8.naming.NamingLens):1515:1519 -> a
+    175:175:int lambda$assignSortedIndices$7(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):1516:1516 -> a
+    176:182:void sort(com.android.tools.r8.naming.NamingLens):1524:1530 -> a
+    183:183:void forAllTypes(java.util.function.Consumer):1547:1547 -> a
+    1:7:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1209:1215 -> b
+    8:10:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1214:1216 -> b
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> b
-    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1236 -> b
-    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1236:1237 -> b
-    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1243:1243 -> b
-    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1402:1404 -> b
-    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1426:1426 -> b
-    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1447:1447 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):568:568 -> c
-    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1193:1193 -> c
-    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1247:1247 -> c
-    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1408:1410 -> c
-    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1430:1430 -> c
-    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1224:1225 -> d
-    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1224:1224 -> d
-    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1414:1416 -> d
-    1:5:java.util.Collection extractMarker():1199:1203 -> e
-    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1420:1422 -> e
-    1:5:java.util.List extractMarkers():1213:1217 -> f
-    1:1:boolean getSkipNameValidationForTesting():564:564 -> g
-    1:10:void resetSortedIndices():1554:1563 -> h
-    1:3:boolean verifyNoCachedTypeLatticeElements():1461:1463 -> i
-    1:12:java.util.Set boxedValueOfMethods():442:453 -> j
-com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.V$a:
-com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.V$b:
+    11:11:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1216 -> b
+    12:13:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1216:1217 -> b
+    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):1223:1223 -> b
+    15:17:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):1382:1384 -> b
+    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():1406:1406 -> b
+    19:19:boolean isConstructor(com.android.tools.r8.graph.DexMethod):1427:1427 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):566:566 -> c
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1173:1173 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1227:1227 -> c
+    4:6:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):1388:1390 -> c
+    7:7:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():1410:1410 -> c
+    1:2:com.android.tools.r8.dex.ClassesChecksum extractChecksum():1204:1205 -> d
+    3:3:com.android.tools.r8.dex.ClassesChecksum lambda$extractChecksum$2(com.android.tools.r8.graph.DexString):1204:1204 -> d
+    4:6:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):1394:1396 -> d
+    1:5:java.util.Collection extractMarker():1179:1183 -> e
+    6:8:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):1400:1402 -> e
+    1:5:java.util.List extractMarkers():1193:1197 -> f
+    1:1:boolean getSkipNameValidationForTesting():562:562 -> g
+    1:10:void resetSortedIndices():1534:1543 -> h
+    1:3:boolean verifyNoCachedTypeLatticeElements():1441:1443 -> i
+    1:12:java.util.Set boxedValueOfMethods():440:451 -> j
+com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.W$a:
+com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.W$b:
     com.android.tools.r8.graph.DexMethod initMessageAndCause -> b
     com.android.tools.r8.graph.DexMethod initMessage -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):618:618 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):622:627 -> <init>
-com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.V$c:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):616:616 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):620:625 -> <init>
+com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.W$c:
     java.util.Set updaters -> d
     com.android.tools.r8.graph.DexMethod referenceUpdater -> c
     com.android.tools.r8.graph.DexMethod longUpdater -> b
     com.android.tools.r8.graph.DexMethod intUpdater -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):850:850 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):856:875 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):879:879 -> a
-com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.V$d:
-    com.android.tools.r8.graph.DexMethod newInstance -> m
-    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> l
-    com.android.tools.r8.graph.DexMethod getMethod -> k
-    com.android.tools.r8.graph.DexMethod getDeclaredField -> j
-    com.android.tools.r8.graph.DexMethod getField -> i
-    com.android.tools.r8.graph.DexMethod getDeclaredConstructor -> h
-    com.android.tools.r8.graph.DexMethod getTypeName -> g
-    com.android.tools.r8.graph.DexMethod getSimpleName -> f
-    com.android.tools.r8.graph.DexMethod getCanonicalName -> e
-    com.android.tools.r8.graph.DexMethod getName -> d
-    com.android.tools.r8.graph.DexMethod forName3 -> c
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):830:830 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):836:855 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):859:859 -> a
+com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.W$d:
+    com.android.tools.r8.graph.DexMethod newInstance -> l
+    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> k
+    com.android.tools.r8.graph.DexMethod getMethod -> j
+    com.android.tools.r8.graph.DexMethod getDeclaredField -> i
+    com.android.tools.r8.graph.DexMethod getField -> h
+    com.android.tools.r8.graph.DexMethod getDeclaredConstructor -> g
+    com.android.tools.r8.graph.DexMethod getTypeName -> f
+    com.android.tools.r8.graph.DexMethod getSimpleName -> e
+    com.android.tools.r8.graph.DexMethod getCanonicalName -> d
+    com.android.tools.r8.graph.DexMethod getName -> c
     com.android.tools.r8.graph.DexMethod forName -> b
     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):661:661 -> <init>
-    2:41:void <init>(com.android.tools.r8.graph.DexItemFactory):679:718 -> <init>
-    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):661:661 -> a
-    2:2:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):722:722 -> a
-    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):726:726 -> b
-    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):730:730 -> c
-com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.V$e:
+    java.util.Set getMembers -> m
+    java.util.Set getNames -> n
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):659:659 -> <init>
+    2:31:void <init>(com.android.tools.r8.graph.DexItemFactory):676:705 -> <init>
+    1:1:java.util.Set access$1700(com.android.tools.r8.graph.DexItemFactory$ClassMethods):659:659 -> a
+    2:2:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):709:709 -> a
+    1:1:boolean isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):713:713 -> b
+com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.W$e:
     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):734:734 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):738:740 -> <init>
-com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.graph.V$f:
-    com.android.tools.r8.graph.DexItemFactory this$0 -> f
-    com.android.tools.r8.graph.DexMethod finalize -> e
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):717:717 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):721:723 -> <init>
+com.android.tools.r8.graph.DexItemFactory$EnumMethods -> com.android.tools.r8.graph.W$f:
     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 <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):748:748 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):758:758 -> <init>
-    3:26:void <init>(com.android.tools.r8.graph.DexItemFactory):755:778 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.V$g:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):731:731 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):738:758 -> <init>
+com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.W$g:
     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):581:581 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):585:589 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):587:587 -> <init>
-com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.graph.V$h:
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):571:571 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):575:577 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):576:576 -> <init>
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.V$i:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):579:579 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):583:587 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):585:585 -> <init>
+com.android.tools.r8.graph.DexItemFactory$LongMethods -> com.android.tools.r8.graph.W$h:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):569:569 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):573:575 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):574:574 -> <init>
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.W$i:
     com.android.tools.r8.graph.DexMethod init -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):786:786 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):790:792 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.graph.V$j:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):766:766 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):770:772 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectMethods -> com.android.tools.r8.graph.W$j:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod finalize -> c
     com.android.tools.r8.graph.DexMethod constructor -> b
     com.android.tools.r8.graph.DexMethod getClass -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):632:632 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):639:646 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.V$k:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):630:630 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):637:644 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.W$k:
     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):651:651 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):655:657 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):656:656 -> <init>
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.V$l:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):649:649 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):653:655 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexItemFactory):654:654 -> <init>
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.W$l:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -17625,10 +17689,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):1064:1099 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1107:1117 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):1124:1129 -> a
-com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.V$m:
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1044:1079 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1087:1097 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1104:1109 -> a
+com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.W$m:
     com.android.tools.r8.graph.DexField longTYPE -> f
     com.android.tools.r8.graph.DexField intTYPE -> e
     com.android.tools.r8.graph.DexField doubleTYPE -> h
@@ -17638,25 +17702,25 @@
     com.android.tools.r8.graph.DexField booleanTYPE -> a
     com.android.tools.r8.graph.DexField shortTYPE -> d
     com.android.tools.r8.graph.DexField charTYPE -> c
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):806:806 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):818:838 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):842:842 -> a
-com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.V$n:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):786:786 -> <init>
+    2:22:void <init>(com.android.tools.r8.graph.DexItemFactory):798:818 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):822:822 -> a
+com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.W$n:
     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):1133:1133 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1137:1142 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1139:1139 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.V$o:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1113:1113 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1117:1122 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1119:1119 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.W$o:
     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):1146:1146 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1153:1159 -> <init>
-    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1157:1165 -> <init>
-    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1162:1167 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1171:1171 -> a
-com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.V$p:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1126:1126 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1133:1139 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1137:1145 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1142:1147 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1151:1151 -> a
+com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.W$p:
     com.android.tools.r8.graph.DexMethod defaultConstructor -> o
     com.android.tools.r8.graph.DexMethod charSequenceConstructor -> n
     com.android.tools.r8.graph.DexMethod appendStringBuffer -> m
@@ -17678,14 +17742,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>():956:956 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):956:956 -> <init>
-    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):980:1024 -> <init>
-    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):956:956 -> a
-    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1029:1029 -> a
-    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1033:1059 -> a
-    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):956:956 -> b
-com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.graph.V$q:
+    1:1:void <clinit>():936:936 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):936:936 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):960:1004 -> <init>
+    1:1:java.util.Set access$1600(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):936:936 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1009:1009 -> a
+    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1013:1039 -> a
+    1:1:java.util.Set access$1800(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):936:936 -> b
+com.android.tools.r8.graph.DexItemFactory$StringMethods -> com.android.tools.r8.graph.W$q:
     com.android.tools.r8.graph.DexMethod hashCode -> o
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> n
     com.android.tools.r8.graph.DexMethod compareTo -> m
@@ -17706,26 +17770,26 @@
     com.android.tools.r8.graph.DexMethod intern -> r
     com.android.tools.r8.graph.DexMethod toString -> q
     com.android.tools.r8.graph.DexMethod valueOf -> p
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):883:883 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):908:908 -> <init>
-    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):906:951 -> <init>
-com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.V$r:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):863:863 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):888:888 -> <init>
+    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):886:931 -> <init>
+com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.W$r:
     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):595:595 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):602:604 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):603:606 -> <init>
-    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):605:612 -> <init>
-    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):610:610 -> <init>
-com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.W:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):593:593 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):600:602 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):601:604 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):603:610 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):608:608 -> <init>
+com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.X:
     boolean $assertionsDisabled -> s
     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>
     com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo() -> C
-    boolean isLibraryClass() -> R
-    boolean isNotProgramClass() -> W
+    boolean isLibraryClass() -> Q
+    boolean isNotProgramClass() -> V
     1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74:74 -> a
     2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():118:118 -> a
     2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):74 -> a
@@ -17739,7 +17803,7 @@
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> p
     1:1:java.lang.String toSourceString():92:92 -> toSourceString
     1:1:java.lang.String toString():87:87 -> toString
-com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.X:
+com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.Y:
     com.android.tools.r8.graph.Descriptor item -> a
     com.android.tools.r8.graph.DexItem annotations -> b
     1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexItem):14:16 -> <init>
@@ -17747,13 +17811,13 @@
     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.X$a:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.graph.Y$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.X$b:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.graph.Y$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.X$c:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.graph.Y$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.Y:
+com.android.tools.r8.graph.DexMethod -> com.android.tools.r8.graph.Z:
     com.android.tools.r8.graph.DexProto proto -> d
     com.android.tools.r8.graph.DexString name -> e
     com.android.tools.r8.graph.DexType holder -> c
@@ -17812,7 +17876,7 @@
     1:1:java.lang.String toSmaliString():166:166 -> toSmaliString
     1:1:java.lang.String toSourceString():171:171 -> toSourceString
     1:1:java.lang.String toString():35:35 -> toString
-com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.Z:
+com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.a0:
     com.android.tools.r8.graph.Descriptor fieldOrMethod -> d
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> c
     boolean isInterface -> e
@@ -17901,7 +17965,7 @@
     7:7:boolean isStaticHandle():301 -> j
     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.Z$a:
+com.android.tools.r8.graph.DexMethodHandle$MethodHandleType -> com.android.tools.r8.graph.a0$a:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_CONSTRUCTOR -> h
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType INVOKE_INSTANCE -> g
@@ -17966,7 +18030,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.a0:
+com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.b0:
     java.util.Collection synthesizedFrom -> u
     com.android.tools.r8.kotlin.KotlinInfo kotlinInfo -> w
     com.android.tools.r8.graph.DexEncodedArray staticValues -> t
@@ -17981,8 +18045,8 @@
     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,java.util.Collection):92:92 -> <init>
     4:87: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,java.util.Collection):29:112 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinInfo getKotlinInfo():234:234 -> C
-    boolean isNotProgramClass() -> W
-    boolean isProgramClass() -> X
+    boolean isNotProgramClass() -> V
+    boolean isProgramClass() -> W
     1:5:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):177:181 -> a
     6:9:void sortMembers():364:367 -> a
     6:9:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):185 -> a
@@ -17999,21 +18063,22 @@
     1:3:void synchronizedCollectAll(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexItem[]):157:159 -> b
     4:6:void synchronizedCollectAll(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexItem[]):202:204 -> b
     7:7:java.util.Iterator lambda$asProgramClasses$2(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):444:444 -> b
+    1:12:void computeStaticValues():291:302 -> b0
+    13:13:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):150:150 -> b0
+    13:13:void computeStaticValues():302 -> b0
+    14:16:void computeStaticValues():308:310 -> b0
     1:3:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):270:272 -> c
     4:6:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedMethod[]):276:278 -> c
     7:7:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:357 -> c
     8:8:boolean com.android.tools.r8.graph.MethodAccessFlags.isConstructor():170:170 -> c
     8:8:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):358 -> c
     9:12:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):357:360 -> c
-    1:12:void computeStaticValues():291:302 -> c0
-    13:13:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):166:166 -> c0
-    13:13:void computeStaticValues():302 -> c0
-    14:16:void computeStaticValues():308:310 -> c0
+    1:2:int getInitialClassFileVersion():397:398 -> c0
     1:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):126:133 -> collectIndexedItems
     9:9:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):231:231 -> collectIndexedItems
     9:9:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):134 -> collectIndexedItems
     10:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):136:136 -> collectIndexedItems
-    11:11:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):70:70 -> collectIndexedItems
+    11:11:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):66:66 -> collectIndexedItems
     11:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):137 -> collectIndexedItems
     12:24:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):139:151 -> collectIndexedItems
     1:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):168:171 -> collectMixedSectionItems
@@ -18031,25 +18096,24 @@
     12:14:void sortEncodedFields(com.android.tools.r8.graph.DexEncodedField[]):371:373 -> d
     15:17:void sortEncodedMethods(com.android.tools.r8.graph.DexEncodedMethod[]):377:379 -> d
     18:19:void setInitialClassFileVersion(int):388:389 -> d
-    1:2:int getInitialClassFileVersion():397:398 -> d0
+    1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():331:332 -> d0
     1:1:com.android.tools.r8.graph.DexMethod lambda$sortEncodedMethods$1(com.android.tools.r8.graph.DexEncodedMethod):378:378 -> e
-    1:2:com.android.tools.r8.graph.DexEncodedArray getStaticValues():331:332 -> e0
-    1:1:java.util.Collection getSynthesizedFrom():163:163 -> f0
-    1:5:boolean hasAnnotations():255:259 -> g0
-    1:1:boolean hasClassFileVersion():393:393 -> h0
+    1:1:java.util.Collection getSynthesizedFrom():163:163 -> e0
+    1:5:boolean hasAnnotations():255:259 -> f0
+    1:1:boolean hasClassFileVersion():393:393 -> g0
+    1:1:boolean hasMethods():247:247 -> h0
     1:1:boolean hasMethods():247:247 -> i0
-    1:1:boolean hasMethods():247:247 -> j0
-    1:1:boolean hasMethodsOrFields():251 -> j0
-    2:2:boolean hasFields():243:243 -> j0
-    2:2:boolean hasMethodsOrFields():251 -> j0
-    1:4:boolean hasOnlyInternalizableAnnotations():263:266 -> k0
-    1:4:boolean isSorted():315:318 -> l0
-    1:1:boolean originatesFromClassResource():120:120 -> m0
-    1:1:boolean originatesFromDexResource():116:116 -> n0
+    1:1:boolean hasMethodsOrFields():251 -> i0
+    2:2:boolean hasFields():243:243 -> i0
+    2:2:boolean hasMethodsOrFields():251 -> i0
+    1:4:boolean hasOnlyInternalizableAnnotations():263:266 -> j0
+    1:4:boolean isSorted():315:318 -> k0
+    1:1:boolean originatesFromClassResource():120:120 -> l0
+    1:1:boolean originatesFromDexResource():116:116 -> m0
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> q
     1:1:java.lang.String toSourceString():214:214 -> toSourceString
     1:1:java.lang.String toString():209:209 -> toString
-com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.a0$a:
+com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.b0$a:
     java.util.Iterator iterator -> b
     com.android.tools.r8.graph.DexProgramClass next -> a
     java.lang.Iterable val$types -> c
@@ -18059,7 +18123,7 @@
     1:1:boolean hasNext():452:452 -> hasNext
     1:2:com.android.tools.r8.graph.DexProgramClass next():457:458 -> next
     1:2:java.lang.Object next():444 -> next
-com.android.tools.r8.graph.DexProto -> com.android.tools.r8.graph.b0:
+com.android.tools.r8.graph.DexProto -> com.android.tools.r8.graph.c0:
     com.android.tools.r8.graph.DexString shorty -> c
     com.android.tools.r8.graph.DexTypeList parameters -> e
     com.android.tools.r8.graph.DexProto SENTINEL -> f
@@ -18099,7 +18163,7 @@
     1:1:java.lang.String toDescriptorString():99:99 -> toSmaliString
     1:1:java.lang.String toSmaliString():95 -> toSmaliString
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.graph.DexReference -> com.android.tools.r8.graph.c0:
+com.android.tools.r8.graph.DexReference -> com.android.tools.r8.graph.d0:
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     1:1:java.util.stream.Stream filterDexReference(java.util.stream.Stream):59:59 -> a
@@ -18112,7 +18176,7 @@
     boolean isDexField() -> k
     boolean isDexMethod() -> l
     boolean isDexType() -> m
-com.android.tools.r8.graph.DexString -> com.android.tools.r8.graph.d0:
+com.android.tools.r8.graph.DexString -> com.android.tools.r8.graph.e0:
     boolean $assertionsDisabled -> f
     byte[] content -> d
     int size -> c
@@ -18165,7 +18229,7 @@
     16:25:java.lang.String decode():130:139 -> n
     26:30:java.lang.String decode():137:141 -> n
     1:3:java.lang.String toString():92:94 -> toString
-com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.graph.d0$a:
+com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.graph.e0$a:
     com.android.tools.r8.graph.DexString this$0 -> b
     boolean $assertionsDisabled -> c
     int i -> a
@@ -18174,7 +18238,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.e0:
+com.android.tools.r8.graph.DexType -> com.android.tools.r8.graph.f0:
     com.android.tools.r8.graph.DexString descriptor -> c
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType[] EMPTY_ARRAY -> e
@@ -18243,7 +18307,7 @@
     1:1:boolean isDoubleType():224:224 -> x
     1:1:boolean isIntType():212:212 -> y
     1:1:boolean isLongType():220:220 -> z
-com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.f0:
+com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.g0:
     com.android.tools.r8.graph.DexType[] values -> a
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> b
     boolean $assertionsDisabled -> c
@@ -18270,397 +18334,389 @@
     1:1:void <init>():27:27 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo) -> a
     void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
-    1:22:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):77:98 -> a
-    23:36:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):92:105 -> a
-    37:57:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):133:153 -> a
-    58:74:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):135:151 -> a
-    75:75:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):145:145 -> a
-    76:82:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):143:149 -> a
-    83:83:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):139:139 -> a
-    84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):137:137 -> a
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):116:116 -> collectMixedSectionItems
+    1:22:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):61:82 -> a
+    23:36:com.android.tools.r8.graph.DexValue fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):76:89 -> a
+    37:57:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):117:137 -> a
+    58:74:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):119:135 -> a
+    75:75:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):129:129 -> a
+    76:82:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):127:133 -> a
+    83:83:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):123:123 -> a
+    84:84:com.android.tools.r8.graph.DexValue defaultForType(com.android.tools.r8.graph.DexType):121:121 -> a
+    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):100:100 -> collectMixedSectionItems
     java.lang.Object asAsmEncodedObject() -> f
-    com.android.tools.r8.graph.DexValue$DexValueArray asDexValueArray() -> g
-    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> h
-    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> i
-    com.android.tools.r8.graph.DexValue$DexValueType asDexValueType() -> j
-    java.lang.Object getBoxedValue() -> k
-    boolean isDexValueArray() -> l
-    boolean isDexValueType() -> m
-    boolean mayHaveSideEffects() -> n
-    void sort() -> o
+    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> g
+    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> h
+    java.lang.Object getBoxedValue() -> i
+    boolean mayHaveSideEffects() -> j
+    void sort() -> k
 com.android.tools.r8.graph.DexValue$1 -> com.android.tools.r8.graph.DexValue$a:
 com.android.tools.r8.graph.DexValue$DexItemBasedValueString -> com.android.tools.r8.graph.DexValue$b:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():792:792 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):797:798 -> <init>
-    1:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):818:825 -> a
-    9:9:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):833:833 -> 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):725:725 -> collectIndexedItems
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):792 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):792:792 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():807:807 -> f
-    1:1:int hashCode():792:792 -> hashCode
-    1:1:java.lang.Object getBoxedValue():792:792 -> k
-    void sort() -> o
-    byte getValueKind() -> p
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():802:802 -> q
-    1:1:java.lang.String toString():792:792 -> toString
+    1:1:void <clinit>():776:776 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):781:782 -> <init>
+    1:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):802:809 -> a
+    9:9:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):817:817 -> 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):709:709 -> collectIndexedItems
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):776 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):776:776 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():791:791 -> f
+    1:1:int hashCode():776:776 -> hashCode
+    1:1:java.lang.Object getBoxedValue():776:776 -> i
+    void sort() -> k
+    byte getValueKind() -> l
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():786:786 -> m
+    1:1:java.lang.String toString():776:776 -> toString
 com.android.tools.r8.graph.DexValue$DexValueAnnotation -> com.android.tools.r8.graph.DexValue$c:
     com.android.tools.r8.graph.DexEncodedAnnotation value -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):1024:1025 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexEncodedAnnotation):988:989 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1036 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1037:1037 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1031:1031 -> collectIndexedItems
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1000 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1001:1001 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):995:995 -> collectIndexedItems
     2:3:void com.android.tools.r8.graph.DexEncodedAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):29:30 -> collectIndexedItems
-    2:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1031 -> collectIndexedItems
-    1:3:boolean equals(java.lang.Object):1065:1067 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1047:1047 -> f
-    1:1:int hashCode():1057:1057 -> hashCode
-    1:1:java.lang.Object getBoxedValue():1042:1042 -> k
-    1:1:void sort():1052:1052 -> o
-    1:1:java.lang.String toString():1074:1074 -> toString
+    2:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):995 -> collectIndexedItems
+    1:3:boolean equals(java.lang.Object):1029:1031 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1011:1011 -> f
+    1:1:int hashCode():1021:1021 -> hashCode
+    1:1:java.lang.Object getBoxedValue():1006:1006 -> i
+    1:1:void sort():1016:1016 -> k
+    1:1:java.lang.String toString():1038:1038 -> toString
 com.android.tools.r8.graph.DexValue$DexValueArray -> com.android.tools.r8.graph.DexValue$d:
     com.android.tools.r8.graph.DexValue[] values -> c
-    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):947:948 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:2:void <init>(com.android.tools.r8.graph.DexValue[]):921:922 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):963 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):964:964 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):937 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):938:938 -> a
     3:3:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):80:80 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):964 -> a
-    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):965:966 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):958:958 -> collectIndexedItems
-    1:3:boolean equals(java.lang.Object):997:999 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():977:977 -> f
-    com.android.tools.r8.graph.DexValue$DexValueArray asDexValueArray() -> g
-    1:1:int hashCode():989:989 -> hashCode
-    1:1:java.lang.Object getBoxedValue():972:972 -> k
-    boolean isDexValueArray() -> l
-    1:2:void sort():982:983 -> o
-    1:1:com.android.tools.r8.graph.DexValue[] getValues():952:952 -> p
-    1:1:java.lang.String toString():1006:1006 -> toString
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):938 -> a
+    4:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):939:940 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):932:932 -> collectIndexedItems
+    1:3:boolean equals(java.lang.Object):971:973 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():951:951 -> f
+    1:1:int hashCode():963:963 -> hashCode
+    1:1:java.lang.Object getBoxedValue():946:946 -> i
+    1:2:void sort():956:957 -> k
+    1:1:com.android.tools.r8.graph.DexValue[] getValues():926:926 -> l
+    1:1:java.lang.String toString():980:980 -> toString
 com.android.tools.r8.graph.DexValue$DexValueBoolean -> com.android.tools.r8.graph.DexValue$e:
     com.android.tools.r8.graph.DexValue$DexValueBoolean TRUE -> d
     com.android.tools.r8.graph.DexValue$DexValueBoolean FALSE -> e
     com.android.tools.r8.graph.DexValue$DexValueBoolean DEFAULT -> f
     boolean value -> c
-    1:4:void <clinit>():1132:1135 -> <clinit>
-    1:2:void <init>(boolean):1139:1140 -> <init>
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1144:1144 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1158:1158 -> a
-    3:3:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:4:void <clinit>():1096:1099 -> <clinit>
+    1:2:void <init>(boolean):1103:1104 -> <init>
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1108:1108 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1122:1122 -> a
+    3:3:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     3:3:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1158 -> a
-    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1187:1187 -> a
-    1:1:boolean equals(java.lang.Object):1176:1176 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1163:1163 -> f
-    1:1:boolean getValue():1148:1148 -> getValue
-    1:1:int hashCode():1168:1168 -> hashCode
-    1:1:java.lang.Object getBoxedValue():1153:1153 -> k
-    boolean mayHaveSideEffects() -> n
-    void sort() -> o
-    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1130:1130 -> p
-    1:1:java.lang.String toString():1181:1181 -> toString
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1122 -> a
+    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1151:1151 -> a
+    1:1:boolean equals(java.lang.Object):1140:1140 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1127:1127 -> f
+    1:1:boolean getValue():1112:1112 -> getValue
+    1:1:int hashCode():1132:1132 -> hashCode
+    1:1:java.lang.Object getBoxedValue():1117:1117 -> i
+    boolean mayHaveSideEffects() -> j
+    void sort() -> k
+    1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean access$000():1094:1094 -> l
+    1:1:java.lang.String toString():1145:1145 -> toString
 com.android.tools.r8.graph.DexValue$DexValueByte -> com.android.tools.r8.graph.DexValue$f:
     byte value -> c
     com.android.tools.r8.graph.DexValue$DexValueByte DEFAULT -> d
-    1:1:void <clinit>():273:273 -> <clinit>
-    1:2:void <init>(byte):277:278 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:1:void <clinit>():257:257 -> <clinit>
+    1:2:void <init>(byte):261:262 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):296 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):297:297 -> a
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):280 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):281:281 -> a
     3:3:int com.android.tools.r8.dex.DexOutputBuffer.putSignedEncodedValue(long,int):88:88 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):297 -> a
-    4:4:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):282:282 -> a
-    5:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):326:326 -> a
-    1:1:boolean equals(java.lang.Object):315:315 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():302:302 -> f
-    1:1:byte getValue():286:286 -> getValue
-    1:1:int hashCode():307:307 -> hashCode
-    1:1:java.lang.Object getBoxedValue():291:291 -> k
-    boolean mayHaveSideEffects() -> n
-    void sort() -> o
-    1:1:java.lang.String toString():320:320 -> toString
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):281 -> a
+    4:4:com.android.tools.r8.graph.DexValue$DexValueByte create(byte):266:266 -> a
+    5:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):310:310 -> a
+    1:1:boolean equals(java.lang.Object):299:299 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():286:286 -> f
+    1:1:byte getValue():270:270 -> getValue
+    1:1:int hashCode():291:291 -> hashCode
+    1:1:java.lang.Object getBoxedValue():275:275 -> i
+    boolean mayHaveSideEffects() -> j
+    void sort() -> k
+    1:1:java.lang.String toString():304:304 -> toString
 com.android.tools.r8.graph.DexValue$DexValueChar -> com.android.tools.r8.graph.DexValue$g:
     com.android.tools.r8.graph.DexValue$DexValueChar DEFAULT -> d
     char value -> c
-    1:1:void <clinit>():389:389 -> <clinit>
-    1:2:void <init>(char):392:393 -> <init>
-    1:1:com.android.tools.r8.graph.DexValue$DexValueChar create(char):397:397 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):411:412 -> a
+    1:1:void <clinit>():373:373 -> <clinit>
+    1:2:void <init>(char):376:377 -> <init>
+    1:1:com.android.tools.r8.graph.DexValue$DexValueChar create(char):381:381 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):395:396 -> a
     4:4:int com.android.tools.r8.dex.DexOutputBuffer.putUnsignedEncodedValue(long,int):92:92 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):412 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):396 -> a
     5:5:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):413 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):397 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):414 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):415:415 -> a
-    8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):444:444 -> a
-    1:1:boolean equals(java.lang.Object):433:433 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():420:420 -> f
-    1:1:char getValue():401:401 -> getValue
-    1:1:int hashCode():425:425 -> hashCode
-    1:1:java.lang.Object getBoxedValue():406:406 -> k
-    boolean mayHaveSideEffects() -> n
-    void sort() -> o
-    1:1:java.lang.String toString():438:438 -> toString
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):398 -> a
+    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):399:399 -> a
+    8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):428:428 -> a
+    1:1:boolean equals(java.lang.Object):417:417 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():404:404 -> f
+    1:1:char getValue():385:385 -> getValue
+    1:1:int hashCode():409:409 -> hashCode
+    1:1:java.lang.Object getBoxedValue():390:390 -> i
+    boolean mayHaveSideEffects() -> j
+    void sort() -> k
+    1:1:java.lang.String toString():422:422 -> toString
 com.android.tools.r8.graph.DexValue$DexValueDouble -> com.android.tools.r8.graph.DexValue$h:
     com.android.tools.r8.graph.DexValue$DexValueDouble DEFAULT -> d
     double value -> c
-    1:1:void <clinit>():627:627 -> <clinit>
-    1:2:void <init>(double):631:632 -> <init>
-    1:1:com.android.tools.r8.graph.DexValue$DexValueDouble create(double):636:636 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):650:651 -> a
+    1:1:void <clinit>():611:611 -> <clinit>
+    1:2:void <init>(double):615:616 -> <init>
+    1:1:com.android.tools.r8.graph.DexValue$DexValueDouble create(double):620:620 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):634:635 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):652 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):636 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):653 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):654:654 -> a
-    7:7: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):665:665 -> a
-    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1016:1017 -> a
-    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):665 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1016:1016 -> a
-    10: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):665 -> a
-    1:2:boolean equals(java.lang.Object):678:679 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():659:659 -> f
-    1:1:double getValue():640:640 -> getValue
-    1:1:int hashCode():670:670 -> hashCode
-    1:1:java.lang.Object getBoxedValue():645:645 -> k
-    boolean mayHaveSideEffects() -> n
-    void sort() -> o
-    1:1:java.lang.String toString():684:684 -> toString
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):637 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):638:638 -> a
+    7:7: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):649:649 -> a
+    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1012:1013 -> a
+    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):649 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):1012:1012 -> a
+    10: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):649 -> a
+    1:2:boolean equals(java.lang.Object):662:663 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():643:643 -> f
+    1:1:double getValue():624:624 -> getValue
+    1:1:int hashCode():654:654 -> hashCode
+    1:1:java.lang.Object getBoxedValue():629:629 -> i
+    boolean mayHaveSideEffects() -> j
+    void sort() -> k
+    1:1:java.lang.String toString():668:668 -> toString
 com.android.tools.r8.graph.DexValue$DexValueEnum -> com.android.tools.r8.graph.DexValue$i:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):905:905 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):902:902 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):916:916 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):902:902 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():902:902 -> f
-    1:1:int hashCode():902:902 -> hashCode
-    1:1:java.lang.Object getBoxedValue():902:902 -> k
-    void sort() -> o
-    byte getValueKind() -> p
-    1:1:java.lang.String toString():902:902 -> toString
+    1:1:void <init>(com.android.tools.r8.graph.DexField):879:879 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):876:876 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):890:890 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):876:876 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():876:876 -> f
+    1:1:int hashCode():876:876 -> hashCode
+    1:1:java.lang.Object getBoxedValue():876:876 -> i
+    void sort() -> k
+    byte getValueKind() -> l
+    1:1:java.lang.String toString():876:876 -> toString
 com.android.tools.r8.graph.DexValue$DexValueField -> com.android.tools.r8.graph.DexValue$j:
-    1:1:void <init>(com.android.tools.r8.graph.DexField):869:869 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):866:866 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):880:880 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):866:866 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():866:866 -> f
-    1:1:int hashCode():866:866 -> hashCode
-    1:1:java.lang.Object getBoxedValue():866:866 -> k
-    void sort() -> o
-    byte getValueKind() -> p
-    1:1:java.lang.String toString():866:866 -> toString
+    1:1:void <init>(com.android.tools.r8.graph.DexField):843:843 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):840:840 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):854:854 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):840:840 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():840:840 -> f
+    1:1:int hashCode():840:840 -> hashCode
+    1:1:java.lang.Object getBoxedValue():840:840 -> i
+    void sort() -> k
+    byte getValueKind() -> l
+    1:1:java.lang.String toString():840:840 -> toString
 com.android.tools.r8.graph.DexValue$DexValueFloat -> com.android.tools.r8.graph.DexValue$k:
     float value -> c
     com.android.tools.r8.graph.DexValue$DexValueFloat DEFAULT -> d
-    1:1:void <clinit>():564:564 -> <clinit>
-    1:2:void <init>(float):567:568 -> <init>
-    1:1:com.android.tools.r8.graph.DexValue$DexValueFloat create(float):572:572 -> a
-    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):586:587 -> a
+    1:1:void <clinit>():548:548 -> <clinit>
+    1:2:void <init>(float):551:552 -> <init>
+    1:1:com.android.tools.r8.graph.DexValue$DexValueFloat create(float):556:556 -> a
+    2:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):570:571 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):588 -> a
-    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):572 -> a
+    5:5:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     5:5:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):589 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):590:590 -> a
-    7:7: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):601:601 -> a
-    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1021:1022 -> a
-    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):601 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1021:1021 -> a
-    10: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):601 -> a
-    1:2:boolean equals(java.lang.Object):614:615 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():595:595 -> f
-    1:1:float getValue():576:576 -> getValue
-    1:1:int hashCode():606:606 -> hashCode
-    1:1:java.lang.Object getBoxedValue():581:581 -> k
-    boolean mayHaveSideEffects() -> n
-    void sort() -> o
-    1:1:java.lang.String toString():620:620 -> toString
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):573 -> a
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):574:574 -> a
+    7:7: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):585:585 -> a
+    8:9:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1017:1018 -> a
+    8:9:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):585 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):1017:1017 -> a
+    10: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):585 -> a
+    1:2:boolean equals(java.lang.Object):598:599 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():579:579 -> f
+    1:1:float getValue():560:560 -> getValue
+    1:1:int hashCode():590:590 -> hashCode
+    1:1:java.lang.Object getBoxedValue():565:565 -> i
+    boolean mayHaveSideEffects() -> j
+    void sort() -> k
+    1:1:java.lang.String toString():604:604 -> toString
 com.android.tools.r8.graph.DexValue$DexValueInt -> com.android.tools.r8.graph.DexValue$l:
     int value -> c
     com.android.tools.r8.graph.DexValue$DexValueInt DEFAULT -> d
-    1:1:void <clinit>():450:450 -> <clinit>
-    1:2:void <init>(int):453:454 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):472:472 -> a
-    2:2: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):501:501 -> a
-    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):458:458 -> c
-    1:1:boolean equals(java.lang.Object):490:490 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():477:477 -> f
-    1:1:int getValue():462:462 -> getValue
-    1:1:int hashCode():482:482 -> hashCode
-    1:1:java.lang.Object getBoxedValue():467:467 -> k
-    boolean mayHaveSideEffects() -> n
-    void sort() -> o
-    1:1:java.lang.String toString():495:495 -> toString
+    1:1:void <clinit>():434:434 -> <clinit>
+    1:2:void <init>(int):437:438 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):456:456 -> a
+    2:2: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):485:485 -> a
+    1:1:com.android.tools.r8.graph.DexValue$DexValueInt create(int):442:442 -> c
+    1:1:boolean equals(java.lang.Object):474:474 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():461:461 -> f
+    1:1:int getValue():446:446 -> getValue
+    1:1:int hashCode():466:466 -> hashCode
+    1:1:java.lang.Object getBoxedValue():451:451 -> i
+    boolean mayHaveSideEffects() -> j
+    void sort() -> k
+    1:1:java.lang.String toString():479:479 -> toString
 com.android.tools.r8.graph.DexValue$DexValueLong -> com.android.tools.r8.graph.DexValue$m:
     com.android.tools.r8.graph.DexValue$DexValueLong DEFAULT -> d
     long value -> c
-    1:1:void <clinit>():507:507 -> <clinit>
-    1:2:void <init>(long):510:511 -> <init>
-    1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):515:515 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):529:529 -> a
-    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):558:558 -> a
-    4:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1035:1036 -> a
-    4:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):558 -> a
-    6:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1035:1035 -> a
-    6:6:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):558 -> a
-    1:1:boolean equals(java.lang.Object):547:547 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():534:534 -> f
-    1:1:long getValue():519:519 -> getValue
-    1:1:int hashCode():539:539 -> hashCode
-    1:1:java.lang.Object getBoxedValue():524:524 -> k
-    boolean mayHaveSideEffects() -> n
-    void sort() -> o
-    1:1:java.lang.String toString():552:552 -> toString
+    1:1:void <clinit>():491:491 -> <clinit>
+    1:2:void <init>(long):494:495 -> <init>
+    1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):499:499 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):513:513 -> a
+    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542:542 -> a
+    4:5:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1031:1032 -> a
+    4:5:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542 -> a
+    6:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):1031:1031 -> a
+    6:6:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):542 -> a
+    1:1:boolean equals(java.lang.Object):531:531 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():518:518 -> f
+    1:1:long getValue():503:503 -> getValue
+    1:1:int hashCode():523:523 -> hashCode
+    1:1:java.lang.Object getBoxedValue():508:508 -> i
+    boolean mayHaveSideEffects() -> j
+    void sort() -> k
+    1:1:java.lang.String toString():536:536 -> toString
 com.android.tools.r8.graph.DexValue$DexValueMethod -> com.android.tools.r8.graph.DexValue$n:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod):887:887 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):884:884 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):898:898 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):884:884 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():884:884 -> f
-    1:1:int hashCode():884:884 -> hashCode
-    1:1:java.lang.Object getBoxedValue():884:884 -> k
-    void sort() -> o
-    byte getValueKind() -> p
-    1:1:java.lang.String toString():884:884 -> toString
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod):861:861 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):858:858 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):872:872 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):858:858 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():858:858 -> f
+    1:1:int hashCode():858:858 -> hashCode
+    1:1:java.lang.Object getBoxedValue():858:858 -> i
+    void sort() -> k
+    byte getValueKind() -> l
+    1:1:java.lang.String toString():858:858 -> toString
 com.android.tools.r8.graph.DexValue$DexValueMethodHandle -> com.android.tools.r8.graph.DexValue$o:
-    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1194:1194 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1191:1191 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1210:1210 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):1191:1191 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():1191:1191 -> f
-    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> h
-    1:1:int hashCode():1191:1191 -> hashCode
-    1:1:java.lang.Object getBoxedValue():1191:1191 -> k
-    void sort() -> o
-    byte getValueKind() -> p
-    1:1:java.lang.String toString():1191:1191 -> toString
+    1:1:void <init>(com.android.tools.r8.graph.DexMethodHandle):1158:1158 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1155:1155 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):1174:1174 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):1155:1155 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():1155:1155 -> f
+    com.android.tools.r8.graph.DexValue$DexValueMethodHandle asDexValueMethodHandle() -> g
+    1:1:int hashCode():1155:1155 -> hashCode
+    1:1:java.lang.Object getBoxedValue():1155:1155 -> i
+    void sort() -> k
+    byte getValueKind() -> l
+    1:1:java.lang.String toString():1155:1155 -> toString
 com.android.tools.r8.graph.DexValue$DexValueMethodType -> com.android.tools.r8.graph.DexValue$p:
-    1:1:void <init>(com.android.tools.r8.graph.DexProto):923:923 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):920:920 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):939:939 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):920:920 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():920:920 -> f
-    1:1:int hashCode():920:920 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> i
-    1:1:java.lang.Object getBoxedValue():920:920 -> k
-    void sort() -> o
-    byte getValueKind() -> p
-    1:1:java.lang.String toString():920:920 -> toString
+    1:1:void <init>(com.android.tools.r8.graph.DexProto):897:897 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):894:894 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):913:913 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):894:894 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():894:894 -> f
+    com.android.tools.r8.graph.DexValue$DexValueMethodType asDexValueMethodType() -> h
+    1:1:int hashCode():894:894 -> hashCode
+    1:1:java.lang.Object getBoxedValue():894:894 -> i
+    void sort() -> k
+    byte getValueKind() -> l
+    1:1:java.lang.String toString():894:894 -> toString
 com.android.tools.r8.graph.DexValue$DexValueNull -> com.android.tools.r8.graph.DexValue$q:
     com.android.tools.r8.graph.DexValue NULL -> c
-    1:1:void <clinit>():1080:1080 -> <clinit>
-    1:1:void <init>():1083:1083 -> <init>
-    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    1:1:void <clinit>():1044:1044 -> <clinit>
+    1:1:void <init>():1047:1047 -> <init>
+    1:1:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     1:1:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1092 -> a
-    2:3:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1059:1060 -> a
-    2:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1126 -> a
-    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1059:1059 -> a
-    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1126 -> a
-    1:1:boolean equals(java.lang.Object):1115:1115 -> equals
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1056 -> a
+    2:3:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1056 -> a
+    2:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
+    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1055 -> a
+    4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1090 -> a
+    1:1:boolean equals(java.lang.Object):1079:1079 -> equals
     java.lang.Object asAsmEncodedObject() -> f
-    java.lang.Object getBoxedValue() -> k
-    boolean mayHaveSideEffects() -> n
-    void sort() -> o
+    java.lang.Object getBoxedValue() -> i
+    boolean mayHaveSideEffects() -> j
+    void sort() -> k
 com.android.tools.r8.graph.DexValue$DexValueShort -> com.android.tools.r8.graph.DexValue$r:
     com.android.tools.r8.graph.DexValue$DexValueShort DEFAULT -> d
     short value -> c
-    1:1:void <clinit>():332:332 -> <clinit>
-    1:2:void <init>(short):335:336 -> <init>
-    1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):340:340 -> a
-    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):354:354 -> a
-    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):383:383 -> a
-    1:1:boolean equals(java.lang.Object):372:372 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():359:359 -> f
-    1:1:short getValue():344:344 -> getValue
-    1:1:int hashCode():364:364 -> hashCode
-    1:1:java.lang.Object getBoxedValue():349:349 -> k
-    boolean mayHaveSideEffects() -> n
-    void sort() -> o
-    1:1:java.lang.String toString():377:377 -> toString
+    1:1:void <clinit>():316:316 -> <clinit>
+    1:2:void <init>(short):319:320 -> <init>
+    1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):324:324 -> a
+    2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):338:338 -> a
+    3:3:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):367:367 -> a
+    1:1:boolean equals(java.lang.Object):356:356 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():343:343 -> f
+    1:1:short getValue():328:328 -> getValue
+    1:1:int hashCode():348:348 -> hashCode
+    1:1:java.lang.Object getBoxedValue():333:333 -> i
+    boolean mayHaveSideEffects() -> j
+    void sort() -> k
+    1:1:java.lang.String toString():361:361 -> toString
 com.android.tools.r8.graph.DexValue$DexValueString -> com.android.tools.r8.graph.DexValue$s:
-    1:1:void <init>(com.android.tools.r8.graph.DexString):759:759 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):756:756 -> a
-    2:6:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):775:779 -> 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):725:725 -> collectIndexedItems
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):756 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):756:756 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():764:764 -> f
-    1:1:int hashCode():756:756 -> hashCode
-    1:1:java.lang.Object getBoxedValue():756:756 -> k
-    boolean mayHaveSideEffects() -> n
-    void sort() -> o
-    byte getValueKind() -> p
-    1:1:java.lang.String toString():756:756 -> toString
+    1:1:void <init>(com.android.tools.r8.graph.DexString):743:743 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):740:740 -> a
+    2:6:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):759:763 -> 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):709:709 -> collectIndexedItems
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):740 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):740:740 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():748:748 -> f
+    1:1:int hashCode():740:740 -> hashCode
+    1:1:java.lang.Object getBoxedValue():740:740 -> i
+    boolean mayHaveSideEffects() -> j
+    void sort() -> k
+    byte getValueKind() -> l
+    1:1:java.lang.String toString():740:740 -> toString
 com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.graph.DexValue$t:
-    1:1:void <init>(com.android.tools.r8.graph.DexType):841:841 -> <init>
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):838:838 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):852:852 -> collectIndexedItems
-    1:1:boolean equals(java.lang.Object):838:838 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():838:838 -> f
-    1:1:int hashCode():838:838 -> hashCode
-    com.android.tools.r8.graph.DexValue$DexValueType asDexValueType() -> j
-    1:1:java.lang.Object getBoxedValue():838:838 -> k
-    boolean isDexValueType() -> m
-    void sort() -> o
-    byte getValueKind() -> p
-    1:1:java.lang.String toString():838:838 -> toString
+    1:1:void <init>(com.android.tools.r8.graph.DexType):825:825 -> <init>
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):822:822 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):836:836 -> collectIndexedItems
+    1:1:boolean equals(java.lang.Object):822:822 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():822:822 -> f
+    1:1:int hashCode():822:822 -> hashCode
+    1:1:java.lang.Object getBoxedValue():822:822 -> i
+    void sort() -> k
+    byte getValueKind() -> l
+    1:1:java.lang.String toString():822:822 -> toString
 com.android.tools.r8.graph.DexValue$NestedDexValue -> com.android.tools.r8.graph.DexValue$NestedDexValue:
-    1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):688:688 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):692:693 -> <init>
-    1:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):704:705 -> a
+    1:1:void <init>(com.android.tools.r8.graph.IndexedDexItem,com.android.tools.r8.graph.DexValue$1):672:672 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.IndexedDexItem):676:677 -> <init>
+    1:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):688:689 -> a
     3:3:int com.android.tools.r8.dex.DexOutputBuffer.putUnsignedEncodedValue(long,int):92:92 -> a
-    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):706 -> a
+    3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):690 -> a
     4:4:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):707 -> a
-    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):708:708 -> a
-    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):691 -> a
+    5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):692:692 -> a
+    6:6:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     6:6:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):708 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):709:709 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):725:725 -> collectIndexedItems
-    1:3:boolean equals(java.lang.Object):743:745 -> equals
-    1:1:java.lang.Object asAsmEncodedObject():719:719 -> f
-    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():699:699 -> getValue
-    1:1:int hashCode():735:735 -> hashCode
-    1:1:java.lang.Object getBoxedValue():714:714 -> k
-    void sort() -> o
-    byte getValueKind() -> p
-    1:1:java.lang.String toString():752:752 -> toString
+    6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):692 -> a
+    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):693:693 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):709:709 -> collectIndexedItems
+    1:3:boolean equals(java.lang.Object):727:729 -> equals
+    1:1:java.lang.Object asAsmEncodedObject():703:703 -> f
+    1:1:com.android.tools.r8.graph.IndexedDexItem getValue():683:683 -> getValue
+    1:1:int hashCode():719:719 -> hashCode
+    1:1:java.lang.Object getBoxedValue():698:698 -> i
+    void sort() -> k
+    byte getValueKind() -> l
+    1:1:java.lang.String toString():736:736 -> toString
 com.android.tools.r8.graph.DexValue$SimpleDexValue -> com.android.tools.r8.graph.DexValue$u:
-    1:1:void <init>():242:242 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexValue$1):242:242 -> <init>
-    1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):263:263 -> a
+    1:1:void <init>():226:226 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexValue$1):226:226 -> <init>
+    1:1:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):247:247 -> a
     2:2:int com.android.tools.r8.dex.DexOutputBuffer.putSignedEncodedValue(long,int):88:88 -> a
-    2:2:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):264 -> a
+    2:2:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):248 -> a
     3:3:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):164:164 -> a
-    3:3:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):265 -> a
-    4:4:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):110:110 -> a
+    3:3:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):249 -> a
+    4:4:void com.android.tools.r8.graph.DexValue.writeHeader(byte,int,com.android.tools.r8.dex.DexOutputBuffer):94:94 -> a
     4:4:void com.android.tools.r8.graph.DexValue.access$100(byte,int,com.android.tools.r8.dex.DexOutputBuffer):27 -> a
-    4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):266 -> a
-    5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):267:267 -> a
+    4:4:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):250 -> a
+    5:5:void writeIntegerTo(byte,long,int,com.android.tools.r8.dex.DexOutputBuffer):251:251 -> a
 com.android.tools.r8.graph.DexValue$UnknownDexValue -> com.android.tools.r8.graph.DexValue$v:
     com.android.tools.r8.graph.DexValue$UnknownDexValue UNKNOWN -> c
-    1:1:void <clinit>():184:184 -> <clinit>
-    1:1:void <init>():186:186 -> <init>
+    1:1:void <clinit>():168:168 -> <clinit>
+    1:1:void <init>():170:170 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo) -> a
-    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):207:207 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):192:192 -> collectIndexedItems
-    1:1:java.lang.Object asAsmEncodedObject():217:217 -> f
-    1:1:int hashCode():222:222 -> hashCode
-    1:1:java.lang.Object getBoxedValue():212:212 -> k
-    boolean mayHaveSideEffects() -> n
-    1:1:void sort():197:197 -> o
-com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.graph.g0:
+    1:1:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):191:191 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):176:176 -> collectIndexedItems
+    1:1:java.lang.Object asAsmEncodedObject():201:201 -> f
+    1:1:int hashCode():206:206 -> hashCode
+    1:1:java.lang.Object getBoxedValue():196:196 -> i
+    boolean mayHaveSideEffects() -> j
+    1:1:void sort():181:181 -> k
+com.android.tools.r8.graph.DirectMappedDexApplication -> com.android.tools.r8.graph.h0:
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> n
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> m
     boolean $assertionsDisabled -> o
@@ -18691,8 +18747,8 @@
     1:1:java.util.Collection allClasses():63:63 -> h
     1:1:java.util.Collection libraryClasses():72:72 -> i
     1:12:boolean verifyCodeObjectsOwners():144:155 -> j
-com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.graph.g0$a:
-com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.g0$b:
+com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.graph.h0$a:
+com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.h0$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList classpathClasses -> m
     com.android.tools.r8.com.google.common.collect.ImmutableList libraryClasses -> l
     1:1:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DirectMappedDexApplication$1):161:161 -> <init>
@@ -18700,7 +18756,7 @@
     8:10:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication):176:178 -> <init>
     1:16:com.android.tools.r8.graph.DexApplication build():190:205 -> a
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.graph.h0:
+com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.graph.i0:
     com.android.tools.r8.graph.DexType enclosingClass -> a
     com.android.tools.r8.graph.DexMethod enclosingMethod -> b
     boolean $assertionsDisabled -> c
@@ -18715,7 +18771,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.FieldAccessFlags -> com.android.tools.r8.graph.i0:
+com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.j0:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):44:44 -> <init>
@@ -18737,9 +18793,9 @@
     1:2:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):58:59 -> g
     3:3:void <init>(int):40:40 -> g
     3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):59 -> g
-com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.graph.j0:
-com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.graph.k0:
-com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.graph.l0:
+com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.graph.k0:
+com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.graph.l0:
+com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.graph.m0:
     java.util.Map infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -18754,7 +18810,7 @@
     9:10:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl rewrittenWithLens(com.android.tools.r8.graph.GraphLense):40:41 -> a
     11:11:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):43:43 -> a
     12:12:boolean verifyMappingIsOneToOne():50:50 -> a
-com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.graph.m0:
+com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.graph.n0:
     java.util.Map readsWithContexts -> b
     java.util.Map writesWithContexts -> c
     com.android.tools.r8.graph.FieldAccessInfoImpl MISSING_FIELD_ACCESS_INFO -> d
@@ -18788,7 +18844,7 @@
     2:2:java.util.Set lambda$recordWrite$8(com.android.tools.r8.graph.DexField):180:180 -> e
     1:1:java.util.Set lambda$rewrittenWithLens$11(com.android.tools.r8.graph.DexField):209:209 -> f
     1:1:java.util.Set lambda$rewrittenWithLens$9(com.android.tools.r8.graph.DexField):200:200 -> g
-com.android.tools.r8.graph.GraphLense -> com.android.tools.r8.graph.n0:
+com.android.tools.r8.graph.GraphLense -> com.android.tools.r8.graph.o0:
     1:1:void <clinit>():50:50 -> <clinit>
     1:1:void <init>():50:50 -> <init>
     1:1:com.android.tools.r8.graph.GraphLense$Builder builder():408:408 -> a
@@ -18815,8 +18871,8 @@
     32:52:boolean verifyIsBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexApplication,java.util.Set,com.android.tools.r8.graph.DexItemFactory):744:764 -> verifyMappingToOriginalProgram
     32:52:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):726 -> verifyMappingToOriginalProgram
     53:57:boolean verifyMappingToOriginalProgram(java.lang.Iterable,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexItemFactory):725:729 -> verifyMappingToOriginalProgram
-com.android.tools.r8.graph.GraphLense$1 -> com.android.tools.r8.graph.n0$a:
-com.android.tools.r8.graph.GraphLense$Builder -> com.android.tools.r8.graph.n0$b:
+com.android.tools.r8.graph.GraphLense$1 -> com.android.tools.r8.graph.o0$a:
+com.android.tools.r8.graph.GraphLense$Builder -> com.android.tools.r8.graph.o0$b:
     java.util.Map typeMap -> a
     java.util.Map methodMap -> b
     java.util.Map fieldMap -> c
@@ -18829,13 +18885,13 @@
     1:1:void map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):362:362 -> b
     1:1:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):376 -> b
     2:2:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):377:377 -> b
-com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> com.android.tools.r8.graph.n0$c:
+com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult -> com.android.tools.r8.graph.o0$c:
     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):62:64 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getMethod():68:68 -> a
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():72:72 -> b
-com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> com.android.tools.r8.graph.n0$d:
+com.android.tools.r8.graph.GraphLense$IdentityGraphLense -> com.android.tools.r8.graph.o0$d:
     com.android.tools.r8.graph.GraphLense$IdentityGraphLense INSTANCE -> a
     1:1:void <clinit>():772:772 -> <clinit>
     1:1:void <init>():774:774 -> <init>
@@ -18843,7 +18899,7 @@
     1:1:com.android.tools.r8.graph.GraphLense$IdentityGraphLense access$100():770 -> c
     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):812:812 -> lookupMethod
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):817:817 -> lookupPrototypeChanges
-com.android.tools.r8.graph.GraphLense$NestedGraphLense -> com.android.tools.r8.graph.n0$e:
+com.android.tools.r8.graph.GraphLense$NestedGraphLense -> com.android.tools.r8.graph.o0$e:
     1:1:void <clinit>():841:841 -> <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):869:869 -> <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):847:871 -> <init>
@@ -18870,7 +18926,7 @@
     17:17:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1008 -> mapVirtualInterfaceInvocationTypes
     18:18:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1008:1008 -> mapVirtualInterfaceInvocationTypes
     1:17:java.lang.String toString():1040:1056 -> toString
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription -> com.android.tools.r8.graph.n0$f:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription -> com.android.tools.r8.graph.o0$f:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none -> d
     boolean hasBeenChangedToReturnVoid -> a
@@ -18893,7 +18949,7 @@
     1:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription withConstantReturn():322:323 -> e
     1:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription withExtraNullParameter():333:334 -> f
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription none():257:257 -> g
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.n0$f$a:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo -> com.android.tools.r8.graph.o0$f$a:
     com.android.tools.r8.graph.DexType type -> c
     boolean isAlwaysNull -> b
     int argumentIndex -> a
@@ -18904,7 +18960,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():127:127 -> b
     1:1:boolean isAlwaysNull():131:131 -> c
     1:1:boolean isNeverUsed():135:135 -> d
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.o0:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder -> com.android.tools.r8.graph.p0:
     com.android.tools.r8.graph.DexType type -> c
     boolean isAlwaysNull -> b
     boolean $assertionsDisabled -> d
@@ -18915,7 +18971,7 @@
     2:2:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setType(com.android.tools.r8.graph.DexType):97:97 -> a
     3:5:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo build():102:104 -> a
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder setIsAlwaysNull():92:92 -> b
-com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo -> com.android.tools.r8.graph.n0$f$b:
+com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo -> com.android.tools.r8.graph.o0$f$b:
     java.util.List removedArguments -> a
     com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty -> b
     boolean $assertionsDisabled -> c
@@ -18931,7 +18987,7 @@
     1:3:java.util.ListIterator iterator():174:176 -> b
     1:1:int numberOfRemovedArguments():195:195 -> c
     1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo empty():170:170 -> d
-com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.p0:
+com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.q0:
     boolean $assertionsDisabled -> b
     int sortedIndex -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -18945,7 +19001,7 @@
     2:2:void resetSortedIndex():58:58 -> flushCachedValues
     2:2:void flushCachedValues():54 -> flushCachedValues
     1:1:void resetSortedIndex():58:58 -> g
-com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.graph.q0:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.graph.r0:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType outer -> c
@@ -18969,7 +19025,7 @@
     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.JarApplicationReader -> com.android.tools.r8.graph.r0:
+com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.s0:
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
     java.util.concurrent.ConcurrentHashMap asmTypeCache -> c
@@ -19017,7 +19073,7 @@
     1:4:java.lang.String getShortyDescriptor(java.lang.String):130:133 -> h
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmObjectType$0(java.lang.String):32:32 -> i
     1:1:com.android.tools.r8.org.objectweb.asm.Type lambda$getAsmType$1(java.lang.String):36:36 -> j
-com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.s0:
+com.android.tools.r8.graph.JarClassFileReader -> com.android.tools.r8.graph.t0:
     com.android.tools.r8.dex.ClassesChecksum checksums -> c
     java.util.function.Consumer classConsumer -> b
     boolean $assertionsDisabled -> e
@@ -19068,7 +19124,7 @@
     7:8:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):184:185 -> b
     9:15:com.android.tools.r8.graph.DexEncodedAnnotation createEncodedAnnotation(java.lang.String,java.util.List,java.util.List,com.android.tools.r8.graph.JarApplicationReader):184:190 -> b
     1:1:com.android.tools.r8.graph.FieldAccessFlags createFieldAccessFlags(int):149:149 -> c
-com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.s0$a:
+com.android.tools.r8.graph.JarClassFileReader$CreateAnnotationVisitor -> com.android.tools.r8.graph.t0$a:
     java.util.List values -> d
     java.util.List names -> c
     boolean $assertionsDisabled -> e
@@ -19094,7 +19150,7 @@
     96:96:com.android.tools.r8.graph.DexValue$DexValueArray getDexValueArray(java.lang.Object):987:987 -> a
     96:96:com.android.tools.r8.graph.DexValue getDexValue(java.lang.Object):1015 -> a
     96:96:void visit(java.lang.String,java.lang.Object):890 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.s0$b:
+com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor -> com.android.tools.r8.graph.t0$b:
     com.android.tools.r8.graph.ClassKind classKind -> d
     java.util.List annotations -> r
     java.util.Set methodSignatures -> y
@@ -19245,7 +19301,7 @@
     1:1:java.util.List access$700(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> j
     1:1:com.android.tools.r8.graph.ClassKind access$800(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> k
     1:1:com.android.tools.r8.origin.Origin access$900(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):193:193 -> l
-com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.s0$c:
+com.android.tools.r8.graph.JarClassFileReader$CreateFieldVisitor -> com.android.tools.r8.graph.t0$c:
     com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor parent -> b
     java.lang.Object value -> f
     boolean $assertionsDisabled -> h
@@ -19274,7 +19330,7 @@
     56:59:java.util.List getAnnotations():658:661 -> a
     56:59:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):584 -> a
     60:60:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):584:584 -> a
-com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.s0$d:
+com.android.tools.r8.graph.JarClassFileReader$CreateMethodVisitor -> com.android.tools.r8.graph.t0$d:
     java.util.List parameterFlags -> r
     int annotableParameterCount -> o
     java.util.List parameterNames -> q
@@ -19312,14 +19368,14 @@
     1:2:void visitEnd():797:798 -> c
     3:5:boolean classRequiresCode():788:790 -> c
     3:5:void visitEnd():798 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1055 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> c
     6:6:boolean classRequiresCode():790 -> c
     6:6:void visitEnd():798 -> c
     7:9:boolean classRequiresCode():790:792 -> c
     7:9:void visitEnd():798 -> c
     10:20:void visitEnd():799:809 -> c
-    21:21:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):56:56 -> c
+    21:21:void com.android.tools.r8.graph.ParameterAnnotationsList.<init>(com.android.tools.r8.graph.DexAnnotationSet[]):54:54 -> c
     21:21:void visitEnd():809 -> c
     22:26:void visitEnd():811:815 -> c
     27:33:void visitEnd():814:820 -> c
@@ -19343,17 +19399,17 @@
     83:83:void visitEnd():841:841 -> c
     84:92:void visitEnd():839:847 -> c
     1:4:java.util.List getAnnotations():863:866 -> d
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.s0$e:
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.graph.t0$e:
     com.android.tools.r8.graph.DexClass owner -> b
     byte[] classCache -> a
     java.util.List codeList -> c
     1:8:void <init>():1019:1026 -> <init>
-com.android.tools.r8.graph.KeyedDexItem -> com.android.tools.r8.graph.t0:
+com.android.tools.r8.graph.KeyedDexItem -> com.android.tools.r8.graph.u0:
     1:1:void <init>():6:6 -> <init>
     1:1:boolean equals(java.lang.Object):15:15 -> equals
     1:1:int hashCode():20:20 -> hashCode
     com.android.tools.r8.graph.PresortedComparable getKey() -> n
-com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.z0:
+com.android.tools.r8.graph.LazyCfCode -> com.android.tools.r8.graph.A0:
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> c
     com.android.tools.r8.graph.CfCode code -> b
     boolean $assertionsDisabled -> e
@@ -19391,15 +19447,15 @@
     1:1:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):204:204 -> registerCodeReferences
     1:1:java.lang.String toString():214:214 -> toString
     2:2:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):219:219 -> toString
-com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.u0:
-com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.v0:
+com.android.tools.r8.graph.LazyCfCode$1 -> com.android.tools.r8.graph.v0:
+com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.w0:
     java.util.function.BiFunction codeLocator -> d
     com.android.tools.r8.graph.JarApplicationReader application -> e
     boolean usrJsrInliner -> f
     com.android.tools.r8.graph.DexClass clazz -> c
     1:5:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean):254:258 -> <init>
     1:10:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):264:273 -> a
-com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.w0:
+com.android.tools.r8.graph.LazyCfCode$DefaultCodeLocator -> com.android.tools.r8.graph.x0:
     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):226:226 -> <init>
@@ -19408,9 +19464,9 @@
     1:1:java.lang.Object apply(java.lang.Object,java.lang.Object):226:226 -> apply
     2:2:com.android.tools.r8.graph.LazyCfCode apply(java.lang.String,java.lang.String):238:238 -> apply
     2:2:java.lang.Object apply(java.lang.Object,java.lang.Object):226 -> apply
-com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.x0:
+com.android.tools.r8.graph.LazyCfCode$JsrEncountered -> com.android.tools.r8.graph.y0:
     1:1:void <init>(java.lang.String):87:87 -> <init>
-com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.y0:
+com.android.tools.r8.graph.LazyCfCode$MethodCodeVisitor -> com.android.tools.r8.graph.z0:
     java.util.Map canonicalDebugLocalInfo -> q
     java.util.Map labelMap -> r
     int maxStack -> l
@@ -19554,7 +19610,7 @@
     4:8:void visitVarInsn(int,int):637:641 -> d
     9:35:void visitVarInsn(int,int):633:659 -> d
     36:36:void visitVarInsn(int,int):652:652 -> d
-com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.A0:
+com.android.tools.r8.graph.LazyLoadedDexApplication -> com.android.tools.r8.graph.B0:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> l
     com.android.tools.r8.utils.ProgramClassCollection programClasses -> j
@@ -19576,8 +19632,8 @@
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication toDirect():253:253 -> g
     1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses loadAllClasses():191:191 -> h
     1:1:java.lang.String toString():258:258 -> toString
-com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.A0$a:
-com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.A0$b:
+com.android.tools.r8.graph.LazyLoadedDexApplication$1 -> com.android.tools.r8.graph.B0$a:
+com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.B0$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
@@ -19591,7 +19647,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getLibraryClasses():166:166 -> b
     boolean lambda$new$2(com.android.tools.r8.graph.DexType) -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList getProgramClasses():158:158 -> c
-com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.A0$c:
+com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.B0$c:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver resolver -> n
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> m
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> l
@@ -19603,7 +19659,7 @@
     3:3:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setLibraryClassCollection(com.android.tools.r8.utils.LibraryClassCollection):226:226 -> a
     4:10:com.android.tools.r8.graph.LazyLoadedDexApplication build():232:238 -> a
     com.android.tools.r8.graph.DexApplication$Builder self() -> e
-com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.B0:
+com.android.tools.r8.graph.MethodAccessFlags -> com.android.tools.r8.graph.C0:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):61:61 -> <init>
@@ -19652,21 +19708,21 @@
     4:4:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):88 -> e
     5:5:void unsetDeclaredSynchronized():192:192 -> e
     5:5:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):89 -> e
-com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.graph.C0:
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.graph.D0:
     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.D0:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.graph.E0:
     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.ObjectToOffsetMapping -> com.android.tools.r8.graph.E0:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.graph.F0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap types -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap methods -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap fields -> e
@@ -19712,13 +19768,13 @@
     1:1:java.util.Collection getStrings():179:179 -> i
     1:1:java.util.Collection getTypes():167:167 -> j
     1:1:boolean hasJumboStrings():191:191 -> k
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.graph.E0$a:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.graph.F0$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):103:103 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexApplication):101:105 -> <init>
     1:22:int getDepth(com.android.tools.r8.graph.DexProgramClass):109:130 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.graph.F0:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.graph.G0:
     com.android.tools.r8.graph.DexProto[] protos -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
@@ -19758,37 +19814,36 @@
     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.G0:
+com.android.tools.r8.graph.ParameterAnnotationsList -> com.android.tools.r8.graph.H0:
     com.android.tools.r8.graph.ParameterAnnotationsList EMPTY_PARAMETER_ANNOTATIONS_LIST -> c
     com.android.tools.r8.graph.DexAnnotationSet[] values -> a
     int missingParameterAnnotations -> b
     boolean $assertionsDisabled -> d
-    1:3:void <clinit>():38:40 -> <clinit>
-    1:3:void <init>():50:52 -> <init>
-    4:7:void <init>(com.android.tools.r8.graph.DexAnnotationSet[],int):59:62 -> <init>
-    1:19:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):178:196 -> a
-    20:22:com.android.tools.r8.graph.ParameterAnnotationsList rewrite(java.util.function.Function):200:202 -> a
-    1:3:void forEachAnnotation(java.util.function.Consumer):104:106 -> b
-    1:5:com.android.tools.r8.graph.DexAnnotationSet get(int):147:151 -> c
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):88:88 -> collectIndexedItems
-    1:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):94:95 -> collectMixedSectionItems
-    1:2:boolean isMissing(int):134:135 -> d
-    1:13:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):156:168 -> e
-    1:2:boolean equals(java.lang.Object):79:80 -> equals
-    1:1:int countNonMissing():124:124 -> f
-    1:1:boolean isEmpty():99:99 -> g
-    1:1:int size():116:116 -> h
-    1:1:int hashCode():71:71 -> hashCode
-    1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():47:47 -> i
-com.android.tools.r8.graph.Presorted -> com.android.tools.r8.graph.H0:
+    1:3:void <clinit>():36:38 -> <clinit>
+    1:3:void <init>():48:50 -> <init>
+    4:7:void <init>(com.android.tools.r8.graph.DexAnnotationSet[],int):57:60 -> <init>
+    1:19:com.android.tools.r8.graph.ParameterAnnotationsList keepIf(java.util.function.Predicate):176:194 -> a
+    1:3:void forEachAnnotation(java.util.function.Consumer):102:104 -> b
+    1:5:com.android.tools.r8.graph.DexAnnotationSet get(int):145:149 -> c
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexMethod,int):86:86 -> collectIndexedItems
+    1:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):92:93 -> collectMixedSectionItems
+    1:2:boolean isMissing(int):132:133 -> d
+    1:13:com.android.tools.r8.graph.ParameterAnnotationsList withParameterCount(int):154:166 -> e
+    1:2:boolean equals(java.lang.Object):77:78 -> equals
+    1:1:int countNonMissing():122:122 -> f
+    1:1:boolean isEmpty():97:97 -> g
+    1:1:int size():114:114 -> h
+    1:1:int hashCode():69:69 -> hashCode
+    1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():45:45 -> i
+com.android.tools.r8.graph.Presorted -> com.android.tools.r8.graph.I0:
     void setSortedIndex(int) -> b
-com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.graph.I0:
+com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.graph.J0:
     int layeredCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens) -> a
     int slowCompareTo(java.lang.Object) -> a
     1:1:boolean isSorted(java.util.List):15:15 -> a
     2:4:boolean isSorted(java.util.List,java.util.function.Function):25:27 -> a
     5:5:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):44:44 -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.graph.J0:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.graph.K0:
     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>
@@ -19801,68 +19856,68 @@
     16:17:void accept(com.android.tools.r8.graph.DexTypeList):50:51 -> b
     16:17:void accept(com.android.tools.r8.graph.DexClass):60 -> b
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> b
-com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.K0:
+com.android.tools.r8.graph.ResolutionResult -> com.android.tools.r8.graph.L0:
     1:1:void <clinit>():14:14 -> <clinit>
     void forEachTarget(java.util.function.Consumer) -> a
     boolean hasSingleTarget() -> a
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
     1:1:java.util.Set lookupVirtualDispatchTargets(boolean,com.android.tools.r8.graph.AppInfoWithSubtyping):33:33 -> a
-    2:3:void lambda$lookupVirtualTargets$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):53:54 -> a
-    4:65:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):64:125 -> a
+    2:3:void lambda$lookupVirtualTargets$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):50:51 -> a
+    4:64:java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):60:120 -> a
     com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    1:14:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):38:51 -> b
-    15:16:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):111:112 -> b
+    1:12:java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping):37:48 -> b
+    13:14:void lambda$lookupInterfaceTargets$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):107:108 -> b
     com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve() -> c
-    1:2:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):100:101 -> c
+    1:2:void lambda$lookupInterfaceTargets$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):96:97 -> c
     boolean isValidVirtualTargetForDynamicDispatch() -> d
     java.util.List asListOfTargets() -> e
-com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.K0$a:
+com.android.tools.r8.graph.ResolutionResult$1 -> com.android.tools.r8.graph.L0$a:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():38:38 -> <clinit>
-com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.K0$b:
+    1:1:void <clinit>():37:37 -> <clinit>
+com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult -> com.android.tools.r8.graph.L0$b:
     com.android.tools.r8.graph.ResolutionResult$ArrayCloneMethodResult INSTANCE -> a
-    1:1:void <clinit>():228:228 -> <clinit>
-    1:1:void <init>():230:230 -> <init>
+    1:1:void <clinit>():223:223 -> <clinit>
+    1:1:void <init>():225:225 -> <init>
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isValidVirtualTargetForDynamicDispatch() -> d
-com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.K0$c:
+com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult -> com.android.tools.r8.graph.L0$c:
     com.android.tools.r8.graph.ResolutionResult$ClassNotFoundResult INSTANCE -> a
-    1:1:void <clinit>():259:259 -> <clinit>
-    1:1:void <init>():261:261 -> <init>
-com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.K0$d:
-    1:1:void <init>():188:188 -> <init>
+    1:1:void <clinit>():254:254 -> <clinit>
+    1:1:void <init>():256:256 -> <init>
+com.android.tools.r8.graph.ResolutionResult$EmptyResult -> com.android.tools.r8.graph.L0$d:
+    1:1:void <init>():183:183 -> <init>
     void forEachTarget(java.util.function.Consumer) -> a
     boolean hasSingleTarget() -> a
     java.util.Set lookupInterfaceTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> a
     com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
     java.util.Set lookupVirtualTargets(com.android.tools.r8.graph.AppInfoWithSubtyping) -> b
     com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve() -> c
-    1:1:java.util.List asListOfTargets():207:207 -> e
-com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.K0$e:
-    1:1:void <init>():245:245 -> <init>
+    1:1:java.util.List asListOfTargets():202:202 -> e
+com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult -> com.android.tools.r8.graph.L0$e:
+    1:1:void <init>():240:240 -> <init>
     boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isValidVirtualTargetForDynamicDispatch() -> d
-com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.K0$f:
+com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult -> com.android.tools.r8.graph.L0$f:
     com.android.tools.r8.graph.ResolutionResult$IncompatibleClassResult INSTANCE -> a
-    1:1:void <clinit>():267:267 -> <clinit>
-    1:1:void <init>():269:269 -> <init>
-com.android.tools.r8.graph.ResolutionResult$MultiResult -> com.android.tools.r8.graph.K0$g:
+    1:1:void <clinit>():262:262 -> <clinit>
+    1:1:void <init>():264:264 -> <init>
+com.android.tools.r8.graph.ResolutionResult$MultiResult -> com.android.tools.r8.graph.L0$g:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList methods -> a
-    1:1:void <clinit>():131:131 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):135:137 -> <init>
+    1:1:void <clinit>():126:126 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):130:132 -> <init>
     boolean hasSingleTarget() -> a
-    1:2:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):142:143 -> a
-    3:3:void forEachTarget(java.util.function.Consumer):184:184 -> a
+    1:2:boolean isValidVirtualTarget(com.android.tools.r8.utils.InternalOptions):137:138 -> a
+    3:3:void forEachTarget(java.util.function.Consumer):179:179 -> a
     com.android.tools.r8.graph.DexEncodedMethod asSingleTarget() -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():163:163 -> c
-    1:2:boolean isValidVirtualTargetForDynamicDispatch():152:153 -> d
-    1:1:java.util.List asListOfTargets():179:179 -> e
-com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.K0$h:
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asResultOfResolve():158:158 -> c
+    1:2:boolean isValidVirtualTargetForDynamicDispatch():147:148 -> d
+    1:1:java.util.List asListOfTargets():174:174 -> e
+com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult -> com.android.tools.r8.graph.L0$h:
     com.android.tools.r8.graph.ResolutionResult$NoSuchMethodResult INSTANCE -> a
-    1:1:void <clinit>():275:275 -> <clinit>
-    1:1:void <init>():277:277 -> <init>
-com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.L0:
+    1:1:void <clinit>():270:270 -> <clinit>
+    1:1:void <init>():272:272 -> <init>
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.graph.M0:
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):22:22 -> <init>
     java.lang.String getFileEnding() -> a
     void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> a
@@ -19871,7 +19926,7 @@
     20:22:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):66:68 -> a
     23:25:void writeMethod(com.android.tools.r8.graph.DexEncodedMethod,java.io.PrintStream):73:75 -> a
     1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):47:59 -> b
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.graph.M0:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.graph.N0:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):14:14 -> <init>
     com.android.tools.r8.graph.ClassHierarchyTraversal self() -> a
     1:1:void visit(java.lang.Iterable,java.util.function.Consumer):9:9 -> a
@@ -19903,7 +19958,7 @@
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forProgramClasses(com.android.tools.r8.graph.AppView):50:50 -> b
     2:3:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:61 -> b
     2:3:com.android.tools.r8.graph.ClassHierarchyTraversal excludeInterfaces():0 -> b
-com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.N0:
+com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.O0:
     1:1:void <clinit>():15:15 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):24:25 -> <init>
     1:25:void registerCallSite(com.android.tools.r8.graph.DexCallSite):99:123 -> registerCallSite
@@ -19921,12 +19976,12 @@
     46:46:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):65:65 -> registerMethodHandle
     47:47:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):62:62 -> registerMethodHandle
     1:3:void registerProto(com.android.tools.r8.graph.DexProto):133:135 -> registerProto
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.N0$a:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.O0$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>():20:21 -> <clinit>
     1:1:void <init>(java.lang.String,int):19:19 -> <init>
-com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.graph.O0.a:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.graph.P0.a:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> b
     java.util.List r8InstructionSequence -> d
     java.util.List javacInstructionSequence -> c
@@ -19945,13 +20000,13 @@
     49:55:boolean hasJavacClinitAssertionCode(com.android.tools.r8.graph.CfCode):98:104 -> a
     49:55:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):36 -> a
     56:56:void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod):37:37 -> a
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.graph.O0.b:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.graph.P0.b:
     1:1:void <init>():13:13 -> <init>
     void done() -> a
     void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.graph.O0.d:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.graph.P0.d:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):59:59 -> <init>
@@ -19959,8 +20014,8 @@
     1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):65:81 -> a
     18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):79:79 -> a
     19:19:void done():87:87 -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.graph.O0.c:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.graph.O0.d$a:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.graph.P0.c:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.graph.P0.d$a:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):19:19 -> <init>
@@ -20123,31 +20178,14 @@
     53:53:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):105 -> a
     54:54:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):106:106 -> a
     55:57:boolean isSubtypeOf(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):122:124 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.w.a.h:
-    com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.graph.DexType context -> c
-    com.android.tools.r8.ir.code.IRCode code -> b
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):32:35 -> <init>
-    1:100:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.ir.code.Value):53:152 -> a
-    101:133:boolean valueMayBeMutatedBeforeMethodExit(com.android.tools.r8.ir.code.Value,java.util.Set):216:248 -> a
-    1:5:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):39:43 -> b
-    6:42:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value):156:192 -> b
-    6:42:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):46 -> b
-    43:43:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> b
-    43:43:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value):192 -> b
-    43:43:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):46 -> b
-    44:58:boolean isNewInstanceWithoutEnvironmentDependentFields(com.android.tools.r8.ir.code.Value):198:212 -> b
-    44:58:boolean valueMayDependOnEnvironment(com.android.tools.r8.ir.code.Value):46 -> b
-com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.w.a.i.a:
+com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.w.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.w.a.i.b:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.w.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
@@ -20156,7 +20194,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.w.a.i.c:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.w.a.h.c:
     com.android.tools.r8.ir.code.Value value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -20172,7 +20210,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.w.a.i.d:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.w.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
@@ -20181,7 +20219,7 @@
     boolean isConst() -> d
     boolean isTop() -> e
     boolean isValueRange() -> f
-com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.w.a.i.e:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.w.a.h.e:
     java.util.Deque flowEdges -> d
     java.util.BitSet visitedBlocks -> g
     java.util.Map mapping -> b
@@ -20216,14 +20254,14 @@
     53:110:void addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):178:235 -> b
     53:110:void visitInstruction(com.android.tools.r8.ir.code.Instruction):173 -> b
     111:116:void setExecutableEdge(int,int):241:246 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.w.a.i.f:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.w.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.w.a.j.a:
+com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.w.a.i.a:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexType context -> b
     boolean $assertionsDisabled -> c
@@ -20256,7 +20294,7 @@
     1:1:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):151 -> c
     2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.ir.code.Instruction):174:174 -> c
     2:2:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):151 -> c
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.w.a.k.a:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.w.a.j.a:
     java.util.Deque valuesToTrack -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set trackedValues -> c
@@ -20285,8 +20323,8 @@
     102:102:boolean isValueOfInterestOrAlias(com.android.tools.r8.ir.code.Value):212:212 -> a
     1:9:boolean isEscaping(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):55:63 -> b
     10:12:void addToWorklist(com.android.tools.r8.ir.code.Value):170:172 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.w.a.k.b:
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.w.a.l.a:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.w.a.j.b:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.w.a.k.a:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():20:20 -> <clinit>
@@ -20300,7 +20338,7 @@
     51:62:int computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):70:81 -> a
     51:62:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52 -> a
     63:63:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):52:52 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.w.a.m.a:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.w.a.l.a:
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():25:25 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
@@ -20310,7 +20348,7 @@
     boolean isBottom() -> d
     boolean isKnownFieldSet() -> e
     boolean isTop() -> f
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.w.a.m.b:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.w.a.l.b:
     java.util.Set fields -> a
     1:2:void <init>():18:19 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.DexEncodedField):22:23 -> <init>
@@ -20323,7 +20361,7 @@
     1:5:boolean equals(java.lang.Object):81:85 -> equals
     1:1:int hashCode():73:73 -> hashCode
     1:1:int size():68:68 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.w.a.m.c:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.w.a.l.c:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -20332,56 +20370,56 @@
     boolean isBottom() -> d
     boolean isKnownFieldSet() -> e
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet getInstance():16:16 -> g
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.w.a.m.d:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.w.a.l.d:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> c
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexEncodedMethod method -> d
     com.android.tools.r8.ir.code.IRCode code -> b
     java.util.Map fieldsMaybeReadBeforeBlockInclusiveCache -> e
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:5: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):46:50 -> <init>
-    1:4:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):55:58 -> a
-    5:47:void computeFieldOptimizationInfo():71:113 -> a
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:5: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):45:49 -> <init>
+    1:4:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):54:57 -> a
+    5:47:void computeFieldOptimizationInfo():70:112 -> a
     48:49:boolean com.android.tools.r8.ir.code.DominatorTree.dominatesAllOf(com.android.tools.r8.ir.code.BasicBlock,java.lang.Iterable):118:119 -> a
-    48:49:void computeFieldOptimizationInfo():113 -> a
-    50:50:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):127:127 -> a
-    50:50:void computeFieldOptimizationInfo():117 -> a
-    51:51:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):153:153 -> a
-    51:51:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):130 -> a
-    51:51:void computeFieldOptimizationInfo():117 -> a
-    52:55:java.util.Map getOrCreateFieldsMaybeReadBeforeBlockInclusive():63:66 -> a
-    52:55:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):163 -> a
-    52:55:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):154 -> a
-    52:55:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):130 -> a
-    52:55:void computeFieldOptimizationInfo():117 -> a
-    56:56:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):163:163 -> a
-    56:56:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):154 -> a
-    56:56:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):130 -> a
-    56:56:void computeFieldOptimizationInfo():117 -> a
-    57:64:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):136:143 -> a
-    57:64:void computeFieldOptimizationInfo():117 -> a
-    65:65:void computeFieldOptimizationInfo():120:120 -> a
-    66:75:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):247:256 -> a
-    66:75:void computeFieldOptimizationInfo():120 -> a
-    76:76:java.util.LinkedList lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField):90:90 -> a
-    77:77:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$1(com.android.tools.r8.ir.code.BasicBlock):178:178 -> a
-    1:70:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():171:240 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.w.a.m.e:
+    48:49:void computeFieldOptimizationInfo():112 -> a
+    50:50:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):126:126 -> a
+    50:50:void computeFieldOptimizationInfo():116 -> a
+    51:51:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):152:152 -> a
+    51:51:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):129 -> a
+    51:51:void computeFieldOptimizationInfo():116 -> a
+    52:55:java.util.Map getOrCreateFieldsMaybeReadBeforeBlockInclusive():62:65 -> a
+    52:55:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):162 -> a
+    52:55:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):153 -> a
+    52:55:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):129 -> a
+    52:55:void computeFieldOptimizationInfo():116 -> a
+    56:56:boolean fieldMaybeReadBeforeBlockInclusive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):162:162 -> a
+    56:56:boolean fieldMaybeReadBeforeBlock(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.BasicBlock):153 -> a
+    56:56:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):129 -> a
+    56:56:void computeFieldOptimizationInfo():116 -> a
+    57:64:boolean fieldMaybeReadBeforeInstruction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Instruction):135:142 -> a
+    57:64:void computeFieldOptimizationInfo():116 -> a
+    65:65:void computeFieldOptimizationInfo():119:119 -> a
+    66:70:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):246:250 -> a
+    66:70:void computeFieldOptimizationInfo():119 -> a
+    71:71:java.util.LinkedList lambda$computeFieldOptimizationInfo$0(com.android.tools.r8.graph.DexEncodedField):89:89 -> a
+    72:72:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet lambda$createFieldsMaybeReadBeforeBlockInclusive$1(com.android.tools.r8.ir.code.BasicBlock):177:177 -> a
+    1:70:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():170:239 -> b
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.w.a.l.e:
     boolean isConcreteFieldSet() -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet() -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.w.a.m.f:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.w.a.l.f:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
     boolean isTop() -> f
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet getInstance():16:16 -> g
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.w.a.n.a:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.w.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.w.a.o.b:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.w.a.n.b:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set removedExtensionFields -> c
@@ -20410,12 +20448,12 @@
     1:1:void run():86:86 -> b
     2:2:boolean wasRemoved(com.android.tools.r8.graph.DexField):90:90 -> b
     3:10:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):105:112 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.w.a.o.a:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.w.a.n.a:
     java.util.function.Predicate val$skip -> a
     java.util.Set val$remainingProtoExtensionFieldReads -> b
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker,com.android.tools.r8.graph.DexItemFactory,java.util.function.Predicate,java.util.Set):182:182 -> <init>
     1:2:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):186:187 -> registerStaticFieldRead
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.w.a.o.c:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.w.a.n.c:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement objectArrayType -> f
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder encoder -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -20441,7 +20479,7 @@
     18:18:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):136 -> a
     18:18:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     18:18:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    19:19:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     19:19: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):144 -> a
     19:19:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):136 -> a
     19:19:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -20459,7 +20497,7 @@
     22:24:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     22:24:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     22:24:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    25:25:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    25:25:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     25:25:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):156 -> a
     25:25:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     25:25:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -20468,7 +20506,7 @@
     26:33:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     26:33:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     26:33:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    34:34:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    34:34:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     34:34:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):164 -> a
     34:34:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     34:34:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -20477,7 +20515,7 @@
     35:36:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     35:36:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     35:36:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    37:37:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     37:37:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):165 -> a
     37:37:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     37:37:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -20486,7 +20524,7 @@
     38:40:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     38:40:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     38:40:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    41:41:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    41:41:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     41:41:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):173 -> a
     41:41:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     41:41:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -20495,7 +20533,7 @@
     42:44:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     42:44:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
     42:44:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):69 -> a
-    45:45:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    45:45:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     45:45:void rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):174 -> a
     45:45:void rewriteArgumentsToNewMessageInfo(com.android.tools.r8.graph.DexEncodedMethod,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):137 -> a
     45:45:void rewriteDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118 -> a
@@ -20522,7 +20560,7 @@
     64:64:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
     65:68:void forEachDynamicMethod(java.util.function.Consumer):85:88 -> a
     69:72:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):194:197 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.w.a.o.d:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.w.a.n.d:
     com.android.tools.r8.graph.DexProto dynamicMethodProto -> i
     com.android.tools.r8.graph.DexProto findLiteExtensionByNumberProto -> j
     com.android.tools.r8.graph.DexMethod rawMessageInfoConstructor -> l
@@ -20546,20 +20584,20 @@
     2:2:boolean isDynamicMethod(com.android.tools.r8.graph.DexEncodedMethod):83 -> a
     3:4:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):87:88 -> a
     1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):92:92 -> b
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.w.a.o.e:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.w.a.n.e:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> a
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker generatedExtensionRegistryShrinker -> c
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> e
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker generatedMessageLiteShrinker -> d
     1:14:void <init>(com.android.tools.r8.graph.AppView):19:32 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.w.a.o.f:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.w.a.n.f:
     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.w.a.o.h:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.w.a.n.h:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> a
     boolean $assertionsDisabled -> c
@@ -20594,7 +20632,7 @@
     2:21:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):300:319 -> b
     22:22:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):312:312 -> b
     23:23:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):301:301 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.w.a.o.g:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.w.a.n.g:
     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):254:256 -> <init>
@@ -20607,7 +20645,7 @@
     9:9:int nextInt():286:286 -> b
     10:10:int nextInt():275:275 -> b
     11:11:int nextInt():266:266 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.w.a.o.h$a:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.w.a.n.h$a:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -20622,10 +20660,10 @@
     16:16:java.lang.Object next():319 -> b
     17:17:com.android.tools.r8.ir.code.Value next():341:341 -> b
     17:17:java.lang.Object next():319 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.w.a.o.h$b:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.w.a.n.h$b:
     1:1:void <init>():364:364 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):364:364 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.w.a.o.i:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.w.a.n.i:
     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
@@ -20638,25 +20676,25 @@
     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.w.a.o.j.a:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.w.a.n.j.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() -> d
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.w.a.o.j.b:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.w.a.n.j.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
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35:35 -> a
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34 -> a
     3:8:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:41 -> a
     boolean isLiveProtoFieldObject() -> e
     1:1:com.android.tools.r8.graph.DexField getField():28:28 -> h
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.w.a.o.j.c:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.w.a.n.j.c:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> d
@@ -20702,7 +20740,7 @@
     236:236:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):353 -> a
     237:250:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):354:367 -> a
     251:251:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):355:355 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.w.a.o.j.d:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.w.a.n.j.d:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
     boolean $assertionsDisabled -> e
@@ -20732,11 +20770,11 @@
     2:2:boolean hasHazzerBitField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):119:119 -> d
     1:1:boolean hasAuxData():41:41 -> e
     1:15:java.lang.String toString():189:203 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.w.a.o.j.e:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.w.a.n.j.e:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject asProtoFieldObject() -> b
     boolean isProtoFieldObject() -> f
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.w.a.o.j.f:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.w.a.n.j.f:
     boolean $assertionsDisabled -> e
     boolean isRequired -> b
     boolean needsIsInitializedCheck -> c
@@ -20761,11 +20799,11 @@
     1:1:boolean isValid():111:111 -> k
     1:1:boolean needsIsInitializedCheck():116:116 -> l
     1:8:int serialize():136:143 -> m
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.w.a.o.j.g:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.w.a.n.j.g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> a
     1:3:void <init>():10:12 -> <init>
     1:4:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):15:18 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.w.a.o.j.i:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.w.a.n.j.i:
     java.util.LinkedList oneOfObjects -> d
     java.util.LinkedList fields -> b
     int flags -> a
@@ -20782,8 +20820,8 @@
     1:1:int numberOfHasBitsObjects():216:216 -> h
     1:1:int numberOfOneOfObjects():220:220 -> i
     1:9:java.lang.String toString():225:233 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.w.a.o.j.h:
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.w.a.o.j.i$a:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.w.a.n.j.h:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.w.a.n.j.i$a:
     boolean $assertionsDisabled -> e
     java.util.LinkedList oneOfObjects -> d
     java.util.LinkedList fields -> b
@@ -20803,7 +20841,7 @@
     49:86:void removeUnusedSharedData():121:158 -> c
     87:87:void removeUnusedSharedData():157:157 -> c
     88:89:void removeUnusedSharedData():76:77 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.w.a.o.j.j:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.w.a.n.j.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
@@ -20813,22 +20851,22 @@
     boolean isLiveProtoFieldObject() -> e
     boolean isProtoFieldObject() -> f
     boolean isProtoTypeObject() -> g
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.w.a.o.j.k:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.w.a.n.j.k:
     com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):21:22 -> <init>
     1:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:30 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29:29 -> a
-    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     6:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
     7:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31:31 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.w.a.o.j.l:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.w.a.n.j.l:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26:28 -> 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.TypeLatticeElement):1012:1012 -> 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.TypeLatticeElement):1008:1008 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27 -> a
     5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):29:29 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.w.a.o.j.m:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.w.a.n.j.m:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean):18:18 -> <init>
@@ -20840,7 +20878,7 @@
     boolean isOneOf() -> h
     boolean isSingular() -> j
     1:1:boolean isValid():47:47 -> k
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.w.a.o.j.n:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.w.a.n.j.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>
@@ -20848,26 +20886,26 @@
     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.w.a.o.j.o:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.w.a.n.j.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
-    2:2:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1049:1049 -> a
+    2:2:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045:1045 -> a
     2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1049 -> a
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1045 -> a
     3:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    4:4:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1050:1050 -> a
+    4:4:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1046:1046 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> c
     boolean isProtoTypeObject() -> g
     1:1:com.android.tools.r8.graph.DexType getType():21:21 -> h
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.w.a.p.a:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.w.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>
+    1:3:void <clinit>():22:24 -> <clinit>
+    1:1:void <init>(java.lang.String,int):21:21 -> <init>
 com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement -> com.android.tools.r8.ir.analysis.type.ArrayTypeLatticeElement:
     com.android.tools.r8.ir.analysis.type.TypeLatticeElement memberTypeLattice -> r
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> s
@@ -21260,8 +21298,8 @@
     int requiredRegisters() -> z
 com.android.tools.r8.ir.code.Add -> com.android.tools.r8.w.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>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():127:127 -> H2
     boolean isAdd() -> O0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -21280,7 +21318,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):67:67 -> e
     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
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingDefinition -> com.android.tools.r8.w.b.b:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):18:18 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -21290,9 +21328,9 @@
     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:int maxInValueRegister():56:56 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():56:56 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingNop -> com.android.tools.r8.w.b.c:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -21304,9 +21342,9 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):65:65 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():54:54 -> x2
-    1:1:int maxOutValueRegister():59:59 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():54:54 -> w2
+    1:1:int maxOutValueRegister():59:59 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.AlwaysMaterializingUser -> com.android.tools.r8.w.b.d:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():15:15 -> <clinit>
@@ -21321,13 +21359,13 @@
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):66 -> a
     4:4:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):71:71 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:2:int maxInValueRegister():54:55 -> x2
-    1:1:int maxOutValueRegister():60:60 -> y2
-    int opcode() -> z2
+    1:2:int maxInValueRegister():54:55 -> w2
+    1:1:int maxOutValueRegister():60:60 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.And -> com.android.tools.r8.w.b.e:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):19:19 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> H2
     boolean isAnd() -> Q0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -21341,7 +21379,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):64:64 -> c
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):69:69 -> c
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):54:54 -> d
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.w.b.f:
     boolean $assertionsDisabled -> i
     boolean knownToBeBoolean -> h
@@ -21362,14 +21400,14 @@
     6:6:boolean outTypeKnownToBeBoolean(java.util.Set):114:114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.Argument asArgument() -> d
-    1:1:int maxInValueRegister():52:52 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():52:52 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.w.b.g:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> I2
+    com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> H2
     boolean isArithmeticBinop() -> S0
     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
@@ -21396,9 +21434,9 @@
     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():264:264 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> D2
-    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> E2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():57:57 -> C2
+    1:1:com.android.tools.r8.ir.code.Value index():61:61 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isArrayGet() -> T0
@@ -21467,14 +21505,14 @@
     219:219:void lambda$constrainType$0(com.android.tools.r8.ir.code.MemberType):276:276 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.w.b.i:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():154:154 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> D2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():42:42 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     boolean isArrayLength() -> U0
@@ -21497,19 +21535,19 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):88:88 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.w.b.j:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.MemberType type -> h
     1:1:void <clinit>():30:30 -> <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):40:44 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():266:266 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> D2
-    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> E2
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> F2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value array():58:58 -> C2
+    1:1:com.android.tools.r8.ir.code.Value index():62:62 -> D2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> E2
     boolean hasInvariantOutType() -> I0
     1:5:boolean instructionInstanceCanThrow():136:140 -> M0
     boolean instructionTypeCanThrow() -> N0
@@ -21540,122 +21578,122 @@
     1:48:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):150:197 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():125:125 -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():125:125 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.w.b.k:
     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:void <clinit>():21:21 -> <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):30:35 -> <init>
+    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> C2
     boolean isIntroducingAnAlias() -> D1
-    1:1:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():82:82 -> D2
-    1:1:com.android.tools.r8.ir.code.Instruction origin():90:90 -> E2
-    1:1:com.android.tools.r8.ir.code.Value src():86:86 -> F2
+    1:1:com.android.tools.r8.ir.code.Instruction origin():85:85 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():81:81 -> E2
     boolean hasInvariantOutType() -> I0
     boolean isAssume() -> W0
-    1:1:boolean isAssumeDynamicType():137:137 -> X0
-    1:1:boolean isAssumeNonNull():150:150 -> Y0
+    1:1:boolean isAssumeDynamicType():132:132 -> X0
+    1:1:boolean isAssumeNonNull():145:145 -> Y0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
-    1:1: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
-    2:2:com.android.tools.r8.ir.code.Assume createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,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
-    3:3:boolean outTypeKnownToBeBoolean(java.util.Set):95:95 -> a
-    4:22:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):167:185 -> a
-    23:29:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):183:189 -> a
-    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):204:204 -> a
-    31:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):209:209 -> a
-    32:36:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):229:233 -> a
+    1:1: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):45:45 -> a
+    2:2:com.android.tools.r8.ir.code.Assume createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,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):55:55 -> a
+    3:3:boolean outTypeKnownToBeBoolean(java.util.Set):90:90 -> a
+    4:22:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):162:180 -> a
+    23:29:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):178:184 -> a
+    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):199:199 -> a
+    31:31:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):204:204 -> a
+    32:36:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):224:228 -> a
     37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forAssume():235:235 -> a
-    37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):239 -> a
-    38:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):244:251 -> a
-    46:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):245:245 -> a
-    47:47:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):256:256 -> a
-    48:48:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):266:266 -> a
-    1:1:com.android.tools.r8.ir.code.Assume createAssumeNoneInstruction(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:41 -> b
-    2:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):276:279 -> b
-    6:6:boolean isAssumeNone():124:124 -> b
-    6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):280 -> b
-    7:7:boolean isAssumeDynamicType():137:137 -> b
-    7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):280 -> b
-    8:11:boolean verifyTypes(com.android.tools.r8.graph.AppView):285:288 -> b
-    12:14:boolean verifyTypes(com.android.tools.r8.graph.AppView):287:289 -> b
-    15:17:boolean verifyTypes(com.android.tools.r8.graph.AppView):281:283 -> b
+    37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):234 -> a
+    38:45:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):239:246 -> a
+    46:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):240:240 -> a
+    47:47:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):251:251 -> a
+    48:48:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):261:261 -> a
+    1:1:com.android.tools.r8.ir.code.Assume createAssumeNoneInstruction(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):40:40 -> b
+    2:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):271:274 -> b
+    6:6:boolean isAssumeNone():119:119 -> b
+    6:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):275 -> b
+    7:7:boolean isAssumeDynamicType():132:132 -> b
+    7:7:boolean verifyTypes(com.android.tools.r8.graph.AppView):275 -> b
+    8:11:boolean verifyTypes(com.android.tools.r8.graph.AppView):280:283 -> b
+    12:14:boolean verifyTypes(com.android.tools.r8.graph.AppView):282:284 -> b
+    15:17:boolean verifyTypes(com.android.tools.r8.graph.AppView):276:278 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    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 isOutConstant() -> g2
+    1:1:boolean isAssumeDynamicType():132:132 -> c
+    1:1:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):65 -> c
+    2:2:boolean verifyInstructionIsNeeded(com.android.tools.r8.graph.AppView):66:66 -> c
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
-    1:1:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():142:142 -> j
-    2:2:boolean isAssumeDynamicType():137:137 -> j
-    2:2:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():142 -> j
-    3:3:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():142:142 -> j
-    1:1:com.android.tools.r8.ir.code.Assume asAssumeNonNull():155:155 -> k
-    1:1:java.lang.String toString():302:302 -> toString
-    2:2:boolean isAssumeNone():124:124 -> toString
-    2:2:java.lang.String toString():303 -> toString
-    3:3:java.lang.String toString():303:303 -> toString
-    4:4:boolean isAssumeDynamicType():137:137 -> toString
-    4:4:java.lang.String toString():306 -> toString
-    5:5:java.lang.String toString():307:307 -> toString
-    6:6:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():82:82 -> toString
-    6:6:java.lang.String toString():307 -> toString
-    7:16:java.lang.String toString():307:316 -> toString
-    17:17:java.lang.String toString():304:304 -> toString
-    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():199:199 -> w0
-    1:1:int maxInValueRegister():214:214 -> x2
-    1:1:int maxOutValueRegister():219:219 -> y2
-    1:1:boolean isAssumeNone():124:124 -> z0
-    1:1:java.lang.String getInstructionName():100 -> z0
-    2:2:boolean isAssumeDynamicType():137:137 -> z0
-    2:2:java.lang.String getInstructionName():103 -> z0
-    3:6:java.lang.String getInstructionName():106:109 -> z0
-    int opcode() -> z2
+    1:1:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():137:137 -> j
+    2:2:boolean isAssumeDynamicType():132:132 -> j
+    2:2:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():137 -> j
+    3:3:com.android.tools.r8.ir.code.Assume asAssumeDynamicType():137:137 -> j
+    1:1:com.android.tools.r8.ir.code.Assume asAssumeNonNull():150:150 -> k
+    1:3:java.lang.String toString():293:295 -> toString
+    4:4:boolean isAssumeNone():119:119 -> toString
+    4:4:java.lang.String toString():296 -> toString
+    5:5:java.lang.String toString():296:296 -> toString
+    6:6:boolean isAssumeDynamicType():132:132 -> toString
+    6:6:java.lang.String toString():299 -> toString
+    7:7:java.lang.String toString():300:300 -> toString
+    8:8:com.android.tools.r8.ir.code.Assume$Assumption getAssumption():77:77 -> toString
+    8:8:java.lang.String toString():300 -> toString
+    9:15:java.lang.String toString():300:306 -> toString
+    16:16:java.lang.String toString():297:297 -> toString
+    1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():194:194 -> w0
+    1:1:int maxInValueRegister():209:209 -> w2
+    1:1:int maxOutValueRegister():214:214 -> x2
+    int opcode() -> y2
+    1:1:boolean isAssumeNone():119:119 -> z0
+    1:1:java.lang.String getInstructionName():95 -> z0
+    2:2:boolean isAssumeDynamicType():132:132 -> z0
+    2:2:java.lang.String getInstructionName():98 -> z0
+    3:6:java.lang.String getInstructionName():101:104 -> z0
 com.android.tools.r8.ir.code.Assume$1 -> com.android.tools.r8.w.b.k$a:
 com.android.tools.r8.ir.code.Assume$Assumption -> com.android.tools.r8.w.b.k$b:
-    1:1:void <init>():319:319 -> <init>
+    1:1:void <init>():309:309 -> <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.w.b.k$c:
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement dynamicLowerBoundType -> b
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicUpperBoundType -> a
+    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement lowerBoundType -> b
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement type -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():359:359 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.ir.code.Assume$1):359:359 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):365:367 -> <init>
+    1:1:void <clinit>():349:349 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement,com.android.tools.r8.ir.code.Assume$1):349:349 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):354:356 -> <init>
     boolean isAssumeDynamicType() -> a
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement access$100(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):359:359 -> 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):385:385 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement access$100(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):349:349 -> 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):374:374 -> a
     boolean isAssumeNonNull() -> b
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement access$200(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):359:359 -> b
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement access$200(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):349:349 -> b
     boolean isAssumeNone() -> c
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():375:375 -> d
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType():371:371 -> e
-    1:5:boolean equals(java.lang.Object):394:398 -> equals
-    1:1:int hashCode():404:404 -> hashCode
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getLowerBoundType():364:364 -> d
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getType():360:360 -> e
+    1:5:boolean equals(java.lang.Object):383:387 -> equals
+    1:1:int hashCode():392:392 -> hashCode
 com.android.tools.r8.ir.code.Assume$NoAssumption -> com.android.tools.r8.w.b.k$d:
     com.android.tools.r8.ir.code.Assume$NoAssumption instance -> a
     boolean $assertionsDisabled -> b
-    1:2:void <clinit>():338:339 -> <clinit>
-    1:1:void <init>():341:341 -> <init>
+    1:2:void <clinit>():328:329 -> <clinit>
+    1:1:void <init>():331:331 -> <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):354:354 -> 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):344:344 -> a
     boolean isAssumeNonNull() -> b
     boolean isAssumeNone() -> c
-    1:1:com.android.tools.r8.ir.code.Assume$NoAssumption get():344:344 -> d
+    1:1:com.android.tools.r8.ir.code.Assume$NoAssumption get():334:334 -> d
 com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.w.b.k$e:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption instance -> a
     boolean $assertionsDisabled -> b
-    1:3:void <clinit>():408:410 -> <clinit>
-    1:1:void <init>():412:412 -> <init>
+    1:3:void <clinit>():396:398 -> <clinit>
+    1:1:void <init>():400:400 -> <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):425:425 -> 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):413:413 -> a
     boolean isAssumeNonNull() -> b
     boolean isAssumeNone() -> c
-    1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():415:415 -> d
+    1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():403:403 -> d
 com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.w.b.l:
     int color -> n
     int estimatedPredecessorsCount -> l
@@ -21717,119 +21755,116 @@
     3:3:void setLocalsAtEntry(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):90:90 -> a
     4:8:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):180:184 -> a
     9:26:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):266:283 -> a
-    27:27:void com.android.tools.r8.ir.code.Phi.removeTrivialPhi():228:228 -> a
+    27:27:void com.android.tools.r8.ir.code.Phi.removeTrivialPhi():227:227 -> a
     27:27:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):284 -> a
     28:45:void swapSuccessorsByIndex(int,int):313:330 -> a
     46:53:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):445:452 -> a
-    54:57:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456:459 -> a
-    58:59:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):41:42 -> a
-    58:59:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):459 -> a
-    60:65:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):459:464 -> a
-    66:66:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    66:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464 -> a
-    67:85:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464:482 -> a
-    86:86:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    86:86:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484 -> a
-    87:103:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484:500 -> a
-    104:104:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):574:574 -> a
-    105:106:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):643:644 -> a
-    107:109:void clearMark(int):656:658 -> a
-    110:110:void addPhi(com.android.tools.r8.ir.code.Phi):688:688 -> a
-    111:111:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:702 -> a
-    112:112:boolean isFilled():535:535 -> a
-    112:112:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702 -> a
-    113:116:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:705 -> a
-    117:117:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:709 -> a
-    118:118:boolean isFilled():535:535 -> a
-    118:118:void close(com.android.tools.r8.ir.conversion.IRBuilder):709 -> a
-    119:123:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:713 -> a
-    124:124:boolean com.android.tools.r8.ir.code.JumpInstruction.isJumpInstruction():0:0 -> a
-    124:124:void close(com.android.tools.r8.ir.conversion.IRBuilder):713 -> a
-    125:125:void close(com.android.tools.r8.ir.conversion.IRBuilder):714:714 -> a
-    126:127:boolean verifyNoValuesAfterThrowingInstruction():1580:1581 -> a
-    126:127:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
-    128:128:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> a
-    128:128:boolean verifyNoValuesAfterThrowingInstruction():1581 -> a
-    128:128:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
-    129:134:boolean verifyNoValuesAfterThrowingInstruction():1582:1587 -> a
-    129:134:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
-    135:135:void close(com.android.tools.r8.ir.conversion.IRBuilder):715:715 -> a
-    136:147:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1079:1090 -> a
-    136:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):716 -> a
-    148:148:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):796:796 -> a
-    149:153:boolean isCatchHandlerForSingleGuard():822:826 -> a
-    149:153:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):797 -> a
-    154:158:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):799:803 -> a
-    159:159:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):814:814 -> a
-    160:169:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):843:852 -> a
-    170:179:void linkCatchSuccessors(java.util.List,java.util.List):891:900 -> a
-    180:192:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):904:916 -> a
-    193:196:int numberOfNormalSuccessors():218:221 -> a
-    193:196:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):917 -> a
-    197:210:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):922:935 -> a
-    211:221:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):946:956 -> a
-    222:223:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1006:1007 -> a
-    222:223:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1019 -> a
-    224:226:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1021:1023 -> a
-    227:245:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1044:1062 -> a
-    246:250:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1069:1073 -> a
-    251:254:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1072:1075 -> a
-    255:256:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1095:1096 -> a
-    257:261:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1124:1128 -> a
-    262:269:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1141:1148 -> a
-    270:273:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1258:1261 -> a
-    274:306:void print(com.android.tools.r8.utils.CfgPrinter):1266:1298 -> a
-    307:308:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1302:1303 -> a
-    309:321:void removeInstructions(java.util.List):1324:1336 -> a
-    322:322:void setInstructions(java.util.LinkedList):1316:1316 -> a
-    322:322:void removeInstructions(java.util.List):1337 -> a
-    323:324: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):1361:1362 -> a
-    325:329:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1375:1379 -> a
-    330:336: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[]):1410:1416 -> a
-    337:346: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):1432:1441 -> a
-    347:347:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    347:347: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):1442 -> a
-    348:348:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    348:348: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):1443 -> a
-    349:350: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):1444:1445 -> a
-    351:352:boolean canThrow():1557:1558 -> a
-    353:353:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606:1606 -> a
-    354:354:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
-    354:354:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606 -> a
-    355:355:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
-    356:356:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1614:1614 -> a
-    357:357:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1625:1625 -> a
-    358:369:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1643:1654 -> a
-    370:375:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1675:1680 -> a
-    370:375:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1658 -> a
-    376:380:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1662:1666 -> a
-    381:397:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1691:1707 -> a
-    398:428:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1756 -> a
-    398:428: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):1707 -> a
-    429:429:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    429:429:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1757 -> a
-    429:429: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):1707 -> a
-    430:433:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1758:1761 -> a
-    430:433: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):1707 -> a
-    434:434:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
-    434:434:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1762 -> a
-    434:434: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):1707 -> a
-    435:440:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1763:1768 -> a
-    435:440: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):1707 -> a
-    441:441:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1746 -> a
-    441:441: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):1707 -> a
-    442:442:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    442:442:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746 -> a
-    442:442: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):1707 -> a
-    443:477:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1780 -> a
-    443:477: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):1707 -> a
-    478:478:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):131:131 -> a
-    478:478:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1782 -> a
-    478:478: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):1707 -> a
-    479:479:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783:1783 -> a
-    479:479: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):1707 -> a
-    480:480:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1726 -> a
-    480:480: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):1707 -> a
+    54:62:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):456:464 -> a
+    63:63:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
+    63:63:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464 -> a
+    64:82:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):464:482 -> a
+    83:83:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
+    83:83:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484 -> a
+    84:100:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):484:500 -> a
+    101:101:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):574:574 -> a
+    102:103:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):643:644 -> a
+    104:106:void clearMark(int):656:658 -> a
+    107:107:void addPhi(com.android.tools.r8.ir.code.Phi):688:688 -> a
+    108:108:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:702 -> a
+    109:109:boolean isFilled():535:535 -> a
+    109:109:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702 -> a
+    110:113:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):702:705 -> a
+    114:114:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:709 -> a
+    115:115:boolean isFilled():535:535 -> a
+    115:115:void close(com.android.tools.r8.ir.conversion.IRBuilder):709 -> a
+    116:120:void close(com.android.tools.r8.ir.conversion.IRBuilder):709:713 -> a
+    121:121:boolean com.android.tools.r8.ir.code.JumpInstruction.isJumpInstruction():0:0 -> a
+    121:121:void close(com.android.tools.r8.ir.conversion.IRBuilder):713 -> a
+    122:122:void close(com.android.tools.r8.ir.conversion.IRBuilder):714:714 -> a
+    123:124:boolean verifyNoValuesAfterThrowingInstruction():1580:1581 -> a
+    123:124:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    125:125:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1598:1598 -> a
+    125:125:boolean verifyNoValuesAfterThrowingInstruction():1581 -> a
+    125:125:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    126:131:boolean verifyNoValuesAfterThrowingInstruction():1582:1587 -> a
+    126:131:void close(com.android.tools.r8.ir.conversion.IRBuilder):714 -> a
+    132:132:void close(com.android.tools.r8.ir.conversion.IRBuilder):715:715 -> a
+    133:144:void filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1079:1090 -> a
+    133:144:void close(com.android.tools.r8.ir.conversion.IRBuilder):716 -> a
+    145:145:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):796:796 -> a
+    146:150:boolean isCatchHandlerForSingleGuard():822:826 -> a
+    146:150:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):797 -> a
+    151:155:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):799:803 -> a
+    156:156:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):814:814 -> a
+    157:166:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):843:852 -> a
+    167:176:void linkCatchSuccessors(java.util.List,java.util.List):891:900 -> a
+    177:189:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):904:916 -> a
+    190:193:int numberOfNormalSuccessors():218:221 -> a
+    190:193:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):917 -> a
+    194:207:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):922:935 -> a
+    208:218:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLense):946:956 -> a
+    219:220:com.android.tools.r8.ir.code.Value readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1006:1007 -> a
+    219:220:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1019 -> a
+    221:223:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1021:1023 -> a
+    224:242:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1044:1062 -> a
+    243:247:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1069:1073 -> a
+    248:251:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1072:1075 -> a
+    252:253:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1095:1096 -> a
+    254:258:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1124:1128 -> a
+    259:266:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1141:1148 -> a
+    267:270:void printDebugValueSet(java.lang.String,java.util.List,java.lang.StringBuilder):1258:1261 -> a
+    271:303:void print(com.android.tools.r8.utils.CfgPrinter):1266:1298 -> a
+    304:305:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1302:1303 -> a
+    306:318:void removeInstructions(java.util.List):1324:1336 -> a
+    319:319:void setInstructions(java.util.LinkedList):1316:1316 -> a
+    319:319:void removeInstructions(java.util.List):1337 -> a
+    320:321: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):1361:1362 -> a
+    322:326:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1375:1379 -> a
+    327:333: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[]):1410:1416 -> a
+    334:343: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):1432:1441 -> a
+    344:344:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    344:344: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):1442 -> a
+    345:345:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    345:345: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):1443 -> a
+    346:347: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):1444:1445 -> a
+    348:349:boolean canThrow():1557:1558 -> a
+    350:350:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606:1606 -> a
+    351:351:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
+    351:351:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1606 -> a
+    352:352:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1610:1610 -> a
+    353:353:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1614:1614 -> a
+    354:354:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1625:1625 -> a
+    355:366:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1643:1654 -> a
+    367:372:void moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1675:1680 -> a
+    367:372:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1658 -> a
+    373:377:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1662:1666 -> a
+    378:394: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):1691:1707 -> a
+    395:425:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1756 -> a
+    395:425: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):1707 -> a
+    426:426:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    426:426:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1757 -> a
+    426:426: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):1707 -> a
+    427:430:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1758:1761 -> a
+    427:430: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):1707 -> a
+    431:431:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):698:698 -> a
+    431:431:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1762 -> a
+    431:431: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):1707 -> a
+    432:437:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1763:1768 -> a
+    432:437: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):1707 -> a
+    438:438:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1746 -> a
+    438:438: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):1707 -> a
+    439:439:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    439:439:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746 -> a
+    439:439: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):1707 -> a
+    440:474:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1746:1780 -> a
+    440:474: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):1707 -> a
+    475:475:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    475:475:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1782 -> a
+    475:475: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):1707 -> a
+    476:476:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1783:1783 -> a
+    476:476: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):1707 -> a
+    477:477:int splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1726:1726 -> a
+    477:477: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):1707 -> a
     1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):244:244 -> b
     2:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):335:365 -> b
     33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
@@ -21941,7 +21976,7 @@
     1:1:int doHash(java.lang.Object):1904:1904 -> doHash
     2:2:int doHash(com.android.tools.r8.ir.code.Phi):1919:1919 -> doHash
     2:2:int doHash(java.lang.Object):1904 -> doHash
-    3:3:int com.android.tools.r8.ir.code.Value.hashCode():763:763 -> doHash
+    3:3:int com.android.tools.r8.ir.code.Value.hashCode():764:764 -> doHash
     3:3:int doHash(com.android.tools.r8.ir.code.Phi):1920 -> doHash
     3:3:int doHash(java.lang.Object):1904 -> doHash
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.w.b.l$e:
@@ -21949,7 +21984,7 @@
     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():335:335 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> 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.w.b.m:
@@ -21970,116 +22005,116 @@
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.code.Position position -> d
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:1:void <clinit>():27:27 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):36:36 -> <init>
-    2:9:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):32:39 -> <init>
-    10:10:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):42:42 -> <init>
-    11:24:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):32:45 -> <init>
-    25:26:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):50:51 -> <init>
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):37:37 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):33:40 -> <init>
+    10:10:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):43:43 -> <init>
+    11:24:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):33:46 -> <init>
+    25:26:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):51:52 -> <init>
     boolean lambda$inlineInvoke$2(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
     boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):88:88 -> a
-    2:2:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):183:183 -> a
+    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):89:89 -> a
+    2:2:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):184:184 -> a
     3:3:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    3:3:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):186 -> a
-    4:17:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):186:199 -> a
-    18:18:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):184:184 -> a
-    19:23:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):204:208 -> a
-    24:47:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):227:250 -> a
+    3:3:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):187 -> a
+    4:17:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):187:200 -> a
+    18:18:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):185:185 -> a
+    19:23:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):205:209 -> a
+    24:47:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):228:251 -> a
     48:48:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    48:48:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):250 -> a
-    49:62:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):250:263 -> a
-    63:63:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):228:228 -> a
-    64:73:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):265:274 -> a
-    74:81:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):282:289 -> a
-    82:82:boolean hasNext():56:56 -> a
-    82:82:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):289 -> a
-    83:86:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):289:292 -> a
+    48:48:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251 -> a
+    49:62:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):251:264 -> a
+    63:63:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):229:229 -> a
+    64:73:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):266:275 -> a
+    74:81:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):283:290 -> a
+    82:82:boolean hasNext():57:57 -> a
+    82:82:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290 -> a
+    83:86:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):290:293 -> a
     87:87:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    87:87:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):292 -> a
-    88:88:boolean hasPrevious():72:72 -> a
-    88:88:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):296 -> a
-    89:93:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):296:300 -> a
+    87:87:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):293 -> a
+    88:88:boolean hasPrevious():73:73 -> a
+    88:88:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297 -> a
+    89:93:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):297:301 -> a
     94:95:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    94:95:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):300 -> a
-    96:114:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):301:319 -> a
-    115:122:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):328:335 -> a
-    123:155:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):361:393 -> a
-    156:161:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):431:436 -> a
-    162:168: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):447:453 -> a
-    169:171:boolean canThrow(com.android.tools.r8.ir.code.IRCode):341:343 -> a
-    169:171: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):455 -> a
-    172:189: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):459:476 -> a
+    94:95:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):301 -> a
+    96:114:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):302:320 -> a
+    115:122:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):329:336 -> a
+    123:155:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):362:394 -> a
+    156:161:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):432:437 -> a
+    162:168: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):448:454 -> a
+    169:171:boolean canThrow(com.android.tools.r8.ir.code.IRCode):342:344 -> a
+    169:171: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):456 -> a
+    172:189: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):460:477 -> a
     190:190:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    190: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):476 -> a
-    191:198: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):476:483 -> a
+    190: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):477 -> a
+    191:198: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):477:484 -> a
     199:199:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    199:199: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):486 -> a
-    200:203: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):486:489 -> a
-    204:206: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):488:490 -> a
-    207:207:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    207: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):491 -> a
-    208:240: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):491:523 -> a
+    199:199: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):487 -> a
+    200:203: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):487:490 -> a
+    204:206: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):489:491 -> a
+    207:207:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    207: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):492 -> a
+    208:240: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):492:524 -> a
     241:241:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    241:241: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):527 -> a
-    242:246: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):527:531 -> a
+    241:241: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):528 -> a
+    242:246: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):528:532 -> a
     247:247:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> a
-    247:247: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):532 -> a
-    248: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):532:539 -> a
+    247:247: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):533 -> a
+    248: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):533:540 -> a
     256:256:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> 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):539 -> a
-    257:276: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:558 -> 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):540 -> a
+    257:276: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):540:559 -> a
     277:277:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    277:277: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):558 -> a
-    278:278: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):561:561 -> a
+    277:277: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):559 -> a
+    278:278: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):562:562 -> a
     279:279:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    279:279: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):560 -> a
-    280:313: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):559:592 -> a
-    314:314:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):950:950 -> a
-    314:314: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):592 -> a
-    315: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):595:608 -> a
-    329:345: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):408:424 -> a
-    329:345: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):609 -> a
-    346:351: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):616:621 -> a
+    279:279: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):561 -> a
+    280:313: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):560:593 -> a
+    314:314:java.util.ListIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):946:946 -> a
+    314:314: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):593 -> a
+    315: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):596:609 -> a
+    329:345: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):409:425 -> a
+    329:345: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):610 -> a
+    346:351: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):617:622 -> a
     352:352:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    352:352: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):621 -> a
-    353:363: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):621:631 -> a
-    364:368: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):630:634 -> a
-    369:395:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):640:666 -> a
-    396:396:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):131:131 -> a
-    396:396:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):671 -> a
-    397:397:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672:672 -> a
+    352:352: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):622 -> a
+    353:363: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):622:632 -> a
+    364:368: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):631:635 -> a
+    369:395:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):641:667 -> a
+    396:396:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    396:396:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672 -> a
+    397:397:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:673 -> a
     398:398:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    398:398:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672 -> a
-    399:416:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):672:689 -> a
-    417:417:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
-    417:417:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):213 -> a
-    418:420:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):215:217 -> a
-    1:1:void add(java.lang.Object):27:27 -> add
-    1:7:void add(com.android.tools.r8.ir.code.Instruction):101:107 -> b
-    1:7:void removeOrReplaceByDebugLocalRead():171:177 -> d
-    8:8:void removeOrReplaceByDebugLocalRead():172:172 -> d
-    1:5:void removeInstructionIgnoreOutValue():162:166 -> h
-    6:6:void removeInstructionIgnoreOutValue():163:163 -> h
-    1:1:boolean hasNext():56:56 -> hasNext
-    1:1:boolean hasPrevious():72:72 -> hasPrevious
-    1:1:java.lang.Object next():27:27 -> next
-    2:2:com.android.tools.r8.ir.code.Instruction next():61:61 -> next
-    1:1:int nextIndex():67:67 -> nextIndex
-    1:1:java.lang.Object previous():27:27 -> previous
-    2:2:com.android.tools.r8.ir.code.Instruction previous():77:77 -> previous
-    1:1:int previousIndex():83:83 -> previousIndex
-    1:6:void remove():137:142 -> remove
+    398:398:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673 -> a
+    399:416:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):673:690 -> a
+    417:417:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    417:417:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):214 -> a
+    418:420:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):216:218 -> a
+    1:1:void add(java.lang.Object):28:28 -> add
+    1:7:void add(com.android.tools.r8.ir.code.Instruction):102:108 -> b
+    1:7:void removeOrReplaceByDebugLocalRead():172:178 -> d
+    8:8:void removeOrReplaceByDebugLocalRead():173:173 -> d
+    1:5:void removeInstructionIgnoreOutValue():163:167 -> h
+    6:6:void removeInstructionIgnoreOutValue():164:164 -> h
+    1:1:boolean hasNext():57:57 -> hasNext
+    1:1:boolean hasPrevious():73:73 -> hasPrevious
+    1:1:java.lang.Object next():28:28 -> next
+    2:2:com.android.tools.r8.ir.code.Instruction next():62:62 -> next
+    1:1:int nextIndex():68:68 -> nextIndex
+    1:1:java.lang.Object previous():28:28 -> previous
+    2:2:com.android.tools.r8.ir.code.Instruction previous():78:78 -> previous
+    1:1:int previousIndex():84:84 -> previousIndex
+    1:6:void remove():138:143 -> remove
     7:7:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> remove
-    7:7:void remove():142 -> remove
-    8:9:void remove():142:143 -> remove
+    7:7:void remove():143 -> remove
+    8:9:void remove():143:144 -> remove
     10:10:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> remove
-    10:10:void remove():143 -> remove
-    11:25:void remove():143:157 -> remove
-    26:26:void remove():138:138 -> remove
-    1:1:void set(java.lang.Object):27:27 -> set
-    2:5:void set(com.android.tools.r8.ir.code.Instruction):120:123 -> set
-    2:5:void set(java.lang.Object):27 -> set
+    10:10:void remove():144 -> remove
+    11:25:void remove():144:158 -> remove
+    26:26:void remove():139:139 -> remove
+    1:1:void set(java.lang.Object):28:28 -> set
+    2:5:void set(com.android.tools.r8.ir.code.Instruction):121:124 -> set
+    2:5:void set(java.lang.Object):28 -> set
 com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.w.b.o:
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> a
@@ -22105,15 +22140,15 @@
 com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.w.b.p:
     com.android.tools.r8.ir.code.NumericType type -> h
     1:8:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:31 -> <init>
-    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> D2
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> F2
-    1:2:int maxInOutValueRegisterSize():82:83 -> G2
-    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> H2
+    1:1:com.android.tools.r8.ir.code.NumericType getNumericType():36:36 -> C2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.ir.code.Value leftValue():40:40 -> E2
+    1:2:int maxInOutValueRegisterSize():82:83 -> F2
+    1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> G2
     boolean hasInvariantOutType() -> I0
     boolean isBinop() -> Z0
     1:8:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1261:1261 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1256:1256 -> a
     9:9:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
     10:10:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58:58 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():75:75 -> a
@@ -22129,8 +22164,8 @@
     1:3:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):64 -> g
     1:3:boolean fitsInLit8Instruction(com.android.tools.r8.ir.code.Value):74:76 -> h
     com.android.tools.r8.ir.code.Binop asBinop() -> l
-    1:1:int maxInValueRegister():90:90 -> x2
-    1:1:int maxOutValueRegister():95:95 -> y2
+    1:1:int maxInValueRegister():90:90 -> w2
+    1:1:int maxOutValueRegister():95:95 -> x2
 com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.w.b.q:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> e
@@ -22197,10 +22232,10 @@
     com.android.tools.r8.graph.DexType type -> h
     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):30:31 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> D2
-    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> E2
-    1:1:com.android.tools.r8.ir.code.Value object():49 -> E2
-    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> E2
+    1:1:com.android.tools.r8.graph.DexType getType():45:45 -> C2
+    1:1:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> D2
+    1:1:com.android.tools.r8.ir.code.Value object():49 -> D2
+    2:2:com.android.tools.r8.ir.code.Value object():49:49 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41:41 -> a
@@ -22219,15 +22254,15 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     1:1:java.lang.String toString():108:108 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.w.b.t:
     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>
-    boolean isCommutative() -> E2
+    boolean isCommutative() -> D2
     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:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:86 -> a
@@ -22246,9 +22281,9 @@
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     1:17:java.lang.String toString():104:120 -> toString
     18:40:java.lang.String toString():109:131 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.w.b.t$a:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
@@ -22263,7 +22298,7 @@
     com.android.tools.r8.graph.DexType clazz -> h
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):29:30 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> D2
+    1:1:com.android.tools.r8.graph.DexType getValue():61:61 -> C2
     boolean instructionInstanceCanThrow() -> M0
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):40:40 -> a
@@ -22299,12 +22334,12 @@
     49:49:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):182:182 -> a
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> b
     boolean isConstClass() -> c1
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     1:1:java.lang.String toString():83:83 -> toString
-    1:1:int maxInValueRegister():72:72 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():72:72 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.w.b.v:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
@@ -22323,7 +22358,7 @@
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> h
     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:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> D2
+    1:1:com.android.tools.r8.graph.DexMethodHandle getValue():57:57 -> C2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodHandle copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodHandle):49:49 -> a
@@ -22342,18 +22377,18 @@
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():275:275 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):85 -> a
     boolean isConstMethodHandle() -> e1
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     1:1:java.lang.String toString():95:95 -> toString
-    1:1:int maxInValueRegister():78:78 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():78:78 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.w.b.x:
     com.android.tools.r8.graph.DexProto methodType -> h
     boolean $assertionsDisabled -> i
     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:com.android.tools.r8.graph.DexProto getValue():57:57 -> D2
+    1:1:com.android.tools.r8.graph.DexProto getValue():57:57 -> C2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36:36 -> a
     2:2:com.android.tools.r8.ir.code.ConstMethodType copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstMethodType):49:49 -> a
@@ -22372,31 +22407,31 @@
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():279:279 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):131 -> a
     boolean isConstMethodType() -> f1
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     1:1:java.lang.String toString():89:89 -> toString
-    1:1:int maxInValueRegister():78:78 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():78:78 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.w.b.y:
     boolean $assertionsDisabled -> i
     long value -> h
     1:1:void <clinit>():32:32 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.code.Value,long):37:42 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> D2
-    1:2:double getDoubleValue():92:93 -> E2
-    1:2:float getFloatValue():87:88 -> F2
-    1:2:int getIntValue():76:77 -> G2
-    3:5:int getIntValue():76:78 -> G2
-    1:2:long getLongValue():82:83 -> H2
-    1:1:long getRawValue():97:97 -> I2
-    1:1:boolean is16Bit():273:273 -> J2
-    1:1:boolean is8Bit():265:265 -> K2
-    1:1:boolean isIntegerOne():109:109 -> L2
-    1:1:boolean isIntegerZero():105:105 -> M2
-    1:1:boolean isZero():101:101 -> N2
-    1:1:boolean negativeIs16Bit():277:277 -> O2
-    1:1:boolean negativeIs8Bit():269:269 -> P2
+    1:1:com.android.tools.r8.ir.code.Value dest():68:68 -> C2
+    1:2:double getDoubleValue():92:93 -> D2
+    1:2:float getFloatValue():87:88 -> E2
+    1:2:int getIntValue():76:77 -> F2
+    3:5:int getIntValue():76:78 -> F2
+    1:2:long getLongValue():82:83 -> G2
+    1:1:long getRawValue():97:97 -> H2
+    1:1:boolean is16Bit():273:273 -> I2
+    1:1:boolean is8Bit():265:265 -> J2
+    1:1:boolean isIntegerOne():109:109 -> K2
+    1:1:boolean isIntegerZero():105:105 -> L2
+    1:1:boolean isZero():101:101 -> M2
+    1:1:boolean negativeIs16Bit():277:277 -> N2
+    1:1:boolean negativeIs8Bit():269:269 -> O2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:4:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstNumber):56:59 -> a
     5:5:com.android.tools.r8.ir.code.ConstNumber copyOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ConstNumber):64:64 -> a
@@ -22438,20 +22473,20 @@
     107:107:boolean outTypeKnownToBeBoolean(java.util.Set):325:325 -> a
     1:4:boolean verifyTypes(com.android.tools.r8.graph.AppView):316:319 -> b
     5:5:boolean verifyTypes(com.android.tools.r8.graph.AppView):317:317 -> b
+    boolean isOutConstant() -> f2
     boolean isConstNumber() -> g1
-    boolean isOutConstant() -> g2
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     1:4:java.lang.String toString():245:248 -> toString
-    1:1:int maxInValueRegister():234:234 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():234:234 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.w.b.z:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString value -> h
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> i
     1:1:void <clinit>():20:20 -> <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):26:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> D2
+    1:1:com.android.tools.r8.graph.DexString getValue():58:58 -> C2
     1:11:boolean instructionInstanceCanThrow():110:120 -> M0
     1:1:boolean instructionTypeCanThrow():90:90 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22472,7 +22507,7 @@
     12:13:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):63:64 -> a
     14:14:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):69:69 -> a
     15:15:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     16:16:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129 -> a
     17:17:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:129 -> a
     18:18:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):134:134 -> a
@@ -22480,29 +22515,25 @@
     20:20:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):144:144 -> a
     21:21:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):149:149 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     boolean isConstString() -> h1
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     1:1:java.lang.String toString():85:85 -> toString
-    1:1:int maxInValueRegister():74:74 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():74:74 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.w.b.A:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
-    1:14:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20:33 -> a
-    15:16:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:43 -> a
-    17: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: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: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: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
+    1:13:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20:32 -> a
+    14:14:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):41:41 -> a
+    15:15:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    15:15:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42 -> a
+    16:16:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:42 -> a
+    17:17:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    17:17:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43 -> a
+    18:22:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43:47 -> a
+    23:31:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):46:54 -> a
 com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.w.b.B:
     1:1:void <init>():19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -22517,9 +22548,9 @@
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):70 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean isDebugLocalRead() -> l1
-    1:1:int maxInValueRegister():59:59 -> x2
-    1:1:int maxOutValueRegister():64:64 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():59:59 -> w2
+    1:1:int maxOutValueRegister():64:64 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.w.b.C:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isAllowedAfterThrowingInstruction() -> P0
@@ -22535,7 +22566,7 @@
     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
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     boolean isDebugLocalWrite() -> n1
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
 com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.w.b.E:
@@ -22544,8 +22575,8 @@
     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>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> D2
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> E2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():43:43 -> C2
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():47:47 -> D2
     boolean hasInvariantOutType() -> I0
     boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22566,9 +22597,9 @@
     boolean isDebugLocalsChange() -> o1
     1:6:java.lang.String toString():92:97 -> toString
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
-    1:1:int maxInValueRegister():77:77 -> x2
-    1:1:int maxOutValueRegister():82:82 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():77:77 -> w2
+    1:1:int maxOutValueRegister():82:82 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.w.b.F:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <clinit>
@@ -22586,9 +22617,9 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean isDebugPosition() -> p1
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
-    1:1:int maxInValueRegister():55:55 -> x2
-    1:1:int maxOutValueRegister():60:60 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():55:55 -> w2
+    1:1:int maxOutValueRegister():60:60 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.w.b.G:
     1:1:void <init>():7:7 -> <init>
     java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction) -> a
@@ -22610,8 +22641,8 @@
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> i
     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>
-    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> D2
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> E2
+    1:1:com.android.tools.r8.graph.DexReference getItem():63:63 -> C2
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():67:67 -> D2
     boolean instructionInstanceCanThrow() -> M0
     1:1:boolean instructionTypeCanThrow():113:113 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -22637,17 +22668,17 @@
     19:19:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):146:146 -> a
     20:20:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):151:151 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isOutConstant() -> g2
+    boolean isOutConstant() -> f2
     boolean isDexItemBasedConstString() -> q1
     1:1:java.lang.String toString():108:108 -> toString
+    1:1:int maxInValueRegister():97:97 -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
-    1:1:int maxInValueRegister():97:97 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Div -> com.android.tools.r8.w.b.I:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> H2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -22668,7 +22699,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
     boolean isDiv() -> r1
     com.android.tools.r8.ir.code.Div asDiv() -> y
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.w.b.K:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
@@ -22727,13 +22758,13 @@
     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>
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> C2
+    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> C2
+    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> C2
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> D2
-    1:1:com.android.tools.r8.ir.code.StackValue outBottom():55 -> D2
-    2:2:com.android.tools.r8.ir.code.StackValue outBottom():55:55 -> D2
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():51:51 -> E2
-    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> E2
-    2:2:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> E2
-    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> F2
+    1:1:com.android.tools.r8.ir.code.StackValue outTop():59 -> D2
+    2:2:com.android.tools.r8.ir.code.StackValue outTop():59:59 -> D2
+    1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> E2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -22745,10 +22776,10 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
     boolean isDup() -> s1
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():92:92 -> y2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():92:92 -> x2
+    int opcode() -> y2
     com.android.tools.r8.ir.code.Dup asDup() -> z
-    int opcode() -> z2
 com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.w.b.M:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -22765,40 +22796,38 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
     boolean isDup2() -> t1
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():106:106 -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():106:106 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.w.b.O:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexField field -> h
-    1:1:void <clinit>():25:25 -> <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):30:30 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):34:36 -> <init>
+    1:1:void <clinit>():22:22 -> <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):27:27 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):31:33 -> <init>
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
-    1:1:com.android.tools.r8.graph.DexField getField():46:46 -> D2
-    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():42:42 -> E2
-    com.android.tools.r8.ir.code.Value value() -> F2
+    1:1:com.android.tools.r8.graph.DexField getField():43:43 -> C2
+    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():39:39 -> D2
+    com.android.tools.r8.ir.code.Value value() -> E2
     boolean hasInvariantOutType() -> I0
-    1:7:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):62:68 -> a
+    1:7:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):59:65 -> a
     8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    8:8:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):71 -> a
-    9:21:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):73:85 -> a
+    8:8:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):68 -> a
+    9:21:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):70:82 -> a
     22:22:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():114:114 -> a
     22:22:boolean com.android.tools.r8.graph.DexEncodedField.isStaticMember():123 -> a
-    22:22:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):89 -> a
-    23:66:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):90:133 -> a
-    67:67:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):108:108 -> a
-    68:68:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):95:95 -> a
-    69:69:boolean lambda$instructionInstanceCanThrow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):129:129 -> a
-    70:93:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):176:199 -> a
-    94:94:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):198:198 -> a
-    1:6:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):144:149 -> d
-    7:7:com.android.tools.r8.graph.DexField getField():46:46 -> d
-    7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):150 -> d
-    8:11:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):152:155 -> d
+    22:22:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):86 -> a
+    23:66:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):87:130 -> a
+    67:67:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):105:105 -> a
+    68:68:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):92:92 -> a
+    69:69:boolean lambda$instructionInstanceCanThrow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):126:126 -> a
+    1:6:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):141:146 -> d
+    7:7:com.android.tools.r8.graph.DexField getField():43:43 -> d
+    7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147 -> d
+    8:11:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):149:152 -> d
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> d
-    12:12:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):155 -> d
-    13:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157:167 -> d
+    12:12:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):152 -> d
+    13:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):154:164 -> d
     boolean isFieldInstruction() -> v1
 com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.w.b.P:
     com.android.tools.r8.ir.code.FieldMemberType DOUBLE -> i
@@ -22834,19 +22863,19 @@
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int):16:18 -> <init>
-    boolean isConstant() -> E
-    boolean isFixedRegisterValue() -> G
-    1:23:com.android.tools.r8.ir.code.ValueType outType():23:45 -> W
-    24:25:com.android.tools.r8.ir.code.ValueType outType():42:43 -> W
+    boolean isConstant() -> D
+    boolean isFixedRegisterValue() -> F
+    1:23:com.android.tools.r8.ir.code.ValueType outType():23:45 -> V
+    24:25:com.android.tools.r8.ir.code.ValueType outType():42:43 -> V
+    1:1:int getRegister():49:49 -> b0
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> c
-    1:1:int getRegister():49:49 -> c0
     1:1:java.lang.String toString():69:69 -> toString
 com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.w.b.S:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.code.Goto asGoto() -> B
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> E2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> D2
     boolean isAllowedAfterThrowingInstruction() -> P0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -22856,10 +22885,10 @@
     5:10:boolean isTrivialGotoToTheNextBlock(com.android.tools.r8.ir.code.IRCode):104:109 -> a
     11:11:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):117:117 -> a
     1:4:java.lang.String toString():71:74 -> toString
+    1:1:int maxInValueRegister():59:59 -> w2
     boolean isGoto() -> x1
-    1:1:int maxInValueRegister():59:59 -> x2
-    1:1:int maxOutValueRegister():65:65 -> y2
-    int opcode() -> z2
+    1:1:int maxOutValueRegister():65:65 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.w.b.T:
     com.android.tools.r8.ir.code.ValueNumberGenerator valueNumberGenerator -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> a
@@ -22872,216 +22901,213 @@
     com.android.tools.r8.utils.InternalOptions options -> i
     com.android.tools.r8.origin.Origin origin -> j
     java.util.LinkedList blocks -> b
-    1:1:void <clinit>():50:50 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):124:124 -> <init>
-    2:32:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):104:134 -> <init>
-    1:20:void traceBlocks():401:420 -> A
-    21:33:void traceBlocks():419:431 -> A
-    34:34:boolean noColorsInUse():1149:1149 -> A
-    34:34:void traceBlocks():431 -> A
-    35:35:void traceBlocks():431:431 -> A
-    1:12:boolean verifyNoImpreciseOrBottomTypes():853:864 -> B
-    1:8:boolean verifyNoNullabilityBottomTypes():868:875 -> C
-    1:14:boolean verifySplitCriticalEdges():374:387 -> D
-    1:6:boolean computeAllThrowingInstructionsHavePositions():1072:1077 -> E
-    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():879:890 -> F
-    1:17:boolean controlFlowMayDependOnEnvironment(com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis):267:283 -> a
-    18:18:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):335:335 -> a
-    19:23:void ensureBlockNumbering():435:439 -> a
-    19:23:void print(com.android.tools.r8.utils.CfgPrinter):541 -> a
-    24:25:void print(com.android.tools.r8.utils.CfgPrinter):542:543 -> a
-    26:26:void removeBlocks(java.util.Collection):479:479 -> a
-    27:37:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):558:568 -> a
-    38:38:boolean lambda$verifyTypes$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.BasicBlock):593:593 -> a
-    39:39:void lambda$consistentBlockNumbering$2(java.lang.Integer,java.lang.Long):748:748 -> a
-    40:46:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):855:861 -> a
-    47:47:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):860:860 -> a
-    48:51:boolean lambda$wrapSSAVerifierWithStackValueHandling$8(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):897:900 -> a
-    52:52:java.lang.Iterable instructions(java.util.function.Predicate):924:924 -> a
-    53:65:java.util.List collectArguments(boolean):980:992 -> a
-    53:65:java.util.List collectArguments():976 -> a
-    66:66:java.util.List collectArguments(boolean):991:991 -> a
-    66:66:java.util.List collectArguments():976 -> a
-    67:67:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):1008:1008 -> a
-    68:69:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1030:1031 -> a
-    70:70:void setAllThrowingInstructionsHavePositions(boolean):1068:1068 -> a
-    71:74:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1097:1100 -> a
-    75:75:boolean isMarkingColorInUse(int):1136:1136 -> a
-    76:76:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1153:1153 -> a
-    77:85:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1178:1186 -> a
-    77:85:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1154 -> a
-    86:91:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1155:1160 -> a
-    92:92:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    92:92:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1160 -> a
-    93:99:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1161:1167 -> a
-    100:100:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    100:100:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1167 -> a
-    101:101:void markTransitiveSuccessors(java.util.Deque,int):1225:1225 -> a
-    102:102:boolean isMarkingColorInUse(int):1136:1136 -> a
-    102:102:void markTransitiveSuccessors(java.util.Deque,int):1225 -> a
-    103:104:boolean anyBlocksMarkedWithColor(int):1140:1141 -> a
-    103:104:void markTransitiveSuccessors(java.util.Deque,int):1225 -> a
-    105:114:void markTransitiveSuccessors(java.util.Deque,int):1225:1234 -> a
-    115:115:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1246:1246 -> a
-    116:116:boolean isMarkingColorInUse(int):1136:1136 -> a
-    116:116:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1246 -> a
-    117:128:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1246:1257 -> a
-    129:129:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> a
-    129:129:java.util.Iterator lambda$getInstructionsReachableFrom$10(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1165 -> a
-    1:53:java.util.Map computeLiveAtEntrySets():149:201 -> b
-    54:74:java.util.Map computeLiveAtEntrySets():200:220 -> b
-    75:75:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
-    75:75:java.util.Map computeLiveAtEntrySets():224 -> b
-    76:111:java.util.Map computeLiveAtEntrySets():224:259 -> b
-    112:112:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():83:83 -> b
-    112:112:java.util.Map computeLiveAtEntrySets():259 -> b
-    113:115:java.util.Map computeLiveAtEntrySets():259:261 -> b
-    116:117:boolean verifyTypes(com.android.tools.r8.graph.AppView):589:590 -> b
-    118:121:boolean validAssumeDynamicTypeInstructions(com.android.tools.r8.graph.AppView):598:601 -> b
-    118:121:boolean verifyTypes(com.android.tools.r8.graph.AppView):590 -> b
-    122:124:boolean verifyTypes(com.android.tools.r8.graph.AppView):591:593 -> b
-    125:127:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):870:872 -> b
-    128:128:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):870:870 -> b
-    129:129:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):924:924 -> b
-    130:130:java.util.ListIterator listIterator(int):950:950 -> b
-    131:131:boolean lambda$findFirstNonNonePosition$11(com.android.tools.r8.ir.code.Instruction):1265:1265 -> b
-    1:6:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):881:886 -> c
-    7:13:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):881:887 -> c
-    14:14:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):882:882 -> c
-    15:22:boolean verifySSATypeLattice(java.util.function.Predicate):906:913 -> c
-    23:29:java.util.List computeNormalExitBlocks():936:942 -> c
-    30:30:void returnMarkingColor(int):1130:1130 -> c
-    31:31:boolean isMarkingColorInUse(int):1136:1136 -> c
-    31:31:void returnMarkingColor(int):1130 -> c
-    32:32:void returnMarkingColor(int):1130:1130 -> c
-    33:34:void clearMarks(int):456:457 -> c
-    33:34:void returnMarkingColor(int):1131 -> c
-    35:35:void returnMarkingColor(int):1132:1132 -> c
-    1:4:boolean consistentBlockNumbering():743:746 -> d
-    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Instruction):885:885 -> d
-    6:6:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):894:894 -> d
-    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1054:1054 -> e
-    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> e
-    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1054 -> e
-    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():1055:1055 -> e
-    1:1:boolean doAllThrowingInstructionsHavePositions():1064:1064 -> f
-    1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():142:142 -> g
-    1:14:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1265:1278 -> h
-    1:1:int getHighestBlockNumber():1044:1044 -> i
-    1:1:int getNextInstructionNumber():972:972 -> j
-    1:7:com.android.tools.r8.ir.code.Value getThis():997:1003 -> k
-    1:3:java.util.Set getUnreachableBlocks():1191:1193 -> l
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1221:1221 -> l
-    4:4:java.util.Set getUnreachableBlocks():1193 -> l
-    5:10:java.util.Set getUnreachableBlocks():1194:1199 -> l
-    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():928:928 -> m
-    1:1:java.lang.Iterable instructions():920:920 -> n
-    1:1:boolean isConsistentGraph():576:576 -> o
-    2:2:boolean noColorsInUse():1149:1149 -> o
-    2:2:boolean isConsistentGraph():576 -> o
-    3:5:boolean isConsistentGraph():576:578 -> o
-    6:21:boolean consistentPredecessorSuccessors():714:729 -> o
-    6:21:boolean isConsistentGraph():578 -> o
-    22:22:boolean isConsistentGraph():579:579 -> o
-    23:24:boolean consistentCatchHandlers():736:737 -> o
-    23:24:boolean isConsistentGraph():579 -> o
-    25:25:boolean isConsistentGraph():580:580 -> o
-    26:29:boolean consistentBlockInstructions():755:758 -> o
-    26:29:boolean isConsistentGraph():580 -> o
+    1:1:void <clinit>():48:48 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):122:122 -> <init>
+    2:32:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod,java.util.LinkedList,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):102:132 -> <init>
+    1:20:void traceBlocks():397:416 -> A
+    21:33:void traceBlocks():415:427 -> A
+    34:34:boolean noColorsInUse():1145:1145 -> A
+    34:34:void traceBlocks():427 -> A
+    35:35:void traceBlocks():427:427 -> A
+    1:12:boolean verifyNoImpreciseOrBottomTypes():849:860 -> B
+    1:8:boolean verifyNoNullabilityBottomTypes():864:871 -> C
+    1:14:boolean verifySplitCriticalEdges():370:383 -> D
+    1:6:boolean computeAllThrowingInstructionsHavePositions():1068:1073 -> E
+    1:12:boolean verifyNoValueWithOnlyAssumeInstructionAsUsers():875:886 -> F
+    1:17:boolean controlFlowMayDependOnEnvironment(com.android.tools.r8.graph.AppView):263:279 -> a
+    18:18:boolean lambda$prepareBlocksForCatchHandlers$0(com.android.tools.r8.ir.code.BasicBlock):331:331 -> a
+    19:23:void ensureBlockNumbering():431:435 -> a
+    19:23:void print(com.android.tools.r8.utils.CfgPrinter):537 -> a
+    24:25:void print(com.android.tools.r8.utils.CfgPrinter):538:539 -> a
+    26:26:void removeBlocks(java.util.Collection):475:475 -> a
+    27:27:boolean lambda$verifyTypes$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.BasicBlock):589:589 -> a
+    28:28:void lambda$consistentBlockNumbering$2(java.lang.Integer,java.lang.Long):744:744 -> a
+    29:35:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):851:857 -> a
+    36:36:boolean lambda$verifyNoImpreciseOrBottomTypes$3(com.android.tools.r8.ir.code.Value):856:856 -> a
+    37:40:boolean lambda$wrapSSAVerifierWithStackValueHandling$8(java.util.function.Predicate,com.android.tools.r8.ir.code.Value):893:896 -> a
+    41:41:java.lang.Iterable instructions(java.util.function.Predicate):920:920 -> a
+    42:54:java.util.List collectArguments(boolean):976:988 -> a
+    42:54:java.util.List collectArguments():972 -> a
+    55:55:java.util.List collectArguments(boolean):987:987 -> a
+    55:55:java.util.List collectArguments():972 -> a
+    56:56:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):1004:1004 -> a
+    57:58:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1026:1027 -> a
+    59:59:void setAllThrowingInstructionsHavePositions(boolean):1064:1064 -> a
+    60:63:void removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1093:1096 -> a
+    64:64:boolean isMarkingColorInUse(int):1132:1132 -> a
+    65:65:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1149:1149 -> a
+    66:74:java.util.Set getBlocksReachableFromExclusive(com.android.tools.r8.ir.code.BasicBlock):1174:1182 -> a
+    66:74:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1150 -> a
+    75:80:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1151:1156 -> a
+    81:81:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    81:81:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1156 -> a
+    82:88:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1157:1163 -> a
+    89:89:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    89:89:java.lang.Iterable getInstructionsReachableFrom(com.android.tools.r8.ir.code.Instruction):1163 -> a
+    90:90:void markTransitiveSuccessors(java.util.Deque,int):1221:1221 -> a
+    91:91:boolean isMarkingColorInUse(int):1132:1132 -> a
+    91:91:void markTransitiveSuccessors(java.util.Deque,int):1221 -> a
+    92:93:boolean anyBlocksMarkedWithColor(int):1136:1137 -> a
+    92:93:void markTransitiveSuccessors(java.util.Deque,int):1221 -> a
+    94:103:void markTransitiveSuccessors(java.util.Deque,int):1221:1230 -> a
+    104:104:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242:1242 -> a
+    105:105:boolean isMarkingColorInUse(int):1132:1132 -> a
+    105:105:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242 -> a
+    106:117:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1242:1253 -> a
+    118:118:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1602:1602 -> a
+    118:118:java.util.Iterator lambda$getInstructionsReachableFrom$10(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):1161 -> a
+    1:52:java.util.Map computeLiveAtEntrySets():147:198 -> b
+    53:73:java.util.Map computeLiveAtEntrySets():197:217 -> b
+    74:74:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> b
+    74:74:java.util.Map computeLiveAtEntrySets():221 -> b
+    75:110:java.util.Map computeLiveAtEntrySets():221:256 -> b
+    111:111:boolean com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets.isEmpty():81:81 -> b
+    111:111:java.util.Map computeLiveAtEntrySets():256 -> b
+    112:114:java.util.Map computeLiveAtEntrySets():256:258 -> b
+    115:125:boolean hasNoVerticallyMergedClasses(com.android.tools.r8.graph.AppView):554:564 -> b
+    126:128:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):866:868 -> b
+    129:129:boolean lambda$verifyNoNullabilityBottomTypes$4(com.android.tools.r8.ir.code.Value):866:866 -> b
+    130:130:java.util.Iterator lambda$instructions$9(java.util.function.Predicate):920:920 -> b
+    131:131:java.util.ListIterator listIterator(int):946:946 -> b
+    132:132:boolean lambda$findFirstNonNonePosition$11(com.android.tools.r8.ir.code.Instruction):1261:1261 -> b
+    1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):585:586 -> c
+    3:6:boolean validAssumeDynamicTypeInstructions(com.android.tools.r8.graph.AppView):594:597 -> c
+    3:6:boolean verifyTypes(com.android.tools.r8.graph.AppView):586 -> c
+    7:9:boolean verifyTypes(com.android.tools.r8.graph.AppView):587:589 -> c
+    10:15:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):877:882 -> c
+    16:22:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$7(com.android.tools.r8.ir.code.Value):877:883 -> c
+    23:23:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$5(com.android.tools.r8.ir.code.Instruction):878:878 -> c
+    24:31:boolean verifySSATypeLattice(java.util.function.Predicate):902:909 -> c
+    32:38:java.util.List computeNormalExitBlocks():932:938 -> c
+    39:39:void returnMarkingColor(int):1126:1126 -> c
+    40:40:boolean isMarkingColorInUse(int):1132:1132 -> c
+    40:40:void returnMarkingColor(int):1126 -> c
+    41:41:void returnMarkingColor(int):1126:1126 -> c
+    42:43:void clearMarks(int):452:453 -> c
+    42:43:void returnMarkingColor(int):1127 -> c
+    44:44:void returnMarkingColor(int):1128:1128 -> c
+    1:4:boolean consistentBlockNumbering():739:742 -> d
+    5:5:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$6(com.android.tools.r8.ir.code.Instruction):881:881 -> d
+    6:6:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):890:890 -> d
+    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1050:1050 -> e
+    2:2:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> e
+    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1050 -> e
+    3:3:com.android.tools.r8.ir.code.ConstNumber createConstNull():1051:1051 -> e
+    1:1:boolean doAllThrowingInstructionsHavePositions():1060:1060 -> f
+    1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():140:140 -> g
+    1:14:com.android.tools.r8.ir.code.Position findFirstNonNonePosition():1261:1274 -> h
+    1:1:int getHighestBlockNumber():1040:1040 -> i
+    1:1:int getNextInstructionNumber():968:968 -> j
+    1:7:com.android.tools.r8.ir.code.Value getThis():993:999 -> k
+    1:3:java.util.Set getUnreachableBlocks():1187:1189 -> l
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1217:1217 -> l
+    4:4:java.util.Set getUnreachableBlocks():1189 -> l
+    5:10:java.util.Set getUnreachableBlocks():1190:1195 -> l
+    1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():924:924 -> m
+    1:1:java.lang.Iterable instructions():916:916 -> n
+    1:1:boolean isConsistentGraph():572:572 -> o
+    2:2:boolean noColorsInUse():1145:1145 -> o
+    2:2:boolean isConsistentGraph():572 -> o
+    3:5:boolean isConsistentGraph():572:574 -> o
+    6:21:boolean consistentPredecessorSuccessors():710:725 -> o
+    6:21:boolean isConsistentGraph():574 -> o
+    22:22:boolean isConsistentGraph():575:575 -> o
+    23:24:boolean consistentCatchHandlers():732:733 -> o
+    23:24:boolean isConsistentGraph():575 -> o
+    25:25:boolean isConsistentGraph():576:576 -> o
+    26:29:boolean consistentBlockInstructions():751:754 -> o
+    26:29:boolean isConsistentGraph():576 -> o
     30:39:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):65:74 -> o
-    30:39:boolean consistentBlockInstructions():756 -> o
-    30:39:boolean isConsistentGraph():580 -> o
+    30:39:boolean consistentBlockInstructions():752 -> o
+    30:39:boolean isConsistentGraph():576 -> o
     40:44:boolean com.android.tools.r8.ir.code.BasicBlock.consistentBlockInstructions(boolean,boolean):73:77 -> o
-    40:44:boolean consistentBlockInstructions():756 -> o
-    40:44:boolean isConsistentGraph():580 -> o
-    45:45:boolean isConsistentGraph():581:581 -> o
-    46:102:boolean consistentMetadata():765:821 -> o
-    46:102:boolean isConsistentGraph():581 -> o
-    103:103:boolean isConsistentGraph():582:582 -> o
-    1:2:boolean isConsistentSSA():548:549 -> p
-    3:23:boolean consistentDefUseChains():638:658 -> p
-    3:23:boolean isConsistentSSA():549 -> p
+    40:44:boolean consistentBlockInstructions():752 -> o
+    40:44:boolean isConsistentGraph():576 -> o
+    45:45:boolean isConsistentGraph():577:577 -> o
+    46:102:boolean consistentMetadata():761:817 -> o
+    46:102:boolean isConsistentGraph():577 -> o
+    103:103:boolean isConsistentGraph():578:578 -> o
+    1:2:boolean isConsistentSSA():544:545 -> p
+    3:23:boolean consistentDefUseChains():634:654 -> p
+    3:23:boolean isConsistentSSA():545 -> p
     24:24:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> p
-    24:24:boolean consistentDefUseChains():660 -> p
-    24:24:boolean isConsistentSSA():549 -> p
-    25:37:boolean consistentDefUseChains():660:672 -> p
-    25:37:boolean isConsistentSSA():549 -> p
-    38:38:boolean verifyValue(com.android.tools.r8.ir.code.Value):680:680 -> p
-    38:38:boolean consistentDefUseChains():672 -> p
-    38:38:boolean isConsistentSSA():549 -> p
-    39:39:boolean verifyPhi(com.android.tools.r8.ir.code.Phi):685:685 -> p
-    39:39:boolean verifyValue(com.android.tools.r8.ir.code.Value):680 -> p
-    39:39:boolean consistentDefUseChains():672 -> p
-    39:39:boolean isConsistentSSA():549 -> p
-    40:43:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):690:693 -> p
-    40:43:boolean verifyValue(com.android.tools.r8.ir.code.Value):680 -> p
-    40:43:boolean consistentDefUseChains():672 -> p
-    40:43:boolean isConsistentSSA():549 -> p
-    44:44:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):691:691 -> p
-    44:44:boolean verifyValue(com.android.tools.r8.ir.code.Value):680 -> p
-    44:44:boolean consistentDefUseChains():672 -> p
-    44:44:boolean isConsistentSSA():549 -> p
-    45:45:boolean consistentDefUseChains():673:673 -> p
-    45:45:boolean isConsistentSSA():549 -> p
-    46:47:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):698:699 -> p
-    46:47:boolean consistentDefUseChains():673 -> p
-    46:47:boolean isConsistentSSA():549 -> p
+    24:24:boolean consistentDefUseChains():656 -> p
+    24:24:boolean isConsistentSSA():545 -> p
+    25:37:boolean consistentDefUseChains():656:668 -> p
+    25:37:boolean isConsistentSSA():545 -> p
+    38:38:boolean verifyValue(com.android.tools.r8.ir.code.Value):676:676 -> p
+    38:38:boolean consistentDefUseChains():668 -> p
+    38:38:boolean isConsistentSSA():545 -> p
+    39:39:boolean verifyPhi(com.android.tools.r8.ir.code.Phi):681:681 -> p
+    39:39:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    39:39:boolean consistentDefUseChains():668 -> p
+    39:39:boolean isConsistentSSA():545 -> p
+    40:43:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):686:689 -> p
+    40:43:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    40:43:boolean consistentDefUseChains():668 -> p
+    40:43:boolean isConsistentSSA():545 -> p
+    44:44:boolean verifyDefinition(com.android.tools.r8.ir.code.Value):687:687 -> p
+    44:44:boolean verifyValue(com.android.tools.r8.ir.code.Value):676 -> p
+    44:44:boolean consistentDefUseChains():668 -> p
+    44:44:boolean isConsistentSSA():545 -> p
+    45:45:boolean consistentDefUseChains():669:669 -> p
+    45:45:boolean isConsistentSSA():545 -> p
+    46:47:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):694:695 -> p
+    46:47:boolean consistentDefUseChains():669 -> p
+    46:47:boolean isConsistentSSA():545 -> p
     48:48:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():93:93 -> p
-    48:48:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):699 -> p
-    48:48:boolean consistentDefUseChains():673 -> p
-    48:48:boolean isConsistentSSA():549 -> p
-    49:57:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):699:707 -> p
-    49:57:boolean consistentDefUseChains():673 -> p
-    49:57:boolean isConsistentSSA():549 -> p
-    58:58:boolean isConsistentSSA():550:550 -> p
-    59:75:boolean validThrowingInstructions():829:845 -> p
-    59:75:boolean isConsistentSSA():550 -> p
-    76:76:boolean isConsistentSSA():551:551 -> p
-    77:88:boolean noCriticalEdges():609:620 -> p
-    77:88:boolean isConsistentSSA():551 -> p
-    89:91:boolean isConsistentSSA():551:553 -> p
-    1:1:java.util.ListIterator listIterator():946:946 -> q
-    1:1:com.android.tools.r8.ir.code.IRMetadata metadata():138:138 -> r
-    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():954:956 -> s
-    1:7:int numberRemainingInstructions():962:968 -> t
-    1:7:java.lang.String toString():446:452 -> toString
-    1:23:void prepareBlocksForCatchHandlers():304:326 -> u
-    24:24:java.lang.Object com.android.tools.r8.utils.ListUtils.first(java.util.List):16:16 -> u
-    24:24:void prepareBlocksForCatchHandlers():326 -> u
-    25:27:void prepareBlocksForCatchHandlers():326:328 -> u
-    28:29:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> u
-    28:29:void prepareBlocksForCatchHandlers():328 -> u
-    30:36:void prepareBlocksForCatchHandlers():329:335 -> u
-    1:1:void removeAllTrivialPhis():1085:1085 -> v
-    1:3:java.util.Set removeUnreachableBlocks():1204:1206 -> w
-    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1221:1221 -> w
-    4:4:java.util.Set removeUnreachableBlocks():1206 -> w
-    5:14:java.util.Set removeUnreachableBlocks():1207:1216 -> w
-    1:1:int reserveMarkingColor():1106:1106 -> x
-    2:2:boolean anyMarkingColorAvailable():1120:1120 -> x
-    2:2:int reserveMarkingColor():1106 -> x
-    3:11:int reserveMarkingColor():1106:1114 -> x
-    12:13:boolean verifyNoBlocksMarked(int):472:473 -> x
-    12:13:int reserveMarkingColor():1114 -> x
-    1:24:void splitCriticalEdges():339:362 -> y
-    25:34:void splitCriticalEdges():361:370 -> y
-    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList depthFirstSorting():497:520 -> z
-    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():490 -> z
-    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():491:491 -> z
-    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):526:537 -> z
-    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():492 -> z
+    48:48:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):695 -> p
+    48:48:boolean consistentDefUseChains():669 -> p
+    48:48:boolean isConsistentSSA():545 -> p
+    49:57:boolean consistentValueUses(com.android.tools.r8.ir.code.Value):695:703 -> p
+    49:57:boolean consistentDefUseChains():669 -> p
+    49:57:boolean isConsistentSSA():545 -> p
+    58:58:boolean isConsistentSSA():546:546 -> p
+    59:75:boolean validThrowingInstructions():825:841 -> p
+    59:75:boolean isConsistentSSA():546 -> p
+    76:76:boolean isConsistentSSA():547:547 -> p
+    77:88:boolean noCriticalEdges():605:616 -> p
+    77:88:boolean isConsistentSSA():547 -> p
+    89:91:boolean isConsistentSSA():547:549 -> p
+    1:1:java.util.ListIterator listIterator():942:942 -> q
+    1:1:com.android.tools.r8.ir.code.IRMetadata metadata():136:136 -> r
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():950:952 -> s
+    1:7:int numberRemainingInstructions():958:964 -> t
+    1:7:java.lang.String toString():442:448 -> toString
+    1:25:void prepareBlocksForCatchHandlers():300:324 -> u
+    26:27:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> u
+    26:27:void prepareBlocksForCatchHandlers():324 -> u
+    28:34:void prepareBlocksForCatchHandlers():325:331 -> u
+    1:1:void removeAllTrivialPhis():1081:1081 -> v
+    1:3:java.util.Set removeUnreachableBlocks():1200:1202 -> w
+    4:4:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1217:1217 -> w
+    4:4:java.util.Set removeUnreachableBlocks():1202 -> w
+    5:14:java.util.Set removeUnreachableBlocks():1203:1212 -> w
+    1:1:int reserveMarkingColor():1102:1102 -> x
+    2:2:boolean anyMarkingColorAvailable():1116:1116 -> x
+    2:2:int reserveMarkingColor():1102 -> x
+    3:11:int reserveMarkingColor():1102:1110 -> x
+    12:13:boolean verifyNoBlocksMarked(int):468:469 -> x
+    12:13:int reserveMarkingColor():1110 -> x
+    1:24:void splitCriticalEdges():335:358 -> y
+    25:34:void splitCriticalEdges():357:366 -> y
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList depthFirstSorting():493:516 -> z
+    1:24:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():486 -> z
+    25:25:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():487:487 -> z
+    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):522:533 -> z
+    26:37:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():488 -> z
 com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.w.b.T$a:
     com.android.tools.r8.ir.code.BasicBlock block -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):91:92 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):89:90 -> <init>
 com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.w.b.T$b:
     java.util.Deque liveStackValues -> c
     java.util.Set liveValues -> a
     java.util.Set liveLocalValues -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():54:54 -> <clinit>
-    1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):64:68 -> <init>
-    1:2:boolean equals(java.lang.Object):78:79 -> equals
-    1:1:int hashCode():73:73 -> hashCode
+    1:1:void <clinit>():52:52 -> <clinit>
+    1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):62:66 -> <init>
+    1:2:boolean equals(java.lang.Object):76:77 -> equals
+    1:1:int hashCode():71:71 -> hashCode
 com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.w.b.U:
     java.util.ListIterator blockIterator -> a
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> b
@@ -23210,17 +23236,17 @@
     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>
     com.android.tools.r8.ir.code.If asIf() -> C
-    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> D2
-    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> E2
-    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> F2
-    1:2:void invert():110:111 -> G2
-    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> G2
-    3:4:void invert():112 -> G2
-    5:5:void invert():113:113 -> G2
-    1:1:boolean isZeroTest():93:93 -> H2
-    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> I2
-    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> J2
-    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> K2
+    1:4:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():132:135 -> C2
+    1:4:com.android.tools.r8.ir.code.BasicBlock getTrueTarget():117:120 -> D2
+    1:1:com.android.tools.r8.ir.code.If$Type getType():106:106 -> E2
+    1:2:void invert():110:111 -> F2
+    3:4:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):140:141 -> F2
+    3:4:void invert():112 -> F2
+    5:5:void invert():113:113 -> F2
+    1:1:boolean isZeroTest():93:93 -> G2
+    1:1:com.android.tools.r8.ir.code.Value lhs():97:97 -> H2
+    1:2:com.android.tools.r8.ir.code.Value rhs():101:102 -> I2
+    1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():214:216 -> J2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:3:boolean verifyTypeCompatible(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,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
@@ -23240,10 +23266,10 @@
     31:31: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
-    1:1:int maxInValueRegister():174:174 -> x2
+    1:1:int maxInValueRegister():174:174 -> w2
+    1:1:int maxOutValueRegister():179:179 -> x2
     boolean isIf() -> y1
-    1:1:int maxOutValueRegister():179:179 -> y2
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.w.b.X$a:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
@@ -23278,18 +23304,18 @@
     5:15:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):86:96 -> a
     1:2:void addInValue(com.android.tools.r8.ir.code.Value):43:44 -> b
     1:1:java.lang.String toString():102:102 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.w.b.a0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():207:207 -> B0
-    boolean throwsOnNullInput() -> C2
+    boolean throwsOnNullInput() -> B2
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
-    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> F2
-    1:2:com.android.tools.r8.ir.code.Value object():60:61 -> G2
+    1:1:com.android.tools.r8.ir.code.Value value():66:66 -> E2
+    1:2:com.android.tools.r8.ir.code.Value object():60:61 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:boolean outTypeKnownToBeBoolean(java.util.Set):47:47 -> a
     2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):52:52 -> a
@@ -23318,17 +23344,17 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):119:119 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():169:169 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
     boolean isInstanceGet() -> z1
-    int opcode() -> z2
 com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.w.b.b0:
     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>
     boolean isInstanceOf() -> A1
-    1:1:com.android.tools.r8.graph.DexType type():39:39 -> D2
+    1:1:com.android.tools.r8.graph.DexType type():39:39 -> C2
+    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> D2
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> E
-    1:1:com.android.tools.r8.ir.code.Value value():47:47 -> E2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -23342,19 +23368,19 @@
     8:9:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):105:106 -> a
     10:10:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.w.b.c0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:39 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():220:220 -> B0
+    1:1:com.android.tools.r8.ir.code.Value getNonNullInput():219:219 -> B0
     boolean isInstancePut() -> B1
-    boolean throwsOnNullInput() -> C2
+    boolean throwsOnNullInput() -> B2
+    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> E2
     com.android.tools.r8.ir.code.InstancePut asInstancePut() -> F
-    1:1:com.android.tools.r8.ir.code.Value value():58:58 -> F2
-    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> G2
+    1:1:com.android.tools.r8.ir.code.Value object():53:53 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
     2:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:92 -> a
@@ -23364,26 +23390,26 @@
     53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):83:83 -> a
     54:54:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):80:80 -> a
     55:72:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:94 -> a
-    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):129:130 -> a
-    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):137:147 -> a
+    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):128:129 -> a
+    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):136:146 -> a
     86:86:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):141 -> a
-    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):157:161 -> 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):178:178 -> a
-    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):198:198 -> a
-    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):203:205 -> a
-    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):203:203 -> a
-    98:98:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):210:210 -> a
-    99:99: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):230:230 -> a
-    1:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104:114 -> b
+    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):140 -> a
+    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):156:160 -> 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):177:177 -> a
+    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):197:197 -> a
+    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):202:204 -> a
+    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):202:202 -> a
+    98:98:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):209:209 -> a
+    99:99: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):229:229 -> a
+    1:10:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):104:113 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:java.lang.String toString():193:193 -> toString
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():171:171 -> y2
-    int opcode() -> z2
+    1:1:java.lang.String toString():192:192 -> toString
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():170:170 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.w.b.d0:
     java.util.List inValues -> b
-    java.util.LinkedHashSet debugValues -> e
+    java.util.Set debugValues -> e
     boolean $assertionsDisabled -> g
     int number -> d
     com.android.tools.r8.ir.code.Value outValue -> a
@@ -23399,15 +23425,14 @@
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> A
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():595:595 -> A0
     boolean isInstanceOf() -> A1
-    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> A2
+    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> A2
     com.android.tools.r8.ir.code.Goto asGoto() -> B
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():1365:1365 -> B0
     boolean isInstancePut() -> B1
-    1:1:com.android.tools.r8.ir.code.Value outValue():120:120 -> B2
+    boolean throwsOnNullInput() -> B2
     com.android.tools.r8.ir.code.If asIf() -> C
     1:1:int getNumber():342:342 -> C0
     boolean isIntSwitch() -> C1
-    boolean throwsOnNullInput() -> C2
     com.android.tools.r8.ir.code.InstanceGet asInstanceGet() -> D
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> D0
     boolean isIntroducingAnAlias() -> D1
@@ -23430,55 +23455,55 @@
     boolean isInvokeMethod() -> I1
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
     1:1:boolean hasOutValue():116:116 -> J0
-    1:1:boolean isInvokeMethodWithDynamicDispatch():1124:1124 -> J1
+    boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
     1:1:boolean hasPosition():75:75 -> K0
-    boolean isInvokeMethodWithReceiver() -> K1
+    boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
     1:1:java.util.List inValues():93:93 -> L0
-    boolean isInvokeMultiNewArray() -> L1
+    boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
     1:1:boolean instructionInstanceCanThrow():524:524 -> M0
-    boolean isInvokeNewArray() -> M1
+    boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     boolean instructionTypeCanThrow() -> N0
-    boolean isInvokePolymorphic() -> N1
+    boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     boolean isAdd() -> O0
-    boolean isInvokeStatic() -> O1
+    boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
     boolean isAllowedAfterThrowingInstruction() -> P0
-    boolean isInvokeSuper() -> P1
+    boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
     boolean isAnd() -> Q0
-    boolean isInvokeVirtual() -> Q1
+    boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
     boolean isArgument() -> R0
-    boolean isJumpInstruction() -> R1
+    boolean isLoad() -> R1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
     boolean isArithmeticBinop() -> S0
-    boolean isLoad() -> S1
+    boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
     boolean isArrayGet() -> T0
-    boolean isLogicalBinop() -> T1
+    boolean isMonitor() -> T1
     com.android.tools.r8.ir.code.Load asLoad() -> U
     boolean isArrayLength() -> U0
-    boolean isMonitor() -> U1
+    boolean isMonitorEnter() -> U1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     boolean isArrayPut() -> V0
-    boolean isMonitorEnter() -> V1
+    boolean isMove() -> V1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     boolean isAssume() -> W0
-    boolean isMove() -> W1
+    boolean isMoveException() -> W1
     com.android.tools.r8.ir.code.Move asMove() -> X
     boolean isAssumeDynamicType() -> X0
-    boolean isMoveException() -> X1
+    boolean isMul() -> X1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     boolean isAssumeNonNull() -> Y0
-    boolean isMul() -> Y1
+    boolean isNeg() -> Y1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     boolean isBinop() -> Z0
-    boolean isNeg() -> Z1
+    boolean isNewArrayEmpty() -> 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
@@ -23505,7 +23530,7 @@
     58:59:boolean identicalNonValueParts(com.android.tools.r8.ir.code.Instruction):356:357 -> a
     58:59:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):454 -> a
     60:60:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):460:460 -> a
-    61:64:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):103:106 -> a
+    61:64:boolean com.android.tools.r8.ir.code.InvokeDirect.sameConstructorReceiverValue(com.android.tools.r8.ir.code.Invoke):105:108 -> a
     61:64:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):460 -> a
     65:66:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):463:464 -> a
     67:67:int getNumber():342:342 -> a
@@ -23525,9 +23550,9 @@
     150:166:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):481 -> a
     167:168:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):487:488 -> a
     169:169:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495:495 -> a
-    170:170:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():797:797 -> a
+    170:170:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
     170:170:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
-    171:171:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():797:797 -> a
+    171:171:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
     171:171:boolean identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):495 -> a
     172:178:boolean identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):499:505 -> a
     179:179:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):539:539 -> a
@@ -23539,7 +23564,7 @@
     197:197:boolean verifyValidPositionInfo(boolean):1387:1387 -> a
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
     boolean isCheckCast() -> a1
-    boolean isNewArrayEmpty() -> a2
+    boolean isNewArrayFilledData() -> a2
     com.android.tools.r8.ir.code.Add asAdd() -> b
     1:4:void addInValue(com.android.tools.r8.ir.code.Value):98:101 -> b
     5:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):171:174 -> b
@@ -23549,111 +23574,111 @@
     18:29:boolean verifyTypes(com.android.tools.r8.graph.AppView):1323:1334 -> b
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
     boolean isCmp() -> b1
-    boolean isNewArrayFilledData() -> b2
+    boolean isNewInstance() -> b2
     com.android.tools.r8.ir.code.And asAnd() -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     boolean needsValueInRegister(com.android.tools.r8.ir.code.Value) -> c
     1:7:void clearUserInfo(com.android.tools.r8.ir.code.Instruction):152:158 -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
     boolean isConstClass() -> c1
-    boolean isNewInstance() -> c2
+    boolean isNot() -> c2
     com.android.tools.r8.ir.code.Argument asArgument() -> d
     1:9:void removeDebugValue(com.android.tools.r8.ir.code.Value):218:226 -> d
     10:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):554:558 -> d
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
     boolean isConstInstruction() -> d1
-    boolean isNot() -> d2
+    boolean isNumberConversion() -> d2
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> e
     1:4:void setOutValue(com.android.tools.r8.ir.code.Value):124:127 -> e
     com.android.tools.r8.ir.code.Not asNot() -> e0
     boolean isConstMethodHandle() -> e1
-    boolean isNumberConversion() -> e2
+    boolean isOr() -> e2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> f
     1:5:com.android.tools.r8.ir.code.Value swapOutValue(com.android.tools.r8.ir.code.Value):132:136 -> f
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
     boolean isConstMethodType() -> f1
-    boolean isOr() -> f2
+    boolean isOutConstant() -> f2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> g
     com.android.tools.r8.ir.code.Or asOr() -> g0
     boolean isConstNumber() -> g1
-    boolean isOutConstant() -> g2
+    boolean isPop() -> g2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> h
     com.android.tools.r8.ir.code.Rem asRem() -> h0
     boolean isConstString() -> h1
-    boolean isPop() -> h2
+    boolean isRem() -> h2
     com.android.tools.r8.ir.code.Assume asAssume() -> i
     com.android.tools.r8.ir.code.Return asReturn() -> i0
     1:4:boolean isCreatingArray():1280:1283 -> i1
-    boolean isRem() -> i2
+    boolean isReturn() -> i2
     com.android.tools.r8.ir.code.Assume asAssumeDynamicType() -> j
     com.android.tools.r8.ir.code.Shl asShl() -> j0
     1:1:boolean isCreatingInstanceOrArray():1287:1287 -> j1
-    boolean isReturn() -> j2
+    boolean isShl() -> j2
     com.android.tools.r8.ir.code.Assume asAssumeNonNull() -> k
     com.android.tools.r8.ir.code.Shr asShr() -> k0
     1:5:boolean isDebugInstruction():1084:1088 -> k1
-    boolean isShl() -> k2
+    boolean isShr() -> k2
     com.android.tools.r8.ir.code.Binop asBinop() -> l
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
     boolean isDebugLocalRead() -> l1
-    boolean isShr() -> l2
+    boolean isStaticGet() -> l2
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> m
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
     boolean isDebugLocalUninitialized() -> m1
-    boolean isStaticGet() -> m2
+    boolean isStaticPut() -> m2
     com.android.tools.r8.ir.code.Cmp asCmp() -> n
     com.android.tools.r8.ir.code.Store asStore() -> n0
     boolean isDebugLocalWrite() -> n1
-    boolean isStaticPut() -> n2
+    boolean isStore() -> n2
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> o
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
     boolean isDebugLocalsChange() -> o1
-    boolean isStore() -> o2
+    boolean isStringSwitch() -> o2
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> p
     com.android.tools.r8.ir.code.Sub asSub() -> p0
     boolean isDebugPosition() -> p1
-    boolean isStringSwitch() -> p2
+    boolean isSub() -> p2
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> q
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
     boolean isDexItemBasedConstString() -> q1
-    boolean isSub() -> q2
+    boolean isSwap() -> q2
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> r
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
     boolean isDiv() -> r1
-    boolean isSwap() -> r2
+    boolean isSwitch() -> r2
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> s
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
     boolean isDup() -> s1
-    boolean isSwitch() -> s2
+    boolean isThrow() -> s2
     com.android.tools.r8.ir.code.ConstString asConstString() -> t
     com.android.tools.r8.ir.code.Xor asXor() -> t0
     boolean isDup2() -> t1
-    boolean isThrow() -> t2
+    boolean isUnop() -> t2
     1:14:java.lang.String toString():298:311 -> toString
     com.android.tools.r8.ir.code.DebugLocalWrite asDebugLocalWrite() -> u
     1:2:void clearBlock():273:274 -> u0
     1:1:boolean isFieldGet():856:856 -> u1
-    boolean isUnop() -> u2
+    boolean isUshr() -> u2
     com.android.tools.r8.ir.code.DebugLocalsChange asDebugLocalsChange() -> v
     1:5:void clearDebugValues():245:249 -> v0
     boolean isFieldInstruction() -> v1
-    boolean isUshr() -> v2
+    boolean isXor() -> v2
     com.android.tools.r8.ir.code.DebugPosition asDebugPosition() -> w
     1:1:com.android.tools.r8.ir.code.Value getAliasForOutValue():1275:1275 -> w0
     1:1:boolean isFieldPut():860:860 -> w1
-    boolean isXor() -> w2
+    int maxInValueRegister() -> w2
     com.android.tools.r8.ir.code.DexItemBasedConstString asDexItemBasedConstString() -> x
     1:2:com.android.tools.r8.ir.code.BasicBlock getBlock():257:258 -> x0
     boolean isGoto() -> x1
-    int maxInValueRegister() -> x2
+    int maxOutValueRegister() -> x2
     com.android.tools.r8.ir.code.Div asDiv() -> y
     1:1:java.util.Set getDebugValues():599:599 -> y0
     boolean isIf() -> y1
-    int maxOutValueRegister() -> y2
+    int opcode() -> y2
     com.android.tools.r8.ir.code.Dup asDup() -> z
     1:1:java.lang.String getInstructionName():293:293 -> z0
     boolean isInstanceGet() -> z1
-    int opcode() -> z2
+    1:1:com.android.tools.r8.ir.code.ValueType outType():163:163 -> z2
 com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.w.b.e0:
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> b
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> e
@@ -23682,13 +23707,13 @@
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int[],int):32:34 -> <init>
     boolean isIntSwitch() -> C1
     com.android.tools.r8.ir.code.IntSwitch asIntSwitch() -> G
-    1:7:boolean valid():55:61 -> H2
-    1:1:int getFirstKey():177:177 -> J2
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> K2
-    3:3:int getKey(int):206:206 -> K2
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> K2
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> K2
-    1:1:int[] getKeys():210:210 -> L2
+    1:7:boolean valid():55:61 -> G2
+    1:1:int getFirstKey():177:177 -> I2
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():214:215 -> J2
+    3:3:int getKey(int):206:206 -> J2
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216 -> J2
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():216:216 -> J2
+    1:1:int[] getKeys():210:210 -> K2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction) -> a
     1:1:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):48:48 -> a
@@ -23738,34 +23763,34 @@
     5:5:int getKey(int):206:206 -> toString
     5:5:java.lang.String toString():268 -> toString
     6:11:java.lang.String toString():268:273 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.w.b.i0:
     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.util.List arguments():103:103 -> D2
+    1:1:java.util.List arguments():103:103 -> C2
+    com.android.tools.r8.graph.DexType getReturnType() -> D2
     boolean isInvoke() -> E1
-    com.android.tools.r8.graph.DexType getReturnType() -> E2
-    com.android.tools.r8.ir.code.Invoke$Type getType() -> F2
-    java.lang.String getTypeString() -> G2
+    com.android.tools.r8.ir.code.Invoke$Type getType() -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:int requiredArgumentRegisters():108:108 -> G2
+    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> G2
+    2:2:int requiredArgumentRegisters():109 -> G2
     com.android.tools.r8.ir.code.Invoke asInvoke() -> H
-    1:1:int requiredArgumentRegisters():108:108 -> H2
-    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> H2
-    2:2:int requiredArgumentRegisters():109 -> H2
-    1:1:java.util.List arguments():103:103 -> I2
-    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> I2
-    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> I2
-    3:3:java.util.List arguments():103:103 -> I2
-    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> I2
-    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> I2
-    6:6:java.util.List arguments():103:103 -> I2
-    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> I2
-    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> I2
-    8:8:java.util.List arguments():103:103 -> I2
-    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> I2
-    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> I2
+    1:1:java.util.List arguments():103:103 -> H2
+    1:1:boolean argumentsAreConsecutiveInputArguments():222 -> H2
+    2:2:boolean argumentsAreConsecutiveInputArguments():222:222 -> H2
+    3:3:java.util.List arguments():103:103 -> H2
+    3:3:boolean argumentsAreConsecutiveInputArguments():225 -> H2
+    4:5:boolean argumentsAreConsecutiveInputArguments():225:226 -> H2
+    6:6:java.util.List arguments():103:103 -> H2
+    6:6:boolean argumentsAreConsecutiveInputArguments():229 -> H2
+    7:7:boolean argumentsAreConsecutiveInputArguments():229:229 -> H2
+    8:8:java.util.List arguments():103:103 -> H2
+    8:8:boolean argumentsAreConsecutiveInputArguments():230 -> H2
+    9:10:boolean argumentsAreConsecutiveInputArguments():230:231 -> H2
     boolean instructionTypeCanThrow() -> N0
     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
@@ -23787,13 +23812,13 @@
     44:44:java.util.List arguments():103:103 -> a
     44:44:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):130 -> a
     45:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):130:139 -> a
-    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> a
+    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):140 -> a
     56:58:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):141:143 -> a
-    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> a
+    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     59:59:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):143 -> a
     60:60:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):143:143 -> a
-    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> a
+    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> a
     61:61:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):144 -> a
     62:63:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):145:146 -> a
     64:77:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):165:178 -> a
@@ -23806,7 +23831,7 @@
     1:1:java.util.List arguments():103:103 -> b
     1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):153 -> b
     2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):153:154 -> b
-    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> b
+    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> b
     4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):154 -> b
     5:5:java.util.List arguments():103:103 -> b
     5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):155 -> b
@@ -23814,7 +23839,7 @@
     7:7:java.util.List arguments():103:103 -> b
     7:7:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):156 -> b
     8:9:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):156:157 -> b
-    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():296:296 -> b
+    10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():295:295 -> b
     10:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):158 -> b
     1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):240:240 -> c
     2:2:java.util.List arguments():103:103 -> c
@@ -23823,10 +23848,10 @@
     11:11:java.util.List arguments():103:103 -> c
     11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255 -> c
     12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):255:256 -> c
-    1:1:java.util.List arguments():103:103 -> x2
-    1:1:int maxInValueRegister():213 -> x2
-    2:4:int maxInValueRegister():213:215 -> x2
-    int maxOutValueRegister() -> y2
+    1:1:java.util.List arguments():103:103 -> w2
+    1:1:int maxInValueRegister():213 -> w2
+    2:4:int maxInValueRegister():213:215 -> w2
+    int maxOutValueRegister() -> x2
     1:1:java.lang.String getInstructionName():269:269 -> z0
 com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.w.b.i0$a:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
@@ -23854,13 +23879,13 @@
     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>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> E2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():101:101 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> E2
     boolean isInvokeCustom() -> F1
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():110:110 -> F2
-    java.lang.String getTypeString() -> G2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> H2
     com.android.tools.r8.ir.code.InvokeCustom asInvokeCustom() -> I
     boolean hasInvariantOutType() -> I0
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> I2
     1:29:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):66:94 -> a
     30:42:boolean verifyLambdaInterfaces(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,java.util.Set,com.android.tools.r8.graph.DexType):47:59 -> a
     30:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):94 -> a
@@ -23895,97 +23920,95 @@
     84:84:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():120:120 -> toString
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.w.b.k0:
     boolean $assertionsDisabled -> m
     boolean itf -> l
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):42:45 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():65:65 -> F2
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):44:47 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeDirect() -> G1
-    java.lang.String getTypeString() -> G2
     com.android.tools.r8.ir.code.InvokeDirect asInvokeDirect() -> J
-    1:1:boolean isInterface():55:55 -> K2
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:94 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):111:111 -> 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):150:150 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):155:155 -> 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):165:165 -> a
+    1:1:boolean isInterface():57:57 -> J2
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:96 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):113:113 -> 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):159:159 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):164:164 -> 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):174:174 -> a
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeDirect):184:184 -> a
-    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):60 -> a
-    25:61:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):234:270 -> a
-    62:62:boolean com.android.tools.r8.ir.code.Value.isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):987:987 -> a
-    62:62:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):270 -> a
-    63:63:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):275:275 -> a
-    64:64:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):269:269 -> a
-    1:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):171:207 -> b
+    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):62 -> a
+    25:66:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):236:277 -> a
+    67:67:boolean lambda$canBeDeadCode$0(java.util.List,com.android.tools.r8.ir.code.Instruction):271:271 -> a
+    1:37:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):180:216 -> b
     38:38:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
-    38:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):207 -> b
-    39:56:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):209:226 -> b
-    1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):285:298 -> d
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):126:133 -> e
+    38:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):216 -> b
+    39:46:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):218:225 -> b
+    1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):287:300 -> d
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128:135 -> e
     9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):134 -> e
-    10:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):135:141 -> e
-    int opcode() -> z2
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):136 -> e
+    10:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):137:143 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):152:153 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.w.b.l0:
     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>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():41:41 -> F2
-    java.lang.String getTypeString() -> G2
+    1:1:void <clinit>():26:26 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> E2
+    java.lang.String getTypeString() -> F2
     boolean isInvokeInterface() -> H1
     com.android.tools.r8.ir.code.InvokeInterface asInvokeInterface() -> K
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:70 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> 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):105:105 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):110:110 -> 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):120:120 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> 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):124:124 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):129:129 -> 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):139:139 -> a
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeInterface):189:189 -> a
-    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):36 -> a
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):90:97 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:93 -> e
-    int opcode() -> z2
+    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39 -> a
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> e
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:96 -> e
+    1:10:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):109:118 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.w.b.m0:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod method -> i
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):33:34 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():39:39 -> E2
+    1:1:void <clinit>():24:24 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:30 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getReturnType():35:35 -> D2
+    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():39:39 -> H2
     boolean hasInvariantOutType() -> I0
     boolean isInvokeMethod() -> I1
-    1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():43:43 -> I2
     com.android.tools.r8.ir.code.InvokeMethod asInvokeMethod() -> L
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,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
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):48:48 -> a
-    2:7:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):128:133 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):44:44 -> a
+    2:7:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):79:84 -> a
     8:8:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    8:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):138 -> a
-    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):138:138 -> a
+    8:8:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89 -> a
+    9:9:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):89:89 -> 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):139 -> a
-    11:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):139:140 -> a
+    10:10:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90 -> a
+    11:12:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):90:91 -> a
     13:13:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
-    13:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):140 -> a
-    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):140:140 -> a
+    13:13:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):91 -> a
+    14:14:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):91:91 -> a
     15:15:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):132 -> a
-    16:24:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):151:159 -> a
-    25:25:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):170:170 -> a
+    15:15:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):83 -> a
+    16:24:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):102:110 -> a
+    25:25:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):121:121 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):180:180 -> d
+    1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):131:131 -> d
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
-    1:29:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):76:104 -> f
-    30:38:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):103:111 -> f
-    1:1:java.lang.String toString():53:53 -> toString
+    java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
+    1:1:java.lang.String toString():49:49 -> toString
 com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.w.b.n0:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):25:25 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():66:66 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:2:com.android.tools.r8.ir.code.Value getReceiver():39:40 -> J2
-    boolean isInvokeMethodWithReceiver() -> K1
+    boolean throwsOnNullInput() -> B2
+    1:2:com.android.tools.r8.ir.code.Value getReceiver():39:40 -> I2
+    boolean isInvokeMethodWithReceiver() -> J1
     com.android.tools.r8.ir.code.InvokeMethodWithReceiver asInvokeMethodWithReceiver() -> M
     1:1:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,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):50:50 -> a
     2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):56:56 -> a
@@ -23996,16 +24019,16 @@
     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>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> E2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> E2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> F2
-    java.lang.String getTypeString() -> G2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> D2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():65 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> H2
     boolean hasInvariantOutType() -> I0
-    1:1:com.android.tools.r8.graph.DexType getArrayType():60:60 -> I2
-    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> J2
-    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> J2
-    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> J2
-    boolean isInvokeMultiNewArray() -> L1
+    1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> I2
+    1:1:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159 -> I2
+    2:13:com.android.tools.r8.ir.analysis.AbstractError instructionInstanceCanThrowNegativeArraySizeException():159:170 -> I2
+    boolean isInvokeMultiNewArray() -> K1
     com.android.tools.r8.ir.code.InvokeMultiNewArray asInvokeMultiNewArray() -> N
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> a
     2:2: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
@@ -24029,20 +24052,20 @@
     48:48:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
     1:6:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):176:181 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.w.b.p0:
     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>
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> E2
-    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> E2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> F2
-    java.lang.String getTypeString() -> G2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> D2
+    1:1:com.android.tools.r8.graph.DexType getReturnType():46 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():55:55 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> H2
     boolean hasInvariantOutType() -> I0
-    1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> I2
-    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> J2
-    boolean isInvokeNewArray() -> M1
+    1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> I2
+    boolean isInvokeNewArray() -> L1
     com.android.tools.r8.ir.code.InvokeNewArray asInvokeNewArray() -> O
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:89 -> a
     20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> a
@@ -24064,17 +24087,17 @@
     1:6:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:194 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():65:65 -> toString
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.w.b.q0:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexProto proto -> k
     1:1:void <clinit>():28:28 -> <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):33:34 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getReturnType():49:49 -> E2
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():54:54 -> F2
-    java.lang.String getTypeString() -> G2
-    1:1:com.android.tools.r8.graph.DexProto getProto():63:63 -> J2
-    boolean isInvokePolymorphic() -> N1
+    1:1:com.android.tools.r8.graph.DexType getReturnType():49:49 -> D2
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():54:54 -> E2
+    java.lang.String getTypeString() -> F2
+    1:1:com.android.tools.r8.graph.DexProto getProto():63:63 -> I2
+    boolean isInvokePolymorphic() -> M1
     com.android.tools.r8.ir.code.InvokePolymorphic asInvokePolymorphic() -> P
     1:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:75 -> a
     8:8:com.android.tools.r8.graph.DexProto getProto():63:63 -> a
@@ -24096,80 +24119,83 @@
     43:43:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):44 -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> e
     java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> f
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.w.b.r0:
     boolean itf -> k
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):35:36 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):40:41 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():56:56 -> F2
-    java.lang.String getTypeString() -> G2
-    boolean isInvokeStatic() -> O1
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:39 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):43:44 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():59:59 -> E2
+    java.lang.String getTypeString() -> F2
+    boolean isInvokeStatic() -> N1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> Q
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):67:85 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):90:90 -> 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):129:129 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,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
-    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):145:145 -> a
-    24:24: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
-    25:25:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):202:202 -> a
-    26:26:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
-    26:26:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):51 -> a
-    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):213:213 -> a
-    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):161:198 -> b
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):105:112 -> e
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:88 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):93:93 -> 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):139:139 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.DexEncodedMethod,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):149:149 -> a
+    23:23:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):155:155 -> a
+    24:24: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):165:165 -> a
+    25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):209:209 -> a
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):54 -> a
+    26:26:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):212:212 -> a
+    27:27:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):223:223 -> a
+    1:38:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):171:208 -> b
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):108:115 -> e
     9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):113 -> e
-    10:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):114:120 -> e
-    int opcode() -> z2
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):116 -> e
+    10:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:123 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):132:133 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.w.b.s0:
     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>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():43:43 -> F2
-    java.lang.String getTypeString() -> G2
-    boolean isInvokeSuper() -> P1
+    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>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():46:46 -> E2
+    java.lang.String getTypeString() -> F2
+    boolean isInvokeSuper() -> O1
     com.android.tools.r8.ir.code.InvokeSuper asInvokeSuper() -> R
-    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:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):82:82 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):110:110 -> 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):120:120 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:75 -> a
+    20:20:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
+    21:21:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):121:121 -> 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):131:131 -> a
     24:24:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeSuper):214:214 -> a
-    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):38 -> a
-    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:101 -> e
-    int opcode() -> z2
+    24:24:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):41 -> a
+    1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):100:104 -> e
+    1:2:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):114:115 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.w.b.t0:
     boolean $assertionsDisabled -> l
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):29:29 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():44:44 -> F2
-    java.lang.String getTypeString() -> G2
-    boolean isInvokeVirtual() -> Q1
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():47:47 -> E2
+    java.lang.String getTypeString() -> F2
+    boolean isInvokeVirtual() -> P1
     com.android.tools.r8.ir.code.InvokeVirtual asInvokeVirtual() -> S
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:73 -> a
-    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):78:78 -> 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:108 -> a
-    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):113:113 -> 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):123:123 -> a
-    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):180:180 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):58:76 -> a
+    20:20:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):81:81 -> 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):127:127 -> a
+    22:22:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):132:132 -> 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):142:142 -> a
+    24:24:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):199:199 -> a
     25:25:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeVirtual):219:219 -> a
-    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):39 -> a
-    1:41:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):129:169 -> b
-    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):93:100 -> e
-    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:96 -> e
-    int opcode() -> z2
+    25:25:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):42 -> a
+    1:41:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):148:188 -> b
+    1:8:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):96:103 -> e
+    9:9:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):99:99 -> e
+    1:10:java.util.Collection lookupTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):112:121 -> f
+    int opcode() -> y2
 com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.w.b.u0:
     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() -> D2
+    com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> C2
     boolean hasInvariantOutType() -> I0
-    boolean isJumpInstruction() -> R1
+    boolean isJumpInstruction() -> Q1
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> T
     boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():203:203 -> a
@@ -24211,9 +24237,9 @@
     2:2:void set(java.lang.Object):14 -> set
 com.android.tools.r8.ir.code.Load -> com.android.tools.r8.w.b.w0:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):22:22 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():36:36 -> C2
     boolean hasInvariantOutType() -> I0
-    boolean isLoad() -> S1
+    boolean isLoad() -> R1
     com.android.tools.r8.ir.code.Load asLoad() -> U
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -24225,15 +24251,15 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():207:207 -> 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):67 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():61:61 -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():61:61 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.w.b.x0:
     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() -> I2
-    boolean isLogicalBinop() -> T1
+    com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> H2
+    boolean isLogicalBinop() -> S1
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> V
     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
@@ -24280,14 +24306,14 @@
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type,com.android.tools.r8.ir.code.Value):31:32 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():156:156 -> B0
-    boolean throwsOnNullInput() -> C2
-    1:1:boolean isEnter():50:50 -> D2
-    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> E2
+    boolean throwsOnNullInput() -> B2
+    1:1:boolean isEnter():50:50 -> C2
+    1:1:com.android.tools.r8.ir.code.Value object():46:46 -> D2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    boolean isMonitor() -> U1
-    1:1:boolean isEnter():50:50 -> V1
-    1:1:boolean isMonitorEnter():103 -> V1
+    boolean isMonitor() -> T1
+    1:1:boolean isEnter():50:50 -> U1
+    1:1:boolean isMonitorEnter():103 -> U1
     com.android.tools.r8.ir.code.Monitor asMonitor() -> W
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):64:71 -> a
@@ -24298,10 +24324,10 @@
     13:13:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():211:211 -> 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):114 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():87:87 -> y2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():87:87 -> x2
+    int opcode() -> y2
     1:7:java.lang.String getInstructionName():119:125 -> z0
-    int opcode() -> z2
 com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.w.b.z0$a:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> c
@@ -24313,11 +24339,11 @@
     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>
+    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> C2
     1:2:com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction():86:87 -> D0
-    1:1:com.android.tools.r8.ir.code.Value dest():37:37 -> D2
-    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> E2
+    1:1:com.android.tools.r8.ir.code.Value src():41:41 -> D2
     boolean hasInvariantOutType() -> I0
-    boolean isMove() -> W1
+    boolean isMove() -> V1
     com.android.tools.r8.ir.code.Move asMove() -> X
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):46:46 -> a
@@ -24328,22 +24354,21 @@
     6:6:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):118:118 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMove():215:215 -> 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):103 -> a
-    1:2:boolean verifyTypes(com.android.tools.r8.graph.AppView):128:129 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:boolean isOutConstant():81:81 -> g2
+    1:1:boolean isOutConstant():81:81 -> f2
     1:1:java.lang.String toString():76:76 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.w.b.B0:
     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:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> D2
+    1:1:com.android.tools.r8.graph.DexType getExceptionType():119:119 -> C2
     boolean hasInvariantOutType() -> I0
-    boolean isMoveException() -> X1
+    boolean isMoveException() -> W1
     com.android.tools.r8.ir.code.MoveException asMoveException() -> Y
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void buildCf(com.android.tools.r8.ir.conversion.CfBuilder) -> a
@@ -24351,7 +24376,7 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
     2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:46 -> a
     4:7:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):62:65 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1398:1398 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1393:1393 -> a
     8:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):65 -> a
     9:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> a
     10:11:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):83:84 -> a
@@ -24361,14 +24386,14 @@
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():219:219 -> a
     15:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):90 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    1:1:int maxInValueRegister():51:51 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():51:51 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.w.b.C0:
     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>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> I2
-    boolean isMul() -> Y1
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> H2
+    boolean isMul() -> X1
     com.android.tools.r8.ir.code.Mul asMul() -> Z
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -24386,13 +24411,13 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong2Addr(int,int):79:79 -> e
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.w.b.D0:
     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>
-    boolean isNeg() -> Z1
+    boolean isNeg() -> Y1
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     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
@@ -24405,16 +24430,17 @@
     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
     com.android.tools.r8.ir.code.Neg asNeg() -> a0
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.w.b.E0:
     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>
-    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> D2
+    1:1:com.android.tools.r8.ir.code.Value size():49:49 -> C2
     boolean hasInvariantOutType() -> I0
     1:4:boolean instructionInstanceCanThrow():77:80 -> M0
     boolean instructionTypeCanThrow() -> N0
+    boolean isNewArrayEmpty() -> Z1
     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
@@ -24429,13 +24455,12 @@
     16:17:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):126:127 -> a
     18:19:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):132:133 -> a
     20:20:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):138:138 -> a
-    boolean isNewArrayEmpty() -> a2
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> b0
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:1:java.lang.String toString():41:41 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.w.b.F0:
     long size -> i
     short[] data -> j
@@ -24443,7 +24468,7 @@
     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>
-    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():47:47 -> C2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -24455,56 +24480,56 @@
     21:21:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):153:153 -> a
     22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewArrayFilledData():227:227 -> a
     22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):105 -> a
+    boolean isNewArrayFilledData() -> a2
     1:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):134:141 -> b
-    boolean isNewArrayFilledData() -> b2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> c0
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():83:83 -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():83:83 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.w.b.G0:
     boolean allowSpilling -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexType clazz -> h
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):34:34 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):31:36 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value dest():50:50 -> D2
-    1:1:boolean isSpillingAllowed():199:199 -> E2
-    1:1:void markNoSpilling():195:195 -> F2
+    1:1:void <clinit>():25:25 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):31:31 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):28:33 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value dest():47:47 -> C2
+    1:1:boolean isSpillingAllowed():184:184 -> D2
+    1:1:void markNoSpilling():180:180 -> E2
     boolean hasInvariantOutType() -> I0
     boolean instructionTypeCanThrow() -> N0
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):46:46 -> a
-    2:2:com.android.tools.r8.ir.code.Value dest():50:50 -> a
-    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55 -> a
-    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):55:56 -> a
-    5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):66:66 -> a
-    6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):99:99 -> a
-    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):109:109 -> a
-    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):114:114 -> a
-    9:9:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):119:119 -> a
-    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):124:124 -> a
-    11:11: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):134:134 -> a
-    12:12:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):170:170 -> a
-    13:13:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):191:191 -> a
-    1:10:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):140:149 -> b
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):43:43 -> a
+    2:2:com.android.tools.r8.ir.code.Value dest():47:47 -> a
+    2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52 -> a
+    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):52:53 -> a
+    5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):63:63 -> 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):96:96 -> a
+    7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):106:106 -> a
+    8:8:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):111:111 -> a
+    9:9:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):116:116 -> a
+    10:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):121:121 -> a
+    11:11: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):131:131 -> a
+    12:12:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):167:167 -> a
+    13:13:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):176:176 -> a
+    1:10:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):137:146 -> b
     11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
-    11:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):149 -> b
-    12:42:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):150:180 -> b
-    43:43:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):145:145 -> b
-    44:44:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):210:210 -> b
-    45:48:boolean verifyTypes(com.android.tools.r8.graph.AppView):220:223 -> b
-    49:51:boolean verifyTypes(com.android.tools.r8.graph.AppView):222:224 -> b
-    52:52:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
-    52:52:boolean verifyTypes(com.android.tools.r8.graph.AppView):224 -> b
-    53:53:boolean verifyTypes(com.android.tools.r8.graph.AppView):224:224 -> b
-    1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):204:214 -> c
-    boolean isNewInstance() -> c2
+    11:11:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):146 -> b
+    12:29:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):147:164 -> b
+    30:30:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):142:142 -> b
+    31:31:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):195:195 -> b
+    32:35:boolean verifyTypes(com.android.tools.r8.graph.AppView):205:208 -> b
+    36:38:boolean verifyTypes(com.android.tools.r8.graph.AppView):207:209 -> b
+    39:39:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
+    39:39:boolean verifyTypes(com.android.tools.r8.graph.AppView):209 -> b
+    40:40:boolean verifyTypes(com.android.tools.r8.graph.AppView):209:209 -> b
+    boolean isNewInstance() -> b2
+    1:11:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):189:199 -> c
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> d0
-    1:1:java.lang.String toString():61:61 -> toString
-    1:1:int maxInValueRegister():71:71 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    1:1:java.lang.String toString():58:58 -> toString
+    1:1:int maxInValueRegister():68:68 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.w.b.H0:
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):18:20 -> a
 com.android.tools.r8.ir.code.Not -> com.android.tools.r8.w.b.I0:
@@ -24522,9 +24547,9 @@
     38:38:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> 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
-    boolean isNot() -> d2
+    boolean isNot() -> c2
     com.android.tools.r8.ir.code.Not asNot() -> e0
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.w.b.J0:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
@@ -24553,9 +24578,9 @@
     219:219:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):157:157 -> a
     220:220:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):162:162 -> a
     221:221:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
-    boolean isNumberConversion() -> e2
+    boolean isNumberConversion() -> d2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> f0
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.w.b.K0:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
@@ -24584,8 +24609,8 @@
     60:60:boolean isWide():62:62 -> a
 com.android.tools.r8.ir.code.Or -> com.android.tools.r8.w.b.L0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -24597,9 +24622,9 @@
     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
-    boolean isOr() -> f2
+    boolean isOr() -> e2
     com.android.tools.r8.ir.code.Or asOr() -> g0
-    int opcode() -> z2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.w.b.M0:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
@@ -24607,84 +24632,84 @@
     boolean isStackPhi -> u
     boolean $assertionsDisabled -> w
     com.android.tools.r8.ir.code.BasicBlock block -> r
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):54:54 -> <init>
-    2:21:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):38:57 -> <init>
-    boolean isConstant() -> E
-    boolean isPhi() -> J
-    1:2:boolean isValueOnStack():346:347 -> M
-    1:1:void markNonDebugLocalRead():152:152 -> Q
-    1:1:boolean needsRegister():369:369 -> R
-    1:4: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):77:80 -> a
-    5:27:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):102:124 -> a
-    28:29:void appendOperand(com.android.tools.r8.ir.code.Value):163:164 -> a
-    28:29:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):125 -> a
-    30:30:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):127:127 -> a
-    31:31:void throwUndefinedValueError():156:156 -> a
-    31:31:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):104 -> a
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):53:53 -> <init>
+    2:21:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):37:56 -> <init>
+    boolean isConstant() -> D
+    boolean isPhi() -> I
+    1:2:boolean isValueOnStack():345:346 -> L
+    1:1:void markNonDebugLocalRead():151:151 -> P
+    1:1:boolean needsRegister():368:368 -> Q
+    1:4: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):76:79 -> a
+    5:27:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):101:123 -> a
+    28:29:void appendOperand(com.android.tools.r8.ir.code.Value):162:163 -> a
+    28:29:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):124 -> a
+    30:30:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):126:126 -> a
+    31:31:void throwUndefinedValueError():155:155 -> a
+    31:31:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):103 -> a
     32:32:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    32:32:void throwUndefinedValueError():156 -> a
-    32:32:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):104 -> a
+    32:32:void throwUndefinedValueError():155 -> a
+    32:32:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):103 -> a
     33:33:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     33:33:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    33:33:void throwUndefinedValueError():156 -> a
-    33:33:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):104 -> a
-    34:34:void throwUndefinedValueError():156:156 -> a
-    34:34:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):104 -> a
-    35:39:void addOperands(java.util.List,boolean):138:142 -> a
-    40:41:void appendOperand(com.android.tools.r8.ir.code.Value):163:164 -> a
-    40:41:void addOperands(java.util.List,boolean):143 -> a
-    42:42:void removeTrivialPhi():228:228 -> a
-    42:42:void addOperands(java.util.List,boolean):146 -> a
-    43:43:void throwUndefinedValueError():156:156 -> a
-    43:43:void addOperands(java.util.List,boolean):140 -> a
+    33:33:void throwUndefinedValueError():155 -> a
+    33:33:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):103 -> a
+    34:34:void throwUndefinedValueError():155:155 -> a
+    34:34:void addOperands(com.android.tools.r8.ir.conversion.IRBuilder,int):103 -> a
+    35:39:void addOperands(java.util.List,boolean):137:141 -> a
+    40:41:void appendOperand(com.android.tools.r8.ir.code.Value):162:163 -> a
+    40:41:void addOperands(java.util.List,boolean):142 -> a
+    42:42:void removeTrivialPhi():227:227 -> a
+    42:42:void addOperands(java.util.List,boolean):145 -> a
+    43:43:void throwUndefinedValueError():155:155 -> a
+    43:43:void addOperands(java.util.List,boolean):139 -> a
     44:44:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    44:44:void throwUndefinedValueError():156 -> a
-    44:44:void addOperands(java.util.List,boolean):140 -> a
+    44:44:void throwUndefinedValueError():155 -> a
+    44:44:void addOperands(java.util.List,boolean):139 -> 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 com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    45:45:void throwUndefinedValueError():156 -> a
-    45:45:void addOperands(java.util.List,boolean):140 -> a
-    46:46:void throwUndefinedValueError():156:156 -> a
-    46:46:void addOperands(java.util.List,boolean):140 -> a
-    47:50:void replaceOperandAt(int,com.android.tools.r8.ir.code.Value):196:199 -> a
-    51:54:void replaceOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):203:206 -> a
-    55:94:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):233:272 -> a
-    95:95:void addDefinitionsUser(java.util.Map):328:328 -> a
-    95:95:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):272 -> a
-    96:105:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):279:288 -> a
-    106:113:void print(com.android.tools.r8.utils.CfgPrinter):316:323 -> a
-    114:114:void addDefinitionsUser(java.util.Map):328:328 -> a
-    115:118:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):358:361 -> a
-    119:119:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):377:377 -> a
-    120:120:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():797:797 -> a
-    120:120:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):377 -> a
-    121:129:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):377:385 -> a
-    1:3:void abortOnInvalidDebugInfo(com.android.tools.r8.ir.code.ValueTypeConstraint):84:86 -> b
-    4:4:com.android.tools.r8.ir.code.Value getOperand(int):168:168 -> b
-    5:16:void removeOperandsByIndex(java.util.List):181:192 -> b
-    17:17:void removeDefinitionsUser(java.util.Map):332:332 -> b
-    18:18:void setIsStackPhi(boolean):351:351 -> b
-    19:20:boolean verifyIsStackPhi(java.util.Set):355:356 -> b
-    1:2:void removeOperand(int):176:177 -> c
-    1:1:void clearDefinitionsUsers():336:336 -> c0
+    45:45:void throwUndefinedValueError():155 -> a
+    45:45:void addOperands(java.util.List,boolean):139 -> a
+    46:46:void throwUndefinedValueError():155:155 -> a
+    46:46:void addOperands(java.util.List,boolean):139 -> a
+    47:47:com.android.tools.r8.ir.code.Value getOperand(int):167:167 -> a
+    48:59:void removeOperandsByIndex(java.util.List):180:191 -> a
+    60:63:void replaceOperandAt(int,com.android.tools.r8.ir.code.Value):195:198 -> a
+    64:67:void replaceOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):202:205 -> a
+    68:107:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):232:271 -> a
+    108:108:void addDefinitionsUser(java.util.Map):327:327 -> a
+    108:108:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):271 -> a
+    109:118:void removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):278:287 -> a
+    119:126:void print(com.android.tools.r8.utils.CfgPrinter):315:322 -> a
+    127:127:void addDefinitionsUser(java.util.Map):327:327 -> a
+    128:131:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):357:360 -> a
+    132:132:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376:376 -> a
+    133:133:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():798:798 -> a
+    133:133:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376 -> a
+    134:142:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.cf.TypeVerificationHelper):376:384 -> a
+    1:3:void abortOnInvalidDebugInfo(com.android.tools.r8.ir.code.ValueTypeConstraint):83:85 -> b
+    4:5:void removeOperand(int):175:176 -> b
+    6:6:void removeDefinitionsUser(java.util.Map):331:331 -> b
+    7:7:void setIsStackPhi(boolean):350:350 -> b
+    8:9:boolean verifyIsStackPhi(java.util.Set):354:355 -> b
+    1:1:void clearDefinitionsUsers():335:335 -> b0
+    1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():70:70 -> c0
     com.android.tools.r8.ir.code.Phi asPhi() -> d
-    1:1:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):373:373 -> d
-    1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():71:71 -> d0
-    1:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):390:392 -> e
-    1:1:java.util.List getOperands():172:172 -> e0
-    1:1:boolean isTrivialPhi():213:213 -> f0
-    1:10:java.lang.String printPhi():303:312 -> g0
-    1:4:void removeDeadPhi():293:296 -> h0
-    5:5:com.android.tools.r8.ir.code.BasicBlock getBlock():71:71 -> h0
-    5:5:void removeDeadPhi():299 -> h0
-    6:6:void removeDeadPhi():299:299 -> h0
-    1:1:void removeTrivialPhi():228:228 -> i0
+    1:1:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):372:372 -> d
+    2:4:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computePhiType(com.android.tools.r8.graph.AppView):389:391 -> d
+    1:1:java.util.List getOperands():171:171 -> d0
+    1:1:boolean isTrivialPhi():212:212 -> e0
+    1:10:java.lang.String printPhi():302:311 -> f0
+    1:4:void removeDeadPhi():292:295 -> g0
+    5:5:com.android.tools.r8.ir.code.BasicBlock getBlock():70:70 -> g0
+    5:5:void removeDeadPhi():298 -> g0
+    6:6:void removeDeadPhi():298:298 -> g0
+    1:1:void removeTrivialPhi():227:227 -> h0
 com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.w.b.M0$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>():33:34 -> <clinit>
-    1:1:void <init>(java.lang.String,int):32:32 -> <init>
+    1:2:void <clinit>():32:33 -> <clinit>
+    1:1:void <init>(java.lang.String,int):31:31 -> <init>
 com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.w.b.N0:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue):19:19 -> <init>
     boolean hasInvariantOutType() -> I0
@@ -24701,10 +24726,10 @@
     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:5:void addInValue(com.android.tools.r8.ir.code.Value):34:38 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isPop() -> h2
-    1:1:int maxInValueRegister():59:59 -> x2
-    1:1:int maxOutValueRegister():64:64 -> y2
-    int opcode() -> z2
+    boolean isPop() -> g2
+    1:1:int maxInValueRegister():59:59 -> w2
+    1:1:int maxOutValueRegister():64:64 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Position -> com.android.tools.r8.w.b.O0:
     com.android.tools.r8.ir.code.Position TESTING_POSITION -> h
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
@@ -24733,8 +24758,8 @@
     1:19:java.lang.String toString():151 -> toString
 com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.w.b.P0:
     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 isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> H2
     1:1:boolean instructionTypeCanThrow():134:134 -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -24754,16 +24779,16 @@
     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() -> h0
-    boolean isRem() -> i2
-    int opcode() -> z2
+    boolean isRem() -> h2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Return -> com.android.tools.r8.w.b.Q0:
     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>
-    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> E2
-    1:1:boolean isReturnVoid():42:42 -> F2
-    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> G2
+    1:2:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getReturnType():46:47 -> D2
+    1:1:boolean isReturnVoid():42:42 -> E2
+    1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> F2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
     2:9:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:87 -> a
@@ -24776,14 +24801,14 @@
     19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.DexType):114 -> a
     1:15:com.android.tools.r8.code.Instruction createDexInstruction(com.android.tools.r8.ir.conversion.DexBuilder):56:70 -> b
     com.android.tools.r8.ir.code.Return asReturn() -> i0
-    boolean isReturn() -> j2
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():97:97 -> y2
-    int opcode() -> z2
+    boolean isReturn() -> i2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():97:97 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.w.b.R0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -24796,12 +24821,12 @@
     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() -> j0
-    boolean isShl() -> k2
-    int opcode() -> z2
+    boolean isShl() -> j2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.w.b.S0:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -24814,8 +24839,8 @@
     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() -> k0
-    boolean isShr() -> l2
-    int opcode() -> z2
+    boolean isShr() -> k2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.w.b.T0:
     int decodedValue() -> a
 com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.w.b.U0:
@@ -24824,31 +24849,31 @@
     boolean $assertionsDisabled -> t
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:void <init>(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int):17:20 -> <init>
-    boolean isValueOnStack() -> M
-    boolean needsRegister() -> R
+    boolean isValueOnStack() -> L
+    boolean needsRegister() -> Q
     1:3:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):24:26 -> a
-    4:4:void setNeedsRegister(boolean):54:54 -> a
-    1:1:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> b
-    1:1:int getHeight():31:31 -> c0
-    1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> d0
+    4:4:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> a
+    5:5:void setNeedsRegister(boolean):54:54 -> a
+    1:1:int getHeight():31:31 -> b0
+    1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> c0
     1:1:java.lang.String toString():59:59 -> toString
 com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.w.b.V0:
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():14:14 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.StackValue[]):19:21 -> <init>
-    boolean isValueOnStack() -> M
-    boolean needsRegister() -> R
+    boolean isValueOnStack() -> L
+    boolean needsRegister() -> Q
     1:1:void setNeedsRegister(boolean):35:35 -> a
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> c0
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> b0
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():59:59 -> t
     1:10:java.lang.String toString():40:49 -> toString
 com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.w.b.W0:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> F2
-    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> G2
+    1:1:com.android.tools.r8.ir.code.Value value():54:54 -> E2
+    1:1:com.android.tools.r8.ir.code.Value dest():49:49 -> F2
     boolean instructionTypeCanThrow() -> N0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
     2:2:com.android.tools.r8.ir.code.Value dest():49:49 -> a
@@ -24878,51 +24903,55 @@
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):120:120 -> b
     1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):213:217 -> c
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> l0
-    boolean isStaticGet() -> m2
+    boolean isStaticGet() -> l2
     1:1:java.lang.String toString():160:160 -> toString
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.w.b.X0:
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):35:35 -> <init>
-    1:2:com.android.tools.r8.ir.code.Value value():50:51 -> F2
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):39:39 -> <init>
+    1:2:com.android.tools.r8.ir.code.Value value():54:55 -> E2
     boolean instructionTypeCanThrow() -> N0
-    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):45:45 -> a
-    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:84 -> a
-    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:66 -> a
-    31:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):62:81 -> a
-    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):78:78 -> a
-    52:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:75 -> a
-    53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:72 -> a
-    54:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):69:86 -> a
-    72:72:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):118:118 -> a
-    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):139:140 -> a
-    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):158:168 -> a
+    1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):49:49 -> a
+    2:29:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):61:88 -> a
+    30:30:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:70 -> a
+    31:50:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):66:85 -> a
+    51:51:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):82:82 -> a
+    52:52:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):79:79 -> a
+    53:53:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
+    54:71:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):73:90 -> a
+    72:72:java.lang.Boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):122:122 -> a
+    73:74:boolean canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):177:178 -> a
+    75:85:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):196:206 -> a
     86:86:boolean com.android.tools.r8.utils.InternalOptions.canHaveIncorrectJoinForArrayOfInterfacesBug():0:0 -> a
-    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):162 -> a
-    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):178:182 -> 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):188:188 -> a
-    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):208:208 -> a
-    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):213:215 -> a
-    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):213:213 -> a
-    98:98: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):225:225 -> a
-    99:99:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):238:238 -> a
-    1:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:118 -> b
-    23:30:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):117:124 -> b
-    1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):231:235 -> c
+    86:86:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):200 -> a
+    87:91:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):216:220 -> 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):226:226 -> a
+    93:93:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):246:246 -> a
+    94:96:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):251:253 -> a
+    97:97:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):251:251 -> a
+    98:98: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):263:263 -> a
+    99:99:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):276:276 -> a
+    1:22:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101:122 -> b
+    23:29:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):121:127 -> b
+    30:52:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):141:163 -> b
+    30:52:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    53:53:boolean isStoringObjectWithFinalizer(com.android.tools.r8.shaking.AppInfoWithLiveness):162:162 -> b
+    53:53:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):128 -> b
+    1:5:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):269:273 -> c
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> m0
-    boolean isStaticPut() -> n2
-    1:1:java.lang.String toString():193:193 -> toString
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():152:152 -> y2
-    int opcode() -> z2
+    boolean isStaticPut() -> m2
+    1:1:java.lang.String toString():231:231 -> toString
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():190:190 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Store -> com.android.tools.r8.w.b.Y0:
     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:com.android.tools.r8.ir.code.Value src():37:37 -> D2
+    1:1:com.android.tools.r8.ir.code.Value src():37:37 -> C2
     boolean hasInvariantOutType() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52:52 -> a
@@ -24937,16 +24966,16 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):108:109 -> c
     com.android.tools.r8.ir.code.Store asStore() -> n0
-    boolean isStore() -> o2
-    1:1:int maxInValueRegister():57:57 -> x2
-    int maxOutValueRegister() -> y2
-    int opcode() -> z2
+    boolean isStore() -> n2
+    1:1:int maxInValueRegister():57:57 -> w2
+    int maxOutValueRegister() -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.w.b.Z0:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexString[] keys -> l
     1:1:void <clinit>():15:15 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexString[],int[],int):21:23 -> <init>
-    1:4:boolean valid():44:47 -> H2
+    1:4:boolean valid():44:47 -> G2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void forEachCase(java.util.function.BiConsumer):37:37 -> a
     2:2:com.android.tools.r8.graph.DexString getKey(int):62:62 -> a
@@ -24957,21 +24986,21 @@
     6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):91:91 -> a
     7:7:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):96:96 -> a
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> o0
-    boolean isStringSwitch() -> p2
+    boolean isStringSwitch() -> o2
     1:4:java.lang.String toString():67:70 -> toString
     5:5:com.android.tools.r8.graph.DexString getKey(int):62:62 -> toString
     5:5:java.lang.String toString():71 -> toString
     6:11:java.lang.String toString():71:76 -> toString
-    1:1:int maxInValueRegister():101:101 -> x2
-    1:1:int maxOutValueRegister():106:106 -> y2
-    int opcode() -> z2
+    1:1:int maxInValueRegister():101:101 -> w2
+    1:1:int maxOutValueRegister():106:106 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.w.b.a1:
     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 isCommutative() -> E2
-    1:8:int maxInOutValueRegisterSize():131:138 -> G2
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> I2
+    boolean isCommutative() -> D2
+    1:8:int maxInOutValueRegisterSize():131:138 -> F2
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
     float foldFloat(float,float) -> a
@@ -24996,8 +25025,8 @@
     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() -> p0
-    boolean isSub() -> q2
-    int opcode() -> z2
+    boolean isSub() -> p2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.w.b.b1:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -25013,27 +25042,27 @@
     4:4: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 instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
-    boolean isSwap() -> r2
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():87:87 -> y2
-    int opcode() -> z2
+    boolean isSwap() -> q2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():87:87 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.w.b.c1:
     int[] targetBlockIndices -> i
     int fallthroughBlockIndex -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.Value,int[],int):15:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> D2
-    1:1:int getFallthroughBlockIndex():55:55 -> E2
-    1:1:int numberOfKeys():68:68 -> F2
-    1:1:int[] targetBlockIndices():40:40 -> G2
-    1:2:boolean valid():25:26 -> H2
-    3:3:int getTargetBlockIndex(int):36:36 -> H2
-    3:3:boolean valid():26 -> H2
-    4:4:int getFallthroughBlockIndex():55:55 -> H2
-    4:4:boolean valid():26 -> H2
-    5:5:boolean valid():26:26 -> H2
-    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> I2
+    1:1:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock():51:51 -> C2
+    1:1:int getFallthroughBlockIndex():55:55 -> D2
+    1:1:int numberOfKeys():68:68 -> E2
+    1:1:int[] targetBlockIndices():40:40 -> F2
+    1:2:boolean valid():25:26 -> G2
+    3:3:int getTargetBlockIndex(int):36:36 -> G2
+    3:3:boolean valid():26 -> G2
+    4:4:int getFallthroughBlockIndex():55:55 -> G2
+    4:4:boolean valid():26 -> G2
+    5:5:boolean valid():26:26 -> G2
+    1:1:com.android.tools.r8.ir.code.Value value():21:21 -> H2
     1:1:int getTargetBlockIndex(int):36:36 -> b
     2:2:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):64:64 -> b
     1:1:void setFallthroughBlockIndex(int):59:59 -> c
@@ -25042,12 +25071,12 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32 -> d
     3:3:com.android.tools.r8.ir.code.BasicBlock targetBlock(int):32:32 -> d
     com.android.tools.r8.ir.code.Switch asSwitch() -> q0
-    boolean isSwitch() -> s2
+    boolean isSwitch() -> r2
 com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.w.b.d1:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> E2
+    1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> D2
     boolean instructionTypeCanThrow() -> N0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):39:39 -> a
@@ -25061,26 +25090,26 @@
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forThrow():267:267 -> 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):76 -> a
     com.android.tools.r8.ir.code.Throw asThrow() -> r0
-    boolean isThrow() -> t2
-    int maxInValueRegister() -> x2
-    1:1:int maxOutValueRegister():49:49 -> y2
-    int opcode() -> z2
+    boolean isThrow() -> s2
+    int maxInValueRegister() -> w2
+    1:1:int maxOutValueRegister():49:49 -> x2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.w.b.e1:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> D2
+    1:1:com.android.tools.r8.ir.code.Value source():25:25 -> C2
     boolean hasInvariantOutType() -> I0
     1:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
     3:3:com.android.tools.r8.ir.analysis.type.TypeLatticeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():271:271 -> 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):51 -> a
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> c
-    boolean isUnop() -> u2
-    int maxInValueRegister() -> x2
-    int maxOutValueRegister() -> y2
+    boolean isUnop() -> t2
+    int maxInValueRegister() -> w2
+    int maxOutValueRegister() -> x2
 com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.w.b.f1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -25093,8 +25122,8 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):58:58 -> d
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Ushr asUshr() -> s0
-    boolean isUshr() -> v2
-    int opcode() -> z2
+    boolean isUshr() -> u2
+    int opcode() -> y2
 com.android.tools.r8.ir.code.Value -> com.android.tools.r8.w.b.g1:
     int needsRegister -> j
     boolean isThis -> k
@@ -25113,175 +25142,171 @@
     com.android.tools.r8.ir.code.Value$DebugData debugData -> n
     com.android.tools.r8.utils.LongInterval valueRange -> m
     java.util.LinkedList users -> c
-    1:165:void <clinit>():41:205 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):224:224 -> <init>
-    2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):209:227 -> <init>
-    1:1:boolean isArgument():886:886 -> A
-    1:1:boolean isConstClass():826:826 -> B
-    1:1:boolean isConstNumber():806:806 -> C
-    1:1:boolean isConstString():810:810 -> D
-    1:1:boolean isConstant():830:830 -> E
-    1:1:boolean isDexItemBasedConstString():814:814 -> F
-    boolean isFixedRegisterValue() -> G
-    1:1:boolean isLinked():393:393 -> H
-    1:3:boolean isNeverNull():874:876 -> I
-    boolean isPhi() -> J
-    1:1:boolean isThis():946:946 -> K
-    1:1:boolean isUsed():498:498 -> L
-    boolean isValueOnStack() -> M
-    1:3:boolean isZero():1039:1041 -> N
-    1:3:void markAsArgument():880:882 -> O
-    1:3:void markAsThis():935:937 -> P
-    1:1:void markNonDebugLocalRead():138:138 -> Q
-    1:3:boolean needsRegister():713:715 -> R
-    1:1:int numberOfAllNonDebugUsers():486:486 -> S
-    1:1:int numberOfAllUsers():494 -> S
-    2:2:int numberOfAllUsers():494:494 -> S
-    1:1:int numberOfDebugUsers():490:490 -> T
-    1:5:int numberOfPhiUsers():478:482 -> U
-    1:5:int numberOfUsers():470:474 -> V
-    1:1:com.android.tools.r8.ir.code.ValueType outType():797:797 -> W
-    1:1:int requiredRegisters():296:296 -> X
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():429:430 -> Y
-    1:4:java.util.Set uniquePhiUsers():459:462 -> Z
+    1:165:void <clinit>():40:204 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):223:223 -> <init>
+    2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):208:226 -> <init>
+    1:1:boolean isConstClass():827:827 -> A
+    1:1:boolean isConstNumber():807:807 -> B
+    1:1:boolean isConstString():811:811 -> C
+    1:1:boolean isConstant():831:831 -> D
+    1:1:boolean isDexItemBasedConstString():815:815 -> E
+    boolean isFixedRegisterValue() -> F
+    1:1:boolean isLinked():392:392 -> G
+    1:3:boolean isNeverNull():991:993 -> H
+    boolean isPhi() -> I
+    1:1:boolean isThis():1063:1063 -> J
+    1:1:boolean isUsed():493:493 -> K
+    boolean isValueOnStack() -> L
+    1:3:boolean isZero():1156:1158 -> M
+    1:3:void markAsArgument():997:999 -> N
+    1:3:void markAsThis():1052:1054 -> O
+    1:1:void markNonDebugLocalRead():137:137 -> P
+    1:3:boolean needsRegister():719:721 -> Q
+    1:1:int numberOfAllNonDebugUsers():481:481 -> R
+    1:1:int numberOfAllUsers():489 -> R
+    2:2:int numberOfAllUsers():489:489 -> R
+    1:1:int numberOfDebugUsers():485:485 -> S
+    1:5:int numberOfPhiUsers():473:477 -> T
+    1:5:int numberOfUsers():465:469 -> U
+    1:1:com.android.tools.r8.ir.code.ValueType outType():798:798 -> V
+    1:1:int requiredRegisters():295:295 -> W
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():428:429 -> X
+    1:4:java.util.Set uniquePhiUsers():454:457 -> Y
+    1:4:java.util.Set uniqueUsers():421:424 -> Z
     boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi) -> a
-    1:13: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):45:57 -> a
-    14:14:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1050:1050 -> a
-    14: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):58 -> 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):47:47 -> a
+    1:13: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):44:56 -> a
+    14:14:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    14: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):57 -> 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):46:46 -> a
     16:18:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> 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):47 -> a
-    19:79:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):63:123 -> a
-    80:81:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):118:119 -> a
-    82:83:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):113:114 -> a
-    84:85:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):108:109 -> a
-    86:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):100:104 -> a
-    91:92:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):95:96 -> a
-    93:94:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):90:91 -> a
-    95:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):69:85 -> a
-    112:116:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):82:86 -> a
-    117:117:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):129:129 -> a
-    118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):133:133 -> a
-    118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):129 -> a
-    119:139:com.android.tools.r8.ir.code.Value getAliasedValue(java.util.function.Predicate):262:282 -> a
-    140:142:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):308:310 -> a
-    143:146:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):319:322 -> a
-    147:148:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362:363 -> a
-    149:150:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367:368 -> a
-    149:150:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363 -> a
-    151:159:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():173:181 -> a
-    151:159:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):368 -> a
-    151:159:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363 -> a
-    160:160:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():179:179 -> a
-    160:160:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):368 -> a
-    160:160:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363 -> a
-    161:161:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():176:176 -> a
-    161:161:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):368 -> a
-    161:161:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363 -> a
-    162:162:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):363:363 -> a
-    163:164:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):413:414 -> a
-    165:171:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set,java.util.Set):442:448 -> a
-    172:173:void addPhiUser(com.android.tools.r8.ir.code.Phi):553:554 -> a
-    174:181:java.util.Set affectedValues():604:611 -> a
-    182:209:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):643:670 -> a
-    210:219:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):677:686 -> a
-    220: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):186:199 -> a
-    220:233:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):686 -> a
-    234:234: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):187:187 -> a
-    234:234:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):686 -> a
-    235:235:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):686:686 -> a
-    236:244:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):691:699 -> a
-    245:246:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):704:705 -> a
-    247:248:void setNeedsRegister(boolean):719:720 -> a
-    249:260:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):890:901 -> a
-    261:283:boolean knownToBeBoolean(java.util.Set):909:931 -> a
-    284:284:void setValueRange(com.android.tools.r8.utils.LongInterval):950:950 -> a
-    285:285:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):982:982 -> a
-    286:286:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):987:987 -> a
-    286:286:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):982 -> a
-    287:314:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1004:1031 -> a
-    315:315:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1050:1050 -> a
-    316:318:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1069:1071 -> a
-    319:327:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1069:1077 -> a
-    328:328:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1050:1050 -> a
-    328:328:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1078 -> a
-    329:335:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1119:1125 -> a
-    336:336:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    336:336:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1126 -> a
-    337:348:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1127:1138 -> a
-    349:349:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    349:349:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1138 -> a
-    350:351:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1138:1139 -> a
-    1:4:java.util.Set uniqueUsers():422:425 -> a0
+    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):46 -> a
+    19:79:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):62:122 -> a
+    80:81:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):117:118 -> a
+    82:83:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):112:113 -> a
+    84:85:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):107:108 -> a
+    86:90:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):99:103 -> a
+    91:92:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):94:95 -> a
+    93:94:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):89:90 -> a
+    95:111:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):68:84 -> a
+    112:116:com.android.tools.r8.ir.analysis.type.TypeLatticeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):81:85 -> a
+    117:117:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128:128 -> a
+    118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):132:132 -> a
+    118:118:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):128 -> a
+    119:139:com.android.tools.r8.ir.code.Value getAliasedValue(java.util.function.Predicate):261:281 -> a
+    140:142:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):307:309 -> a
+    143:146:boolean hasSameOrNoLocal(com.android.tools.r8.ir.code.Value):318:321 -> a
+    147:148:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):361:362 -> a
+    149:150:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):366:367 -> a
+    149:150:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    151:159:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():172:180 -> a
+    151:159:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    151:159:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    160:160:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():178:178 -> a
+    160:160:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    160:160:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    161:161:com.android.tools.r8.ir.code.Value$DebugUse com.android.tools.r8.ir.code.Value$DebugUse.end():175:175 -> a
+    161:161:com.android.tools.r8.ir.code.Value$DebugUse markEnd(com.android.tools.r8.ir.code.Value$DebugUse):367 -> a
+    161:161:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362 -> a
+    162:162:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):362:362 -> a
+    163:164:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):412:413 -> a
+    165:168:void collectAliasedUsersViaAssume(java.util.Set,java.util.Set):440:443 -> a
+    169:170:void addPhiUser(com.android.tools.r8.ir.code.Phi):559:560 -> a
+    171:178:java.util.Set affectedValues():610:617 -> a
+    179:206:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):649:676 -> a
+    207:216:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):683:692 -> a
+    217:230: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):185:198 -> a
+    217:230:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692 -> a
+    231:231: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):186:186 -> a
+    231:231:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692 -> a
+    232:232:void replaceUserInDebugData(java.util.Map$Entry,com.android.tools.r8.ir.code.Value):692:692 -> a
+    233:241:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):697:705 -> a
+    242:243:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):710:711 -> a
+    244:245:void setNeedsRegister(boolean):725:726 -> a
+    246:258:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):835:847 -> a
+    259:259:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    259:259:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):848 -> a
+    260:261:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):848:849 -> a
+    262:262:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():103:103 -> a
+    262:262:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853 -> a
+    263:381:boolean isConstantArrayThroughoutMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):853:971 -> a
+    382:393:int computeArgumentPosition(com.android.tools.r8.ir.code.IRCode):1007:1018 -> a
+    394:416:boolean knownToBeBoolean(java.util.Set):1026:1048 -> a
+    417:417:void setValueRange(com.android.tools.r8.utils.LongInterval):1067:1067 -> a
+    418:418:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate):1104:1104 -> a
+    419:446:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1121:1148 -> a
+    447:447:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    448:450:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1186:1188 -> a
+    451:459:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1186:1194 -> a
+    460:460:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> a
+    460:460:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1195 -> a
+    461:467:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1235:1241 -> a
+    468:468:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    468:468:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1242 -> a
+    469:480:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1243:1254 -> a
+    481:481:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    481:481:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1254 -> a
+    482:483:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1254:1255 -> a
+    1:2:boolean usedInMonitorOperation():525:526 -> a0
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
-    1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):287:288 -> b
-    3:6:void linkTo(com.android.tools.r8.ir.code.Value):372:375 -> b
-    7:9:java.util.Set aliasedUsers():434:436 -> b
-    10:11:void removePhiUser(com.android.tools.r8.ir.code.Phi):558:559 -> b
-    12:13:void addDebugUser(com.android.tools.r8.ir.code.Instruction):568:569 -> b
-    14:20:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1056:1062 -> b
-    21:21:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1050:1050 -> b
-    21:21:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1063 -> b
-    22:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1089:1108 -> b
-    42:42:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
-    42:42:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1108 -> b
-    43:47:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1108:1112 -> b
-    1:2:boolean usedInMonitorOperation():519:520 -> b0
+    1:2:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):286:287 -> b
+    3:6:void linkTo(com.android.tools.r8.ir.code.Value):371:374 -> b
+    7:8:java.util.Set aliasedUsers():433:434 -> b
+    9:10:void removePhiUser(com.android.tools.r8.ir.code.Phi):564:565 -> b
+    11:12:void addDebugUser(com.android.tools.r8.ir.code.Instruction):574:575 -> b
+    13:13:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):1099:1099 -> b
+    14:20:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1173:1179 -> b
+    21:21:void setTypeLattice(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1167:1167 -> b
+    21:21:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1180 -> b
+    22:40:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1206:1224 -> b
+    41:41:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> b
+    41:41:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1224 -> b
+    42:46:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1224:1228 -> b
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> c
-    1:2:void addUser(com.android.tools.r8.ir.code.Instruction):528:529 -> c
-    3:4:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):563:564 -> c
-    5:17:void replaceUsers(com.android.tools.r8.ir.code.Value):618:630 -> c
-    18:29:com.android.tools.r8.graph.DexEncodedField getEnumField(com.android.tools.r8.graph.AppView):834:845 -> c
-    30:30:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):158:158 -> c
-    30:30:com.android.tools.r8.graph.DexEncodedField getEnumField(com.android.tools.r8.graph.AppView):849 -> c
-    31:31:com.android.tools.r8.graph.DexEncodedField getEnumField(com.android.tools.r8.graph.AppView):854:854 -> c
-    32:32:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> c
-    32:32:com.android.tools.r8.graph.DexEncodedField getEnumField(com.android.tools.r8.graph.AppView):854 -> c
-    33:33:com.android.tools.r8.graph.DexEncodedField getEnumField(com.android.tools.r8.graph.AppView):855:855 -> c
-    1:1:int compareTo(java.lang.Object):41:41 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.ir.code.Value):758:758 -> compareTo
-    2:2:int compareTo(java.lang.Object):41 -> compareTo
+    1:5:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):497:501 -> c
+    6:6:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> c
+    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):501 -> c
+    7:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):504:508 -> c
+    12:16:boolean mayDependOnEnvironment(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):514:518 -> c
+    17:18:void addUser(com.android.tools.r8.ir.code.Instruction):534:535 -> c
+    19:20:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):569:570 -> c
+    21:33:void replaceUsers(com.android.tools.r8.ir.code.Value):624:636 -> c
     com.android.tools.r8.ir.code.Phi asPhi() -> d
-    1:5:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):502:506 -> d
-    6:6:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> d
-    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):506 -> d
-    7:11:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):509:513 -> d
-    12:16:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):581:585 -> d
-    17:17:boolean lambda$getDynamicLowerBoundType$4(com.android.tools.r8.ir.code.Value):1134:1134 -> d
-    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):533:534 -> e
-    3:8:void clearUsers():543:548 -> e
-    9:9:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1090:1090 -> e
+    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):587:591 -> d
+    6:6:boolean lambda$getDynamicLowerBoundType$4(com.android.tools.r8.ir.code.Value):1250:1250 -> d
+    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):539:540 -> e
+    3:8:void clearUsers():549:554 -> e
+    9:9:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1207:1207 -> e
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> f
-    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):538:539 -> f
-    3:8:void clearUsersInfo():593:598 -> f
-    1:2:void computeNeedsRegister():724:725 -> g
-    1:1:java.util.Set debugUsers():466:466 -> h
-    1:1:int hashCode():763:763 -> hashCode
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():454:455 -> i
-    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():258:258 -> j
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():801:802 -> k
-    1:7:java.util.List getDebugLocalEnds():339:345 -> l
-    1:7:java.util.List getDebugLocalStarts():326:332 -> m
-    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():239:240 -> n
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():709:709 -> o
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():300:300 -> p
-    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():405:405 -> q
-    1:1:int getNumber():292:292 -> r
-    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():409:409 -> s
-    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():398 -> s
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1082:1082 -> t
-    1:26:java.lang.String toString():768:793 -> toString
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():966:976 -> u
-    1:1:boolean hasAliasedValue():244:244 -> v
-    1:1:boolean hasLocalInfo():304:304 -> w
-    1:1:boolean hasUsersInfo():589:589 -> x
-    1:1:boolean hasValueRange():954:954 -> y
-    1:8:boolean internalComputeNeedsRegister():729:736 -> z
+    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):544:545 -> f
+    3:8:void clearUsersInfo():599:604 -> f
+    1:2:void computeNeedsRegister():730:731 -> g
+    1:1:java.util.Set debugUsers():461:461 -> h
+    1:1:int hashCode():764:764 -> hashCode
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():449:450 -> i
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():257:257 -> j
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():802:803 -> k
+    1:7:java.util.List getDebugLocalEnds():338:344 -> l
+    1:7:java.util.List getDebugLocalStarts():325:331 -> m
+    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():238:239 -> n
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():715:715 -> o
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():299:299 -> p
+    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():404:404 -> q
+    1:1:int getNumber():291:291 -> r
+    1:1:com.android.tools.r8.ir.code.Value getPreviousConsecutive():408:408 -> s
+    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():397 -> s
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getTypeLattice():1199:1199 -> t
+    1:26:java.lang.String toString():769:794 -> toString
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():1083:1093 -> u
+    1:1:boolean hasLocalInfo():303:303 -> v
+    1:1:boolean hasUsersInfo():595:595 -> w
+    1:1:boolean hasValueRange():1071:1071 -> x
+    1:8:boolean internalComputeNeedsRegister():735:742 -> y
+    1:1:boolean isArgument():1003:1003 -> z
 com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.w.b.g1$a:
     java.util.Map users -> b
     com.android.tools.r8.graph.DebugLocalInfo local -> a
-    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):148:148 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):146:149 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):147:147 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):145:148 -> <init>
 com.android.tools.r8.ir.code.Value$DebugUse -> com.android.tools.r8.w.b.g1$b:
     com.android.tools.r8.ir.code.Value$DebugUse START -> b
     com.android.tools.r8.ir.code.Value$DebugUse[] $VALUES -> e
@@ -25289,9 +25314,9 @@
     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:2:void <clinit>():156:157 -> <clinit>
-    3:3:void <clinit>():156:156 -> <clinit>
-    1:1:void <init>(java.lang.String,int):156:156 -> <init>
+    1:2:void <clinit>():155:156 -> <clinit>
+    3:3:void <clinit>():155:155 -> <clinit>
+    1:1:void <init>(java.lang.String,int):155:155 -> <init>
 com.android.tools.r8.ir.code.ValueNumberGenerator -> com.android.tools.r8.w.b.h1:
     int nextValueNumber -> a
     1:2:void <init>():6:7 -> <init>
@@ -25380,8 +25405,8 @@
     long decodedValue() -> a
 com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.w.b.l1:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
-    boolean isCommutative() -> E2
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> I2
+    boolean isCommutative() -> D2
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> H2
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
     long foldLongs(long,long) -> a
@@ -25394,9 +25419,9 @@
     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.Xor asXor() -> t0
-    boolean isXor() -> w2
-    int opcode() -> z2
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.ir.conversion.c:
+    boolean isXor() -> v2
+    int opcode() -> y2
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.w.c.c:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -25408,78 +25433,72 @@
     19:19:void clear():63:63 -> a
     1:1:int getElementWidth(int):51:51 -> b
     1:1:long getSize(int):55:55 -> c
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1 -> com.android.tools.r8.ir.conversion.a:
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$PayloadData -> com.android.tools.r8.ir.conversion.b:
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1 -> com.android.tools.r8.w.c.a:
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$PayloadData -> com.android.tools.r8.w.c.b:
     long size -> b
     short[] data -> c
     int element_width -> a
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1):17:17 -> <init>
-com.android.tools.r8.ir.conversion.CallGraph -> com.android.tools.r8.ir.conversion.CallGraph:
-    com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult cycleEliminationResult -> a
-    1:3:void <init>(java.util.Set,com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult):163:165 -> <init>
-    1:2:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):181:182 -> a
+com.android.tools.r8.ir.conversion.CallGraph -> com.android.tools.r8.w.c.d:
+    java.util.Set nodes -> a
+    com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult cycleEliminationResult -> b
+    1:3:void <init>(java.util.Set,com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult):150:152 -> <init>
+    1:2:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):176:177 -> a
     3:3:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    3:3:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):183 -> a
-com.android.tools.r8.ir.conversion.CallGraph$Node -> com.android.tools.r8.ir.conversion.CallGraph$a:
+    3:3:com.android.tools.r8.ir.conversion.CallSiteInformation createCallSiteInformation(com.android.tools.r8.graph.AppView):178 -> a
+com.android.tools.r8.ir.conversion.CallGraph$Node -> com.android.tools.r8.w.c.d$a:
     com.android.tools.r8.graph.DexEncodedMethod method -> a
     java.util.Set callees -> c
     java.util.Set callers -> d
     boolean $assertionsDisabled -> e
     int numberOfCallSites -> b
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):49:49 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.DexEncodedMethod):41:50 -> <init>
-    1:1:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node):54:54 -> a
-    2:8:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node,boolean):59:65 -> a
-    9:16:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node,boolean):62:69 -> a
-    17:19:void cleanCalleesForRemoval():79:81 -> a
-    1:3:void cleanCallersForRemoval():86:88 -> b
-    4:4:boolean hasCallee(com.android.tools.r8.ir.conversion.CallGraph$Node):105:105 -> b
-    1:1:java.util.Set getCalleesWithDeterministicOrder():97:97 -> c
-    2:2:boolean hasCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):109:109 -> c
-    1:1:int compareTo(java.lang.Object):36:36 -> compareTo
-    2:2:int compareTo(com.android.tools.r8.ir.conversion.CallGraph$Node):122:122 -> compareTo
-    2:2:int compareTo(java.lang.Object):36 -> compareTo
-    1:2:void removeCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):74:75 -> d
-    3:3:java.util.Set getCallersWithDeterministicOrder():93:93 -> d
-    1:1:int getNumberOfCallSites():101:101 -> e
-    1:1:boolean isLeaf():117:117 -> f
-    1:1:boolean isRoot():113:113 -> g
-    1:30:java.lang.String toString():127:156 -> toString
-com.android.tools.r8.ir.conversion.CallGraphBuilder -> com.android.tools.r8.ir.conversion.CallGraphBuilder:
-    boolean $assertionsDisabled -> e
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):22:22 -> <init>
-    1:5:void process(java.util.concurrent.ExecutorService):27:31 -> a
-    6:14:void process(java.util.concurrent.ExecutorService):30:38 -> a
-    15:15:java.lang.Object lambda$process$0(com.android.tools.r8.graph.DexProgramClass):33:33 -> a
-    16:18:boolean verifyAllMethodsWithCodeExists():54:56 -> a
-    1:1:void processClass(com.android.tools.r8.graph.DexProgramClass):42:42 -> b
-    2:4:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):46:48 -> b
-    5:5:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):47:47 -> b
-    1:1:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):19:19 -> build
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase -> com.android.tools.r8.ir.conversion.CallGraphBuilderBase:
+    1:1:void <clinit>():37:37 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod):50:50 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.DexEncodedMethod):42:51 -> <init>
+    1:1:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node):55:55 -> a
+    2:8:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node,boolean):60:66 -> a
+    9:16:void addCallerConcurrently(com.android.tools.r8.ir.conversion.CallGraph$Node,boolean):63:70 -> a
+    17:19:void cleanForRemoval():80:82 -> a
+    1:1:java.util.Set getCalleesWithDeterministicOrder():91:91 -> b
+    2:2:boolean hasCallee(com.android.tools.r8.ir.conversion.CallGraph$Node):99:99 -> b
+    1:1:java.util.Set getCallersWithDeterministicOrder():87:87 -> c
+    2:2:boolean hasCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):103:103 -> c
+    1:1:int compareTo(java.lang.Object):37:37 -> compareTo
+    2:2:int compareTo(com.android.tools.r8.ir.conversion.CallGraph$Node):112:112 -> compareTo
+    2:2:int compareTo(java.lang.Object):37 -> compareTo
+    1:2:void removeCaller(com.android.tools.r8.ir.conversion.CallGraph$Node):75:76 -> d
+    3:3:int getNumberOfCallSites():95:95 -> d
+    1:1:boolean isLeaf():107:107 -> e
+    1:27:java.lang.String toString():117:143 -> toString
+com.android.tools.r8.ir.conversion.CallGraphBuilder -> com.android.tools.r8.w.c.e:
     java.util.Map nodes -> b
     java.util.Map possibleTargetsCache -> c
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():45:45 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):51:51 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView):47:52 -> <init>
-    void process(java.util.concurrent.ExecutorService) -> a
-    boolean verifyAllMethodsWithCodeExists() -> a
-    1:1:java.util.Map access$000(com.android.tools.r8.ir.conversion.CallGraphBuilderBase):45:45 -> a
-    2:4:com.android.tools.r8.ir.conversion.CallGraph$Node getOrCreateNode(com.android.tools.r8.graph.DexEncodedMethod):74:76 -> a
-    5:5:com.android.tools.r8.ir.conversion.CallGraph$Node lambda$getOrCreateNode$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):75:75 -> a
-    1:6:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):56:61 -> build
-    7:7:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet():405:405 -> build
-    7:7:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.lang.Iterable):430 -> build
-    7:7:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):61 -> build
-    8:8:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.lang.Iterable):431:431 -> build
-    8:8:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):61 -> build
-    9:15:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):62:68 -> build
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator -> com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator:
+    1:1:void <clinit>():48:48 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):55:55 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):51:56 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.conversion.CallGraphBuilder):48:48 -> a
+    2:2:com.android.tools.r8.ir.conversion.CallGraph$Node access$100(com.android.tools.r8.ir.conversion.CallGraphBuilder,com.android.tools.r8.graph.DexEncodedMethod):48:48 -> a
+    3:7:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):60:64 -> a
+    8:18:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):63:73 -> a
+    19:21:boolean verifyAllMethodsWithCodeExists():104:106 -> a
+    19:21:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73 -> a
+    22:24:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):75:77 -> a
+    25:25:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet():405:405 -> a
+    25:25:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.lang.Iterable):430 -> a
+    25:25:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):77 -> a
+    26:26:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.lang.Iterable):431:431 -> a
+    26:26:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):77 -> a
+    27:33:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):78:84 -> a
+    34:34:java.lang.Object lambda$build$0(com.android.tools.r8.graph.DexProgramClass):66:66 -> a
+    35:37:com.android.tools.r8.ir.conversion.CallGraph$Node getOrCreateNode(com.android.tools.r8.graph.DexEncodedMethod):98:100 -> a
+    38:38:com.android.tools.r8.ir.conversion.CallGraph$Node lambda$getOrCreateNode$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):99:99 -> a
+    1:1:java.util.Map access$200(com.android.tools.r8.ir.conversion.CallGraphBuilder):48:48 -> b
+    2:2:void processClass(com.android.tools.r8.graph.DexProgramClass):88:88 -> b
+    3:4:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):92:93 -> b
+com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator -> com.android.tools.r8.w.c.e$a:
     java.util.Deque stack -> c
     boolean $assertionsDisabled -> i
     java.util.Collection nodes -> a
@@ -25489,112 +25508,111 @@
     int maxDepth -> h
     int currentDepth -> g
     java.util.Map removedEdges -> f
-    1:1:void <clinit>():277:277 -> <clinit>
-    1:1:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):336:336 -> <init>
-    2:23:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):322:343 -> <init>
-    1:1:boolean edgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):514:514 -> a
-    2:2:void recordEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):518:518 -> a
-    3:5:java.util.Collection reorderNodes(java.util.List):529:531 -> a
-    1:1:java.util.Set lambda$recordEdgeRemoval$0(com.android.tools.r8.ir.conversion.CallGraph$Node):518:518 -> b
-    1:8:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles():348:355 -> breakCycles
-    9:14:void reset():362:367 -> breakCycles
-    9:14:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult breakCycles():357 -> breakCycles
-    1:7:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):371:377 -> c
-    8:10:void push(com.android.tools.r8.ir.conversion.CallGraph$Node):474:476 -> c
-    8:10:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):382 -> c
-    11:91:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):386:466 -> c
-    92:110:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):406:424 -> c
-    111:118:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):420:427 -> c
-    119:123:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):487:491 -> c
-    119:123:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):430 -> c
-    124:125:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):432:433 -> c
-    126:134:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):496:504 -> c
-    126:134:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):439 -> c
-    135:147:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):444:456 -> c
-    148:148:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):451:451 -> c
-    149:151:void recoverStack(java.util.LinkedList):522:524 -> c
-    149:151:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):461 -> c
-    152:152:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):508:508 -> c
-    152:152:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):439 -> c
+    1:1:void <clinit>():302:302 -> <clinit>
+    1:1:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):361:361 -> <init>
+    2:23:void <init>(java.util.Collection,com.android.tools.r8.utils.InternalOptions):347:368 -> <init>
+    1:8:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():373:380 -> a
+    9:14:void reset():387:392 -> a
+    9:14:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult breakCycles():382 -> a
+    15:15:boolean edgeRemovalIsSafe(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):539:539 -> a
+    16:16:void recordEdgeRemoval(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):543:543 -> a
+    17:19:java.util.Collection reorderNodes(java.util.List):554:556 -> a
+    1:1:java.util.Set lambda$recordEdgeRemoval$0(com.android.tools.r8.ir.conversion.CallGraph$Node):543:543 -> b
+    1:7:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):396:402 -> c
+    8:10:void push(com.android.tools.r8.ir.conversion.CallGraph$Node):499:501 -> c
+    8:10:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):407 -> c
+    11:91:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):411:491 -> c
+    92:110:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):431:449 -> c
+    111:118:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):445:452 -> c
+    119:123:java.util.LinkedList extractCycle(com.android.tools.r8.ir.conversion.CallGraph$Node):512:516 -> c
+    119:123:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):455 -> c
+    124:125:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):457:458 -> c
+    126:134:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):521:529 -> c
+    126:134:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    135:147:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):469:481 -> c
+    148:148:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):476:476 -> c
+    149:151:void recoverStack(java.util.LinkedList):547:549 -> c
+    149:151:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):486 -> c
+    152:152:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533:533 -> c
+    152:152:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
     153:153:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
-    153:153:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):508 -> c
-    153:153:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):439 -> c
-    154:154:com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):508:508 -> c
-    154:154:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):439 -> c
-    155:158:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):480:483 -> c
-    155:158:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):469 -> c
-    159:159:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):470:470 -> c
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge -> com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$a:
+    153:153:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533 -> c
+    153:153:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    154:154:com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge findCallEdgeForRemoval(java.util.LinkedList):533:533 -> c
+    154:154:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):464 -> c
+    155:158:void pop(com.android.tools.r8.ir.conversion.CallGraph$Node):505:508 -> c
+    155:158:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):494 -> c
+    159:159:void traverse(com.android.tools.r8.ir.conversion.CallGraph$Node):495:495 -> c
+com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge -> com.android.tools.r8.w.c.e$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):287:289 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$100(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge):282:282 -> a
-    2:2:void remove():293:293 -> a
-    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$200(com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CallEdge):282:282 -> b
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult -> com.android.tools.r8.ir.conversion.CallGraphBuilderBase$CycleEliminator$CycleEliminationResult:
+    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraph$Node,com.android.tools.r8.ir.conversion.CallGraph$Node):312:314 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$300(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):307:307 -> a
+    2:2:void remove():318:318 -> a
+    1:1:com.android.tools.r8.ir.conversion.CallGraph$Node access$400(com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CallEdge):307:307 -> b
+com.android.tools.r8.ir.conversion.CallGraphBuilder$CycleEliminator$CycleEliminationResult -> com.android.tools.r8.w.c.e$a$b:
     java.util.Map removedEdges -> a
-    1:2:void <init>(java.util.Map):301:302 -> <init>
-    1:1:void forEachRemovedCaller(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Consumer):306:306 -> a
-    1:2:int numberOfRemovedEdges():311:312 -> numberOfRemovedEdges
-com.android.tools.r8.ir.conversion.CallGraphBuilderBase$InvokeExtractor -> com.android.tools.r8.ir.conversion.CallGraphBuilderBase$a:
+    1:2:void <init>(java.util.Map):326:327 -> <init>
+    1:1:void forEachRemovedCaller(com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Consumer):331:331 -> a
+    2:3:int numberOfRemovedEdges():336:337 -> a
+com.android.tools.r8.ir.conversion.CallGraphBuilder$InvokeExtractor -> com.android.tools.r8.w.c.f:
     com.android.tools.r8.ir.conversion.CallGraph$Node caller -> a
-    com.android.tools.r8.ir.conversion.CallGraphBuilderBase this$0 -> c
-    java.util.function.Predicate targetTester -> b
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():81:81 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilderBase,com.android.tools.r8.ir.conversion.CallGraph$Node,java.util.function.Predicate):86:89 -> <init>
-    1:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexClass):93:95 -> a
-    4:5:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):100:101 -> a
+    com.android.tools.r8.ir.conversion.CallGraphBuilder this$0 -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():112:112 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.conversion.CallGraphBuilder,com.android.tools.r8.ir.conversion.CallGraph$Node):116:118 -> <init>
+    1:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexClass):122:124 -> a
+    4:5:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):129:130 -> a
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    6:6:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):101 -> a
-    7:7:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):103:103 -> a
-    8:22:void addTarget(com.android.tools.r8.graph.DexEncodedMethod,boolean):108:122 -> a
-    23:38:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):126:141 -> a
-    39:39:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    39:39:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):141 -> a
-    40:46:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):142:148 -> a
-    47:48:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):134:135 -> a
-    49:49:void lambda$processInvoke$0(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):135:135 -> a
-    50:53:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):175:178 -> a
-    54:55:void processFieldAccess(com.android.tools.r8.graph.DexField):195:196 -> a
-    56:56:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():114:114 -> a
-    56:56:void processFieldAccess(com.android.tools.r8.graph.DexField):197 -> a
-    57:57:void processFieldAccess(com.android.tools.r8.graph.DexField):198:198 -> a
-    1:2:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):156:157 -> b
+    6:6:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):130 -> a
+    7:7:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):132:132 -> a
+    8:19:void addTarget(com.android.tools.r8.graph.DexEncodedMethod,boolean):137:148 -> a
+    20:35:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):152:167 -> a
+    36:36:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    36:36:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):167 -> a
+    37:43:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):168:174 -> a
+    44:45:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):160:161 -> a
+    46:46:void lambda$processInvoke$0(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):161:161 -> a
+    47:50:java.util.Set lambda$processInvokeWithDynamicDispatch$1(boolean,com.android.tools.r8.graph.DexMethod):200:203 -> a
+    51:52:void processFieldAccess(com.android.tools.r8.graph.DexField):220:221 -> a
+    53:53:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():114:114 -> a
+    53:53:void processFieldAccess(com.android.tools.r8.graph.DexField):222 -> a
+    54:54:void processFieldAccess(com.android.tools.r8.graph.DexField):223:223 -> a
+    1:2:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):181:182 -> b
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
-    3:3:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):157 -> b
-    4:32:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):159:187 -> b
-    1:1:void registerCallSite(com.android.tools.r8.graph.DexCallSite):272:272 -> registerCallSite
-    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):241:241 -> registerInstanceFieldRead
-    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):235:235 -> registerInstanceFieldWrite
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):211:211 -> registerInvokeDirect
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):223:223 -> registerInvokeInterface
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):217:217 -> registerInvokeStatic
-    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):229:229 -> registerInvokeSuper
-    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):205:205 -> registerInvokeVirtual
-    1:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):247:248 -> registerNewInstance
-    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):255:255 -> registerStaticFieldRead
-    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):261:261 -> registerStaticFieldWrite
-com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.ir.conversion.d:
+    3:3:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):182 -> b
+    4:32:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod):184:212 -> b
+    1:1:void registerCallSite(com.android.tools.r8.graph.DexCallSite):297:297 -> registerCallSite
+    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):266:266 -> registerInstanceFieldRead
+    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):260:260 -> registerInstanceFieldWrite
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):236:236 -> registerInvokeDirect
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):248:248 -> registerInvokeInterface
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):242:242 -> registerInvokeStatic
+    1:1:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):254:254 -> registerInvokeSuper
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):230:230 -> registerInvokeVirtual
+    1:2:boolean registerNewInstance(com.android.tools.r8.graph.DexType):272:273 -> registerNewInstance
+    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):280:280 -> registerStaticFieldRead
+    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):286:286 -> registerStaticFieldWrite
+com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.w.c.i:
     1:1:void <init>():14:14 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation empty():27:27 -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.DexMethod) -> b
-com.android.tools.r8.ir.conversion.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.ir.conversion.d$a:
+com.android.tools.r8.ir.conversion.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.w.c.g:
     java.util.Set singleCallSite -> a
     java.util.Set doubleCallSite -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):50:50 -> <init>
     2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):47:70 -> <init>
     1:1:boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod):94:94 -> a
     1:1:boolean hasSingleCallSite(com.android.tools.r8.graph.DexMethod):83:83 -> b
-com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.ir.conversion.e:
+com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.w.c.h:
     com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation EMPTY_INFO -> a
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>():30:30 -> <init>
     boolean hasDoubleCallSite(com.android.tools.r8.graph.DexMethod) -> a
     boolean hasSingleCallSite(com.android.tools.r8.graph.DexMethod) -> b
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation$EmptyCallSiteInformation access$000():30:30 -> b
-com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.ir.conversion.h:
+com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.w.c.l:
     com.android.tools.r8.ir.code.Position currentPosition -> h
     java.util.Map newInstanceLabels -> q
     java.util.List thisInitializers -> p
@@ -25622,7 +25640,7 @@
     21:23:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):133:135 -> a
     24:36:void rewriteNots():222:234 -> a
     24:36:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):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.TypeLatticeElement):1012:1012 -> 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.TypeLatticeElement):1008:1008 -> a
     37:37:void rewriteNots():234 -> a
     37:37:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.CodeRewriter):136 -> a
     38:46:void rewriteNots():235:243 -> a
@@ -25737,8 +25755,8 @@
     28:33:void updateLocals(com.android.tools.r8.cf.code.CfLabel):509:514 -> b
     34:37:boolean localsChanged():518:521 -> b
     38:38:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):634:634 -> b
-com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.ir.conversion.f:
-com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.ir.conversion.g:
+com.android.tools.r8.ir.conversion.CfBuilder$1 -> com.android.tools.r8.w.c.j:
+com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.w.c.k:
     int height -> b
     boolean $assertionsDisabled -> c
     int maxHeight -> a
@@ -25746,7 +25764,7 @@
     1:3:void <init>():100:102 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):100:100 -> <init>
     1:3:void push(com.android.tools.r8.ir.code.Value):109:111 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.ir.conversion.k:
+com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.w.c.o:
     int currentInstructionIndex -> o
     com.android.tools.r8.graph.CfCode code -> h
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo currentBlockInfo -> a
@@ -25779,7 +25797,7 @@
     1:1:int instructionCount():260:260 -> a
     2:6:boolean canThrowHelper(com.android.tools.r8.cf.code.CfInstruction):288:292 -> a
     7:9:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):297:299 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     10:10:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299 -> a
     11:12:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:300 -> a
     13:39:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):299:325 -> a
@@ -25895,16 +25913,20 @@
     37:37:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> i
     37:37:void setLocalVariableLists():681 -> i
     38:38:void setLocalVariableLists():681:681 -> i
-com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.ir.conversion.i:
+com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.w.c.m:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap locals -> c
     int endOffset -> b
     int startOffset -> a
+    1:1:void <clinit>():136:136 -> <clinit>
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> <clinit>
+    2:2:void <clinit>():136 -> <clinit>
+    3:3:void <clinit>():136:136 -> <clinit>
     1:4:void <init>(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap):142:145 -> <init>
     1:18:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):155:172 -> a
     19:19:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps.emptyMap():198:198 -> a
     19:19:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):173 -> a
     20:20:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):173:173 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.ir.conversion.j:
+com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.w.c.n:
     java.util.List guards -> c
     boolean $assertionsDisabled -> e
     int endOffset -> b
@@ -25920,7 +25942,7 @@
     7:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.<init>():104:104 -> a
     7:7:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):100 -> a
     8:36:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList computeTryHandlers(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,boolean,com.android.tools.r8.graph.DexItemFactory):102:130 -> a
-com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.ir.conversion.p:
+com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.w.c.t:
     com.android.tools.r8.ir.conversion.CfState$Snapshot current -> a
     com.android.tools.r8.ir.code.Position position -> b
     boolean $assertionsDisabled -> c
@@ -25954,8 +25976,8 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():190:190 -> c
     1:2:com.android.tools.r8.ir.conversion.CfState$Slot pop():176:177 -> d
     1:1:java.lang.String toString():225:225 -> toString
-com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.ir.conversion.l:
-com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.ir.conversion.m:
+com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.w.c.p:
+com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.w.c.q:
     com.android.tools.r8.ir.conversion.CfState$SlotType[] locals -> c
     com.android.tools.r8.ir.conversion.CfState$SlotType[] stack -> d
     boolean $assertionsDisabled -> e
@@ -25978,7 +26000,7 @@
     5:5:com.android.tools.r8.ir.conversion.CfState$Slot peek():366:366 -> c
     1:1:int stackHeight():350:350 -> d
     1:15:java.lang.String toString():395:409 -> toString
-com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.ir.conversion.n:
+com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.w.c.r:
     int stackHeight -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():452:452 -> <clinit>
@@ -25987,7 +26009,7 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():475:475 -> c
     1:1:int stackHeight():464:464 -> d
     1:1:java.lang.String toString():480:480 -> toString
-com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.ir.conversion.o:
+com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.w.c.s:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():413:413 -> <clinit>
@@ -26000,7 +26022,7 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():435:435 -> c
     1:1:int stackHeight():425:425 -> d
     1:1:java.lang.String toString():448:448 -> toString
-com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.ir.conversion.p$a:
+com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.w.c.t$a:
     com.android.tools.r8.ir.conversion.CfState$SlotType slotType -> d
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> e
@@ -26015,24 +26037,24 @@
     1:2:int stackPosition():252:253 -> b
     1:2:int access$500(com.android.tools.r8.ir.conversion.CfState$Slot):228 -> b
     1:3:java.lang.String toString():258:260 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.ir.conversion.s:
+com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.w.c.w:
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.CfState$1):14:14 -> <init>
     com.android.tools.r8.ir.code.ValueType getImprecise() -> a
     com.android.tools.r8.graph.DexType getPrecise() -> b
-com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.ir.conversion.q:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.w.c.u:
     com.android.tools.r8.ir.code.ValueType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):47:48 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():58:58 -> a
     com.android.tools.r8.graph.DexType getPrecise() -> b
     1:1:java.lang.String toString():63:63 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.ir.conversion.r:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.w.c.v:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):23:24 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():34:34 -> a
     1:1:com.android.tools.r8.graph.DexType getPrecise():29:29 -> b
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.ir.conversion.t:
+com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.w.c.x:
     com.android.tools.r8.ir.conversion.CfState$Snapshot parent -> a
     int updates -> b
     1:1:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,int,com.android.tools.r8.ir.conversion.CfState$1):264:264 -> <init>
@@ -26044,7 +26066,7 @@
     2:2:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):282:282 -> b
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():286:286 -> c
     1:1:int stackHeight():274:274 -> d
-com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.ir.conversion.u:
+com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.w.c.y:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():484:484 -> <clinit>
@@ -26053,7 +26075,7 @@
     2:3:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):506:507 -> a
     1:1:int maxLocal():496:496 -> b
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.ir.conversion.F:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.w.c.J:
     boolean hasBackwardsBranch -> m
     boolean $assertionsDisabled -> o
     int outRegisterCount -> l
@@ -26096,7 +26118,7 @@
     109:109:boolean isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     109:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
     110:123:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):429:442 -> a
-    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    124:124:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     124:124:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):443 -> a
     125:154:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):445:474 -> a
     155:166:void rewriteIfs():490:501 -> a
@@ -26112,7 +26134,7 @@
     180:183:void reset():165:168 -> a
     180:183:com.android.tools.r8.graph.DexCode build():191 -> a
     184:225:com.android.tools.r8.graph.DexCode build():196:237 -> a
-    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1334:1334 -> a
+    226:226:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1329:1329 -> a
     226:226:com.android.tools.r8.graph.DexCode build():237 -> a
     227:270:com.android.tools.r8.graph.DexCode build():238:281 -> a
     271:290:com.android.tools.r8.code.Nop createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):714:733 -> a
@@ -26180,7 +26202,7 @@
     4:4:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):668:668 -> c
     5:5:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():881:881 -> c
     1:1:boolean isBuildingForComparison():156:156 -> d
-com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.ir.conversion.v:
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.w.c.z:
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1050:1050 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -26188,11 +26210,11 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.ir.conversion.w:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.w.c.A:
     com.android.tools.r8.code.FillArrayData dex -> b
     com.android.tools.r8.ir.code.NewArrayFilledData ir -> a
     1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):1525:1527 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.ir.conversion.x:
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.w.c.B:
     com.android.tools.r8.code.Instruction instruction -> e
     1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):957:958 -> <init>
     1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):978:979 -> a
@@ -26201,7 +26223,7 @@
     1:1:int getSize():963:963 -> d
     1:1:int maxSize():973:973 -> e
     1:1:int minSize():968:968 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.ir.conversion.y:
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.w.c.C:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1083:1083 -> <clinit>
@@ -26220,7 +26242,7 @@
     1:2:int getSize():1097:1098 -> d
     1:1:int maxSize():1109:1109 -> e
     1:1:int minSize():1103:1103 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.ir.conversion.z:
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.w.c.D:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1214:1214 -> <clinit>
@@ -26342,7 +26364,7 @@
     1:1:int getSize():1347:1347 -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.ir.conversion.A:
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.w.c.E:
     com.android.tools.r8.ir.code.Instruction ir -> a
     int offset -> b
     int maxOffset -> c
@@ -26362,7 +26384,7 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.ir.conversion.B:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.w.c.F:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1361:1361 -> <clinit>
@@ -26415,7 +26437,7 @@
     1:2:int getSize():1473:1474 -> d
     1:1:int maxSize():1467:1467 -> e
     1:1:int minSize():1461:1461 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.ir.conversion.C:
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.w.c.G:
     int size -> f
     com.android.tools.r8.code.Instruction[] instructions -> e
     1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):1001:1007 -> <init>
@@ -26425,11 +26447,11 @@
     1:1:int getSize():1037:1037 -> d
     1:1:int maxSize():1032:1032 -> e
     1:1:int minSize():1027:1027 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.ir.conversion.D:
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.w.c.H:
     com.android.tools.r8.ir.code.IntSwitch ir -> a
     com.android.tools.r8.code.Format31t dex -> b
     1:3:void <init>(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):1514:1516 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.ir.conversion.E:
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.w.c.I:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> a
     int start -> b
     int end -> c
@@ -26438,7 +26460,7 @@
     1:1:int compareTo(java.lang.Object):1491:1491 -> compareTo
     2:2:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1505:1505 -> compareTo
     2:2:int compareTo(java.lang.Object):1491 -> compareTo
-com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.ir.conversion.G:
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.w.c.K:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.Position currentPosition -> i
     com.android.tools.r8.graph.DexMethod originalMethod -> l
@@ -26515,12 +26537,11 @@
     1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):453:453 -> i
     2:2:boolean inTryRange(com.android.tools.r8.graph.DexCode$Try,int):448:448 -> i
     2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):454 -> i
-com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.ir.conversion.H:
+com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.w.c.L:
     void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField) -> a
-    void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement) -> a
-    void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
+    void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
     void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField) -> b
-com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.ir.conversion.I:
+com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.w.c.M:
     com.android.tools.r8.ir.conversion.SourceCode source -> v
     java.util.Queue ssaWorklist -> f
     int currentInstructionOffset -> j
@@ -26565,817 +26586,817 @@
     5:5:boolean verifyMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense):468:468 -> a
     6:7:void addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):492:493 -> a
     8:26:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):509:527 -> a
-    27:29:void markIndexProcessed(int):2369:2371 -> a
+    27:29:void markIndexProcessed(int):2365:2367 -> a
     27:29:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):532 -> a
-    30:31:void ensureSubroutineProcessedInstructions():2379:2380 -> a
-    30:31:void markIndexProcessed(int):2374 -> a
+    30:31:void ensureSubroutineProcessedInstructions():2375:2376 -> a
+    30:31:void markIndexProcessed(int):2370 -> a
     30:31:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):532 -> a
-    32:32:void markIndexProcessed(int):2375:2375 -> a
+    32:32:void markIndexProcessed(int):2371:2371 -> a
     32:32:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):532 -> a
     33:43:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):533:543 -> a
-    44:44:void ensureNormalSuccessorBlock(int,int):2400:2400 -> a
+    44:44:void ensureNormalSuccessorBlock(int,int):2396:2396 -> a
     44:44:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):544 -> a
     45:47:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):550:552 -> a
     48:48:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):498:498 -> a
     48:48:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):552 -> a
     49:54:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):553:558 -> a
-    55:60:void processWorklist():749:754 -> a
+    55:60:void processWorklist():745:750 -> a
     55:60:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
     61:61:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):498:498 -> a
-    61:61:void processWorklist():754 -> a
+    61:61:void processWorklist():750 -> a
     61:61:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    62:66:void processWorklist():755:759 -> a
+    62:66:void processWorklist():751:755 -> a
     62:66:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    67:91:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):800:824 -> a
-    67:91:void processWorklist():759 -> a
+    67:91:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):796:820 -> a
+    67:91:void processWorklist():755 -> a
     67:91:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    92:97:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):823:828 -> a
-    92:97:void processWorklist():759 -> a
+    92:97:void processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):819:824 -> a
+    92:97:void processWorklist():755 -> a
     92:97:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    98:105:void processWorklist():760:767 -> a
+    98:105:void processWorklist():756:763 -> a
     98:105:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    106:116:void processWorklist():766:776 -> a
+    106:116:void processWorklist():762:772 -> a
     106:116:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    117:117:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    117:117:void processWorklist():776 -> a
+    117:117:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    117:117:void processWorklist():772 -> a
     117:117:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    118:127:void processWorklist():780:789 -> a
+    118:127:void processWorklist():776:785 -> a
     118:127:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    128:131:void closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2445:2448 -> a
-    128:131:void processWorklist():789 -> a
+    128:131:void closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2441:2444 -> a
+    128:131:void processWorklist():785 -> a
     128:131:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    132:133:void processWorklist():792:793 -> a
+    132:133:void processWorklist():788:789 -> a
     132:133:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
-    134:134:void processWorklist():749:749 -> a
+    134:134:void processWorklist():745:745 -> a
     134:134:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):559 -> a
     135:140:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):562:567 -> a
-    141:142:boolean verifyFilledPredecessors():688:689 -> a
+    141:142:boolean verifyFilledPredecessors():684:685 -> a
     141:142:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    143:148:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):695:700 -> a
-    143:148:boolean verifyFilledPredecessors():689 -> a
+    143:148:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):691:696 -> a
+    143:148:boolean verifyFilledPredecessors():685 -> a
     143:148:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
     149:149:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():297:297 -> a
-    149:149:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    149:149:boolean verifyFilledPredecessors():689 -> a
+    149:149:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    149:149:boolean verifyFilledPredecessors():685 -> a
     149:149:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    150:157:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):717:724 -> a
-    150:157:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    150:157:boolean verifyFilledPredecessors():689 -> a
+    150:157:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):713:720 -> a
+    150:157:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    150:157:boolean verifyFilledPredecessors():685 -> a
     150:157:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    158:161:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):740:743 -> a
-    158:161:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):724 -> a
-    158:161:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    158:161:boolean verifyFilledPredecessors():689 -> a
+    158:161:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):736:739 -> a
+    158:161:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):720 -> a
+    158:161:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    158:161:boolean verifyFilledPredecessors():685 -> a
     158:161:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    162:162:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):741:741 -> a
-    162:162:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):724 -> a
-    162:162:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    162:162:boolean verifyFilledPredecessors():689 -> a
+    162:162:boolean trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):737:737 -> a
+    162:162:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):720 -> a
+    162:162:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    162:162:boolean verifyFilledPredecessors():685 -> a
     162:162:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    163:170:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):728:735 -> a
-    163:170:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700 -> a
-    163:170:boolean verifyFilledPredecessors():689 -> a
+    163:170:int nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):724:731 -> a
+    163:170:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696 -> a
+    163:170:boolean verifyFilledPredecessors():685 -> a
     163:170:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    171:177:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):700:706 -> a
-    171:177:boolean verifyFilledPredecessors():689 -> a
+    171:177:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):696:702 -> a
+    171:177:boolean verifyFilledPredecessors():685 -> a
     171:177:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    178:178:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):703:703 -> a
-    178:178:boolean verifyFilledPredecessors():689 -> a
+    178:178:boolean verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):699:699 -> a
+    178:178:boolean verifyFilledPredecessors():685 -> a
     178:178:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    179:185:void insertDebugPositions():657:663 -> a
+    179:185:void insertDebugPositions():653:659 -> a
     179:185:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    186:186:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    186:186:void insertDebugPositions():664 -> a
+    186:186:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    186:186:void insertDebugPositions():660 -> a
     186:186:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    187:199:void insertDebugPositions():665:677 -> a
+    187:199:void insertDebugPositions():661:673 -> a
     187:199:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    200:200:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    200:200:void insertDebugPositions():678 -> a
+    200:200:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    200:200:void insertDebugPositions():674 -> a
     200:200:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    201:201:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
-    201:201:void insertDebugPositions():679 -> a
+    201:201:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
+    201:201:void insertDebugPositions():675 -> a
     201:201:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
-    202:202:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():27:27 -> a
-    202:202:void insertDebugPositions():680 -> a
+    202:202:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():28:28 -> a
+    202:202:void insertDebugPositions():676 -> a
     202:202:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):570 -> a
     203:204:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):573:574 -> a
     205:205:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
     205:205:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):574 -> a
     206:208:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):575:577 -> a
-    209:209:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
+    209:209:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
     209:209:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):577 -> a
     210:215:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):578:583 -> a
-    216:216:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    216:216:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     216:216:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):584 -> a
     217:218:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):591:592 -> a
-    219:249:void joinPredecessorsWithIdenticalPhis():2533:2563 -> a
+    219:249:void joinPredecessorsWithIdenticalPhis():2529:2559 -> a
     219:249:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     250:250:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    250:250:void joinPredecessorsWithIdenticalPhis():2563 -> a
+    250:250:void joinPredecessorsWithIdenticalPhis():2559 -> a
     250:250:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    251:251:void joinPredecessorsWithIdenticalPhis():2563:2563 -> a
+    251:251:void joinPredecessorsWithIdenticalPhis():2559:2559 -> a
     251:251:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    252:266:void joinPredecessorsWithIdenticalPhis():2562:2576 -> a
+    252:266:void joinPredecessorsWithIdenticalPhis():2558:2572 -> a
     252:266:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     267:278:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):506:517 -> a
-    267:278:void joinPredecessorsWithIdenticalPhis():2580 -> a
+    267:278:void joinPredecessorsWithIdenticalPhis():2576 -> a
     267:278:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    279:279:void joinPredecessorsWithIdenticalPhis():2581:2581 -> a
+    279:279:void joinPredecessorsWithIdenticalPhis():2577:2577 -> a
     279:279:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    280:280:void joinPredecessorsWithIdenticalPhis():2539:2539 -> a
+    280:280:void joinPredecessorsWithIdenticalPhis():2535:2535 -> a
     280:280:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     281:281:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    281:281:void joinPredecessorsWithIdenticalPhis():2539 -> a
+    281:281:void joinPredecessorsWithIdenticalPhis():2535 -> a
     281:281:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
-    282:326:void joinPredecessorsWithIdenticalPhis():2539:2583 -> a
+    282:326:void joinPredecessorsWithIdenticalPhis():2535:2579 -> a
     282:326:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):597 -> a
     327:334:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):600:607 -> a
-    335:335:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1089:1089 -> a
+    335:335:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1085:1085 -> a
     335:335:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):610 -> a
     336:344:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):611:619 -> a
     345:345:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     345:345:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
     346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):619:619 -> a
-    347:364:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):616:633 -> a
-    365:365:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1081:1081 -> a
-    365:365:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):633 -> a
-    366:366:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634:634 -> a
-    367:378:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):124:135 -> a
-    367:378:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    367:378:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    379:379:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793:793 -> a
-    379:379:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):135 -> a
-    379:379:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    379:379:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    380:388:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):144:152 -> a
-    380:388:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    380:388:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    389:389:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793:793 -> a
-    389:389:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):152 -> a
-    389:389:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    389:389:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    390:394:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):165:169 -> a
-    390:394:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
-    390:394:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    395:395:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110:110 -> a
-    395:395:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    396:396:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo.builder(com.android.tools.r8.graph.DexItemFactory):268:268 -> a
-    396:396:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):175 -> a
-    396:396:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):111 -> a
-    396:396:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    397:399:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):175:177 -> a
-    397:399:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):111 -> a
-    397:399:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    400:401:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):116:117 -> a
-    400:401:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):634 -> a
-    402:406:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):637:641 -> a
-    407:407:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):646:646 -> a
-    408:408:void resolveAndBuildSwitch(int,int,int):833:833 -> a
-    409:409:void add(com.android.tools.r8.ir.code.Instruction):847:847 -> a
-    410:410:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    410:410:void add(com.android.tools.r8.ir.code.Instruction):848 -> a
-    411:411:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):880:880 -> a
-    412:412:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    412:412:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):882 -> a
-    413:416:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):883:886 -> a
-    417:417:void addBooleanNonThisArgument(int):891:891 -> a
-    418:418:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    418:418:void addBooleanNonThisArgument(int):893 -> a
-    419:422:void addBooleanNonThisArgument(int):894:897 -> a
-    423:424:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):902:903 -> a
-    425:425:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    425:425:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):905 -> a
-    426:426:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):906:906 -> a
-    427:430:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):915:918 -> a
-    431:431:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    431:431:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):920 -> a
-    432:435:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):921:924 -> a
-    436:440:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):962:966 -> a
-    441:441:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():573:573 -> a
-    441:441:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):938 -> a
-    441:441:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):967 -> a
-    442:442:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):938:938 -> a
-    442:442:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):967 -> a
-    443:443:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):968:968 -> a
-    444:450:void addDebugPosition(com.android.tools.r8.ir.code.Position):973:979 -> a
-    451:451:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    451:451:void addDebugPosition(com.android.tools.r8.ir.code.Position):979 -> a
-    452:455:void addDebugPosition(com.android.tools.r8.ir.code.Position):981:984 -> a
-    456:456:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    456:456:void addDebugPosition(com.android.tools.r8.ir.code.Position):984 -> a
-    457:458:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1028:1029 -> a
-    459:479:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):151:171 -> a
-    459:479:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    480:480:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):166:166 -> a
-    480:480:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    481:485:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):160:164 -> a
-    481:485:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    486:486:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):162:162 -> a
-    486:486:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    487:487:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):158:158 -> a
-    487:487:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    488:501:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):156:169 -> a
-    488:501:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1030 -> a
-    502:505:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1031:1034 -> a
-    506:509:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):650:653 -> a
-    506:509:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1035 -> a
-    510:510:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1037:1037 -> a
-    511:515:void addArrayLength(int,int):1041:1045 -> a
-    516:522:void addCheckCast(int,com.android.tools.r8.graph.DexType):1060:1066 -> a
-    523:526:void addConst(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int,long):1079:1082 -> a
-    527:535:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1115:1123 -> a
-    536:540:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1122:1126 -> a
-    541:541:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1116:1116 -> a
-    542:550:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1130:1138 -> a
-    551:555:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1137:1141 -> a
-    556:556:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1131:1131 -> a
-    557:558:void addConstString(int,com.android.tools.r8.graph.DexString):1151:1152 -> a
-    559:559:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1145:1145 -> a
-    559:559:void addConstString(int,com.android.tools.r8.graph.DexString):1153 -> a
-    560:560:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    560:560:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1145 -> a
-    560:560:void addConstString(int,com.android.tools.r8.graph.DexString):1153 -> a
-    561:562:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1146:1147 -> a
-    561:562:void addConstString(int,com.android.tools.r8.graph.DexString):1153 -> a
-    563:563:void addConstString(int,com.android.tools.r8.graph.DexString):1154:1154 -> a
-    564:566:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1159:1161 -> a
-    567:567:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1145:1145 -> a
-    567:567:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1162 -> a
-    568:568:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    568:568:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1145 -> a
-    568:568:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1162 -> a
-    569:570:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1146:1147 -> a
-    569:570:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1162 -> a
-    571:572:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1163:1164 -> a
-    573:575:com.android.tools.r8.ir.code.Monitor addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1191:1193 -> a
-    576:577:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1202:1203 -> a
-    578:578:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    578:578:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1205 -> a
-    579:581:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1206:1208 -> a
-    582:582:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    582:582:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1208 -> a
-    583:583:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1212:1212 -> a
-    584:590:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1309:1315 -> a
-    591:591:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1323:1323 -> a
-    592:595:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1336:1339 -> a
-    592:595:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1321 -> a
-    596:599:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1336:1339 -> a
-    600:604:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1344:1348 -> a
-    605:609:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1346:1350 -> a
-    610:610:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    610:610:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1352 -> a
-    611:613:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1356:1358 -> a
-    614:614:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    614:614:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1360 -> a
-    615:624:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1372:1381 -> a
-    625:645:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1375:1395 -> a
-    646:646:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    646:646:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1395 -> a
-    647:657:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1396:1406 -> a
-    658:662:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1416:1420 -> a
-    663:666:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1419:1422 -> a
-    667:684:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1449:1466 -> a
-    685:689:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1471:1475 -> a
-    690:693:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1474:1477 -> a
-    694:717:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1488:1511 -> a
-    718:734:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1515:1531 -> a
-    735:759:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1552:1576 -> a
-    760:774:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1580:1594 -> a
-    775:775:boolean lambda$addMoveException$1(com.android.tools.r8.ir.code.BasicBlock):1607:1607 -> a
-    776:778:void addNewArrayFilledData(int,int,long,short[]):1679:1681 -> a
-    779:779:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    779:779:void addNewArrayFilledData(int,int,long,short[]):1683 -> a
-    780:780:void addReturn():1708:1708 -> a
-    781:783:void addReturn(com.android.tools.r8.ir.code.Return):1713:1715 -> a
-    781:783:void addReturn():1708 -> a
-    784:787:void addStaticGet(int,com.android.tools.r8.graph.DexField):1719:1722 -> a
-    788:793:void addStaticGet(int,com.android.tools.r8.graph.DexField):1720:1725 -> a
-    794:794:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    794:794:void addStaticGet(int,com.android.tools.r8.graph.DexField):1726 -> a
-    795:838:void addSwitch(int,int[],int,int[]):1758:1801 -> a
+    347:360:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):616:629 -> a
+    361:361:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1076:1076 -> a
+    361:361:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):629 -> a
+    362:362:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630:630 -> a
+    363:374:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):124:135 -> a
+    363:374:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    363:374:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    375:375:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793:793 -> a
+    375:375:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):135 -> a
+    375:375:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    375:375:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    376:384:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):144:152 -> a
+    376:384:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    376:384:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    385:385:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):793:793 -> a
+    385:385:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):152 -> a
+    385:385:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    385:385:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    386:390:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):165:169 -> a
+    386:390:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):107 -> a
+    386:390:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    391:391:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110:110 -> a
+    391:391:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    392:392:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo.builder(com.android.tools.r8.graph.DexItemFactory):268:268 -> a
+    392:392:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):175 -> a
+    392:392:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):111 -> a
+    392:392:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    393:395:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.convertRewritingCandidateToStringSwitchInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory):175:177 -> a
+    393:395:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):111 -> a
+    393:395:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    396:397:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):116:117 -> a
+    396:397:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):630 -> a
+    398:402:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.DexEncodedMethod):633:637 -> a
+    403:403:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):642:642 -> a
+    404:404:void resolveAndBuildSwitch(int,int,int):829:829 -> a
+    405:405:void add(com.android.tools.r8.ir.code.Instruction):843:843 -> a
+    406:406:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    406:406:void add(com.android.tools.r8.ir.code.Instruction):844 -> a
+    407:407:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):876:876 -> a
+    408:408:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    408:408:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):878 -> a
+    409:412:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):879:882 -> a
+    413:413:void addBooleanNonThisArgument(int):887:887 -> a
+    414:414:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    414:414:void addBooleanNonThisArgument(int):889 -> a
+    415:418:void addBooleanNonThisArgument(int):890:893 -> a
+    419:420:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):898:899 -> a
+    421:421:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    421:421:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):901 -> a
+    422:422:void addNonThisArgument(com.android.tools.r8.ir.code.Argument):902:902 -> a
+    423:426:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):911:914 -> a
+    427:427:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    427:427:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):916 -> a
+    428:431:void handleConstantOrUnusedArgument(int,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo):917:920 -> a
+    432:436:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):958:962 -> a
+    437:437:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():579:579 -> a
+    437:437:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):934 -> a
+    437:437:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):963 -> a
+    438:438:boolean isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):934:934 -> a
+    438:438:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):963 -> a
+    439:439:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):964:964 -> a
+    440:446:void addDebugPosition(com.android.tools.r8.ir.code.Position):969:975 -> a
+    447:447:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    447:447:void addDebugPosition(com.android.tools.r8.ir.code.Position):975 -> a
+    448:451:void addDebugPosition(com.android.tools.r8.ir.code.Position):977:980 -> a
+    452:452:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    452:452:void addDebugPosition(com.android.tools.r8.ir.code.Position):980 -> a
+    453:454:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1024:1025 -> a
+    455:475:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):151:171 -> a
+    455:475:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    476:476:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):166:166 -> a
+    476:476:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    477:481:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):160:164 -> a
+    477:481:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    482:482:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):162:162 -> a
+    482:482:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    483:483:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):158:158 -> a
+    483:483:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    484:497:com.android.tools.r8.ir.analysis.type.TypeLatticeElement fromMemberType(com.android.tools.r8.ir.code.MemberType):156:169 -> a
+    484:497:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1026 -> a
+    498:501:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1027:1030 -> a
+    502:505:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):646:649 -> a
+    502:505:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1031 -> a
+    506:506:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1033:1033 -> a
+    507:511:void addArrayLength(int,int):1037:1041 -> a
+    512:518:void addCheckCast(int,com.android.tools.r8.graph.DexType):1056:1062 -> a
+    519:522:void addConst(com.android.tools.r8.ir.analysis.type.TypeLatticeElement,int,long):1075:1078 -> a
+    523:531:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1111:1119 -> a
+    532:536:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1118:1122 -> a
+    537:537:void addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1112:1112 -> a
+    538:546:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1126:1134 -> a
+    547:551:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1133:1137 -> a
+    552:552:void addConstMethodType(int,com.android.tools.r8.graph.DexProto):1127:1127 -> a
+    553:554:void addConstString(int,com.android.tools.r8.graph.DexString):1147:1148 -> a
+    555:555:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141:1141 -> a
+    555:555:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
+    556:556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    556:556:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
+    556:556:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
+    557:558:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
+    557:558:void addConstString(int,com.android.tools.r8.graph.DexString):1149 -> a
+    559:559:void addConstString(int,com.android.tools.r8.graph.DexString):1150:1150 -> a
+    560:562:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1155:1157 -> a
+    563:563:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141:1141 -> a
+    563:563:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
+    564:564:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    564:564:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1141 -> a
+    564:564:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
+    565:566:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfoForConstStrings():1142:1143 -> a
+    565:566:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1158 -> a
+    567:568:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1159:1160 -> a
+    569:571:com.android.tools.r8.ir.code.Monitor addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1187:1189 -> a
+    572:573:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1198:1199 -> a
+    574:574:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    574:574:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1201 -> a
+    575:577:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1202:1204 -> a
+    578:578:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    578:578:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1204 -> a
+    579:579:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1208:1208 -> a
+    580:586:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1305:1311 -> a
+    587:587:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1319:1319 -> a
+    588:591:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1332:1335 -> a
+    588:591:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1317 -> a
+    592:595:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1332:1335 -> a
+    596:600:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1340:1344 -> a
+    601:606:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1342:1347 -> a
+    607:607:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    607:607:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1348 -> a
+    608:611:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1352:1355 -> a
+    612:612:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    612:612:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1356 -> a
+    613:622:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1368:1377 -> a
+    623:643:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1371:1391 -> a
+    644:644:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    644:644:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1391 -> a
+    645:655:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,boolean):1392:1402 -> a
+    656:660:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1412:1416 -> a
+    661:664:void addInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,java.util.List,java.util.List,boolean):1415:1418 -> a
+    665:682:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1445:1462 -> a
+    683:687:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1467:1471 -> a
+    688:691:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1470:1473 -> a
+    692:715:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1484:1507 -> a
+    716:732:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1511:1527 -> a
+    733:757:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1548:1572 -> a
+    758:772:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1576:1590 -> a
+    773:773:boolean lambda$addMoveException$1(com.android.tools.r8.ir.code.BasicBlock):1603:1603 -> a
+    774:777:void addNewArrayFilledData(int,int,long,short[]):1675:1678 -> a
+    778:778:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    778:778:void addNewArrayFilledData(int,int,long,short[]):1679 -> a
+    779:779:void addReturn():1704:1704 -> a
+    780:782:void addReturn(com.android.tools.r8.ir.code.Return):1709:1711 -> a
+    780:782:void addReturn():1704 -> a
+    783:786:void addStaticGet(int,com.android.tools.r8.graph.DexField):1715:1718 -> a
+    787:792:void addStaticGet(int,com.android.tools.r8.graph.DexField):1716:1721 -> a
+    793:793:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    793:793:void addStaticGet(int,com.android.tools.r8.graph.DexField):1722 -> a
+    794:837:void addSwitch(int,int[],int,int[]):1754:1797 -> a
+    838:838:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
+    838:838:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
+    838:838:void addSwitch(int,int[],int,int[]):1802 -> a
     839:839:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
     839:839:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    839:839:void addSwitch(int,int[],int,int[]):1806 -> a
-    840:840:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
-    840:840:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    840:840:void addSwitch(int,int[],int,int[]):1807 -> a
-    841:845:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1814:1818 -> a
-    841:845:void addSwitch(int,int[],int,int[]):1808 -> a
-    846:846:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> a
-    846:846:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1820 -> a
-    846:846:void addSwitch(int,int[],int,int[]):1808 -> a
-    847:870:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1821:1844 -> a
-    847:870:void addSwitch(int,int[],int,int[]):1808 -> a
-    871:871:void addSwitch(int,int[],int,int[]):1809:1809 -> a
-    872:873:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014:2015 -> a
-    874:893:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2030:2049 -> a
-    874:893:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    894:894:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095:2095 -> a
-    894:894:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    894:894:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    895:895:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
-    895:895:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
-    895:895:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    895:895:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    896:896:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095:2095 -> a
-    896:896:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    896:896:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    897:897:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
-    897:897:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
-    897:897:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    897:897:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    898:898:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
-    898:898:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2097 -> a
-    898:898:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    898:898:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    899:899:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2098:2098 -> a
-    899:899:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    899:899:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    900:910:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():161:171 -> a
-    900:910:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
-    900:910:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    900:910:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    911:911:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():167:167 -> a
-    911:911:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
-    911:911:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    911:911:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    912:912:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():165:165 -> a
-    912:912:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
-    912:912:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    912:912:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    913:913:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():163:163 -> a
-    913:913:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2099 -> a
-    913:913:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    913:913:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    914:932:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2100:2118 -> a
-    914:932:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    914:932:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    933:933:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
-    933:933:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2097 -> a
-    933:933:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2054 -> a
-    933:933:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    934:936:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2086:2088 -> a
-    934:936:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2056 -> a
-    934:936:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    937:961:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2057:2081 -> a
-    937:961:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2018 -> a
-    962:962:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    962:962:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):989 -> a
-    963:963:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    963:963:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):990 -> a
-    964:964:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):991:991 -> a
-    965:965:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> a
-    965:965:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):991 -> a
-    966:967:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):992:993 -> a
-    968:968:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    968:968:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):994 -> a
-    969:969:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    969:969:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1070 -> a
-    970:970:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    970:970:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1071 -> a
-    971:974:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1072:1075 -> a
-    975:975:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    975:975:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1970 -> a
-    976:976:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1971:1971 -> a
-    977:977:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> a
-    977:977:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1971 -> a
-    978:979:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1972:1973 -> a
-    980:980:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    980:980:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1974 -> a
-    981:981:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> a
-    981:981:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1646 -> a
-    982:982:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1647:1647 -> a
-    983:983:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> a
-    983:983:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1647 -> a
-    984:985:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1648:1649 -> a
-    986:986:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    986:986:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1650 -> a
-    987:990:com.android.tools.r8.ir.code.Value readIntLiteral(long):2143:2146 -> a
-    991:993:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2153:2155 -> a
-    994:994:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2182:2182 -> a
-    994:994:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1980 -> a
-    995:999:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1981:1985 -> a
-    1000:1000:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():573:573 -> a
-    1000:1000:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1985 -> a
-    1001:1011:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1986:1996 -> a
-    1012:1016:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1994:1998 -> a
-    1017:1017:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2182:2182 -> a
-    1017:1017:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2160 -> a
-    1018:1018:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> a
-    1018:1018:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2161 -> a
-    1019:1020:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2173:2174 -> a
-    1021:1021:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256:2256 -> a
-    1022:1024:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2288:2290 -> a
-    1022:1024:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256 -> a
-    1025:1031:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2288:2294 -> a
-    1025:1031:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256 -> a
-    1032:1032:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2291:2291 -> a
-    1032:1032:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2256 -> a
-    1033:1058:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2257:2282 -> a
-    1059:1063:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2271:2275 -> a
-    1064:1070:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2273:2279 -> a
-    1071:1071:boolean isOffsetProcessed(int):2357:2357 -> a
-    1071:1071:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2350 -> a
-    1071:1071:void ensureSuccessorBlock(int,int,boolean):2386 -> a
-    1072:1074:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2351:2353 -> a
-    1072:1074:void ensureSuccessorBlock(int,int,boolean):2386 -> a
-    1075:1078:int getBlockStartOffset(int):2341:2344 -> a
-    1075:1078:void ensureSuccessorBlock(int,int,boolean):2387 -> a
-    1079:1079:void ensureSuccessorBlock(int,int,boolean):2388:2388 -> a
-    1080:1080:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):280:280 -> a
-    1080:1080:void ensureSuccessorBlock(int,int,boolean):2390 -> a
-    1081:1081:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):276:276 -> a
-    1081:1081:void ensureSuccessorBlock(int,int,boolean):2391 -> a
-    1082:1082:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):293:293 -> a
-    1082:1082:void ensureSuccessorBlock(int,int,boolean):2393 -> a
-    1083:1083:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> a
-    1083:1083:void ensureSuccessorBlock(int,int,boolean):2394 -> a
-    1084:1084:void ensureSuccessorBlock(int,int,boolean):2396:2396 -> a
-    1085:1085:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> a
-    1085:1085:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1280 -> a
-    1086:1086:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> a
-    1086:1086:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1281 -> a
-    1087:1092:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1282:1287 -> a
-    1093:1096:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435:2438 -> a
-    1097:1097:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2437:2437 -> a
-    1098:1100:void generateSplitEdgeBlocks():2452:2454 -> a
-    1098:1100:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1101:1101:int getOffset(com.android.tools.r8.ir.code.BasicBlock):2422:2422 -> a
-    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2414 -> a
-    1101:1101:void generateSplitEdgeBlocks():2454 -> a
-    1101:1101:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1102:1102:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2410:2410 -> a
-    1102:1102:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2414 -> a
-    1102:1102:void generateSplitEdgeBlocks():2454 -> a
-    1102:1102:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1103:1103:void generateSplitEdgeBlocks():2455:2455 -> a
-    1103:1103:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1104:1105:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():308:309 -> a
-    1104:1105:void generateSplitEdgeBlocks():2456 -> a
-    1104:1105:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1106:1106:void generateSplitEdgeBlocks():2459:2459 -> a
-    1106:1106:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1107:1107:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2410:2410 -> a
-    1107:1107:void generateSplitEdgeBlocks():2460 -> a
-    1107:1107:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1108:1108:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():297:297 -> a
-    1108:1108:void generateSplitEdgeBlocks():2461 -> a
-    1108:1108:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1109:1119:void generateSplitEdgeBlocks():2464:2474 -> a
-    1109:1119:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1120:1128:void generateSplitEdgeBlocks():2471:2479 -> a
-    1120:1128:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1129:1134:com.android.tools.r8.ir.code.BasicBlock createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2495:2500 -> a
-    1129:1134:void generateSplitEdgeBlocks():2479 -> a
-    1129:1134:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1135:1145:void generateSplitEdgeBlocks():2480:2490 -> a
-    1135:1145:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1146:1148:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():301:303 -> a
-    1146:1148:void generateSplitEdgeBlocks():2490 -> a
-    1146:1148:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1149:1149:void generateSplitEdgeBlocks():2490:2490 -> a
-    1149:1149:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2439 -> a
-    1150:1150:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> a
-    1150:1150:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2440 -> a
-    1151:1151:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2441:2441 -> a
-    1152:1152:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2589:2589 -> a
-    1:2:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):870:871 -> b
-    3:3:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2186:2186 -> b
-    3:3:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):872 -> b
-    4:5:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):873:874 -> b
-    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    6:6:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):874 -> b
-    7:8:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):875:876 -> b
-    9:9:void addConstantOrUnusedArgument(int):910:910 -> b
-    10:12:void flushArgumentInstructions():929:931 -> b
-    13:26:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):942:955 -> b
-    27:29:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):954:956 -> b
-    30:30:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    30:30:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):957 -> b
-    31:31:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):998:998 -> b
-    32:32:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> b
-    32:32:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):999 -> b
-    33:34:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1000:1001 -> b
-    35:35:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> b
-    35:35:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1001 -> b
-    36:37:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1002:1003 -> b
-    38:38:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    38:38:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1004 -> b
-    39:43:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1049:1053 -> b
-    44:47:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):650:653 -> b
-    44:47:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1054 -> b
-    48:48:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1056:1056 -> b
-    49:54:void addConstClass(int,com.android.tools.r8.graph.DexType):1106:1111 -> b
-    55:58:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1364:1367 -> b
-    59:59:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1535:1535 -> b
-    60:60:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> b
-    60:60:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1535 -> b
-    61:67:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1535:1541 -> b
-    68:73:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1668:1673 -> b
-    74:74:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    74:74:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1675 -> b
-    75:78:void addStaticPut(int,com.android.tools.r8.graph.DexField):1730:1733 -> b
-    79:79:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> b
-    79:79:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1654 -> b
-    80:80:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1655:1655 -> b
-    81:81:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> b
-    81:81:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1655 -> b
-    82:85:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1657:1660 -> b
-    86:89:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2127:2130 -> b
-    86:89:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1660 -> b
-    90:93:com.android.tools.r8.ir.code.Value readLongLiteral(long):2136:2139 -> b
-    90:93:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2131 -> b
-    90:93:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1660 -> b
-    94:96:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1661:1663 -> b
-    97:97:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    97:97:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1664 -> b
-    98:98:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> b
-    99:99:void ensureExceptionalSuccessorBlock(int,int):2404:2404 -> b
-    100:100:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2593:2593 -> b
+    839:839:void addSwitch(int,int[],int,int[]):1803 -> a
+    840:844:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1810:1814 -> a
+    840:844:void addSwitch(int,int[],int,int[]):1804 -> a
+    845:845:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
+    845:845:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1816 -> a
+    845:845:void addSwitch(int,int[],int,int[]):1804 -> a
+    846:869:com.android.tools.r8.ir.code.IntSwitch createSwitch(com.android.tools.r8.ir.code.Value,int[],int,int[]):1817:1840 -> a
+    846:869:void addSwitch(int,int[],int,int[]):1804 -> a
+    870:870:void addSwitch(int,int[],int,int[]):1805:1805 -> a
+    871:872:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2010:2011 -> a
+    873:892:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2026:2045 -> a
+    873:892:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    893:893:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2091:2091 -> a
+    893:893:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    893:893:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    894:894:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
+    894:894:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2091 -> a
+    894:894:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    894:894:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    895:895:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2091:2091 -> a
+    895:895:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    895:895:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    896:896:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
+    896:896:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2091 -> a
+    896:896:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    896:896:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    897:897:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
+    897:897:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2093 -> a
+    897:897:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    897:897:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    898:898:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2094:2094 -> a
+    898:898:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    898:898:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    899:909:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():161:171 -> a
+    899:909:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
+    899:909:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    899:909:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    910:910:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():167:167 -> a
+    910:910:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
+    910:910:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    910:910:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    911:911:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():165:165 -> a
+    911:911:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
+    911:911:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    911:911:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    912:912:com.android.tools.r8.ir.analysis.type.PrimitiveTypeLatticeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveTypeLattice():163:163 -> a
+    912:912:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2095 -> a
+    912:912:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    912:912:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    913:931:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2096:2114 -> a
+    913:931:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    913:931:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    932:932:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
+    932:932:com.android.tools.r8.ir.code.Value getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2093 -> a
+    932:932:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2050 -> a
+    932:932:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    933:935:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2082:2084 -> a
+    933:935:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2052 -> a
+    933:935:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    936:960:com.android.tools.r8.ir.code.Value readRegisterRecursive(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.Phi$RegisterReadType):2053:2077 -> a
+    936:960:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock$EdgeType,com.android.tools.r8.ir.code.Phi$RegisterReadType):2014 -> a
+    961:961:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    961:961:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):985 -> a
+    962:962:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    962:962:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):986 -> a
+    963:963:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):987:987 -> a
+    964:964:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
+    964:964:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):987 -> a
+    965:966:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):988:989 -> a
+    967:967:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    967:967:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):990 -> a
+    968:968:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    968:968:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1066 -> a
+    969:969:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    969:969:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1067 -> a
+    970:973:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1068:1071 -> a
+    974:974:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    974:974:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1966 -> a
+    975:975:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967:1967 -> a
+    976:976:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
+    976:976:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1967 -> a
+    977:978:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1968:1969 -> a
+    979:979:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    979:979:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):1970 -> a
+    980:980:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> a
+    980:980:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1642 -> a
+    981:981:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643:1643 -> a
+    982:982:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> a
+    982:982:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1643 -> a
+    983:984:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1644:1645 -> a
+    985:985:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    985:985:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1646 -> a
+    986:989:com.android.tools.r8.ir.code.Value readIntLiteral(long):2139:2142 -> a
+    990:992:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo,com.android.tools.r8.graph.DebugLocalInfo):2149:2151 -> a
+    993:993:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
+    993:993:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1976 -> a
+    994:998:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1977:1981 -> a
+    999:999:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():579:579 -> a
+    999:999:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1981 -> a
+    1000:1010:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1982:1992 -> a
+    1011:1015:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):1990:1994 -> a
+    1016:1016:com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int):2178:2178 -> a
+    1016:1016:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2156 -> a
+    1017:1017:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> a
+    1017:1017:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2157 -> a
+    1018:1019:com.android.tools.r8.ir.code.Value writeRegister(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2169:2170 -> a
+    1020:1020:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252:2252 -> a
+    1021:1023:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2286 -> a
+    1021:1023:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1024:1030:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2284:2290 -> a
+    1024:1030:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1031:1031:boolean verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2287:2287 -> a
+    1031:1031:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2252 -> a
+    1032:1057:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2253:2278 -> a
+    1058:1062:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2267:2271 -> a
+    1063:1069:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2269:2275 -> a
+    1070:1070:boolean isOffsetProcessed(int):2353:2353 -> a
+    1070:1070:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2346 -> a
+    1070:1070:void ensureSuccessorBlock(int,int,boolean):2382 -> a
+    1071:1073:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlock(int):2347:2349 -> a
+    1071:1073:void ensureSuccessorBlock(int,int,boolean):2382 -> a
+    1074:1077:int getBlockStartOffset(int):2337:2340 -> a
+    1074:1077:void ensureSuccessorBlock(int,int,boolean):2383 -> a
+    1078:1078:void ensureSuccessorBlock(int,int,boolean):2384:2384 -> a
+    1079:1079:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):280:280 -> a
+    1079:1079:void ensureSuccessorBlock(int,int,boolean):2386 -> a
+    1080:1080:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):276:276 -> a
+    1080:1080:void ensureSuccessorBlock(int,int,boolean):2387 -> a
+    1081:1081:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):293:293 -> a
+    1081:1081:void ensureSuccessorBlock(int,int,boolean):2389 -> a
+    1082:1082:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> a
+    1082:1082:void ensureSuccessorBlock(int,int,boolean):2390 -> a
+    1083:1083:void ensureSuccessorBlock(int,int,boolean):2392:2392 -> a
+    1084:1084:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
+    1084:1084:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1276 -> a
+    1085:1085:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> a
+    1085:1085:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1277 -> a
+    1086:1091:void addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1278:1283 -> a
+    1092:1095:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2431:2434 -> a
+    1096:1096:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2433:2433 -> a
+    1097:1099:void generateSplitEdgeBlocks():2448:2450 -> a
+    1097:1099:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1100:1100:int getOffset(com.android.tools.r8.ir.code.BasicBlock):2418:2418 -> a
+    1100:1100:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
+    1100:1100:void generateSplitEdgeBlocks():2450 -> a
+    1100:1100:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
+    1101:1101:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2410 -> a
+    1101:1101:void generateSplitEdgeBlocks():2450 -> a
+    1101:1101:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1102:1102:void generateSplitEdgeBlocks():2451:2451 -> a
+    1102:1102:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1103:1104:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():308:309 -> a
+    1103:1104:void generateSplitEdgeBlocks():2452 -> a
+    1103:1104:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1105:1105:void generateSplitEdgeBlocks():2455:2455 -> a
+    1105:1105:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1106:1106:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo getBlockInfo(int):2406:2406 -> a
+    1106:1106:void generateSplitEdgeBlocks():2456 -> a
+    1106:1106:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1107:1107:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():297:297 -> a
+    1107:1107:void generateSplitEdgeBlocks():2457 -> a
+    1107:1107:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1108:1118:void generateSplitEdgeBlocks():2460:2470 -> a
+    1108:1118:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1119:1127:void generateSplitEdgeBlocks():2467:2475 -> a
+    1119:1127:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1128:1133:com.android.tools.r8.ir.code.BasicBlock createSplitEdgeBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2491:2496 -> a
+    1128:1133:void generateSplitEdgeBlocks():2475 -> a
+    1128:1133:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1134:1144:void generateSplitEdgeBlocks():2476:2486 -> a
+    1134:1144:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1145:1147:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():301:303 -> a
+    1145:1147:void generateSplitEdgeBlocks():2486 -> a
+    1145:1147:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1148:1148:void generateSplitEdgeBlocks():2486:2486 -> a
+    1148:1148:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2435 -> a
+    1149:1149:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> a
+    1149:1149:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2436 -> a
+    1150:1150:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2437:2437 -> a
+    1151:1151:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2585:2585 -> a
+    1:2:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):866:867 -> b
+    3:3:com.android.tools.r8.graph.DebugLocalInfo getOutgoingLocal(int):2182:2182 -> b
+    3:3:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):868 -> b
+    4:5:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):869:870 -> b
+    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    6:6:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):870 -> b
+    7:8:void addThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):871:872 -> b
+    9:9:void addConstantOrUnusedArgument(int):906:906 -> b
+    10:12:void flushArgumentInstructions():925:927 -> b
+    13:26:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):938:951 -> b
+    27:29:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):950:952 -> b
+    30:30:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    30:30:void addDebugLocalStart(int,com.android.tools.r8.graph.DebugLocalInfo):953 -> b
+    31:31:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):994:994 -> b
+    32:32:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> b
+    32:32:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):995 -> b
+    33:34:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):996:997 -> b
+    35:35:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> b
+    35:35:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):997 -> b
+    36:37:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):998:999 -> b
+    38:38:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    38:38:void addAddLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1000 -> b
+    39:43:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1045:1049 -> b
+    44:47:void addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):646:649 -> b
+    44:47:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1050 -> b
+    48:48:void addArrayPut(com.android.tools.r8.ir.code.MemberType,int,int,int):1052:1052 -> b
+    49:54:void addConstClass(int,com.android.tools.r8.graph.DexType):1102:1107 -> b
+    55:58:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1360:1363 -> b
+    59:59:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1531 -> b
+    60:60:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    60:60:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531 -> b
+    61:67:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1531:1537 -> b
+    68:74:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1664:1670 -> b
+    75:75:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    75:75:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1671 -> b
+    76:79:void addStaticPut(int,com.android.tools.r8.graph.DexField):1726:1729 -> b
+    80:80:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> b
+    80:80:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1650 -> b
+    81:81:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651:1651 -> b
+    82:82:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> b
+    82:82:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1651 -> b
+    83:86:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1653:1656 -> b
+    87:90:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2123:2126 -> b
+    87:90:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
+    91:94:com.android.tools.r8.ir.code.Value readLongLiteral(long):2132:2135 -> b
+    91:94:com.android.tools.r8.ir.code.Value readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2127 -> b
+    91:94:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1656 -> b
+    95:97:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1657:1659 -> b
+    98:98:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    98:98:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1660 -> b
+    99:99:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> b
+    100:100:void ensureExceptionalSuccessorBlock(int,int):2400:2400 -> b
+    101:101:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2589:2589 -> b
     1:2:java.util.List getArgumentValues():482:483 -> c
-    3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1008:1008 -> c
-    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> c
-    4:4:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1009 -> c
-    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> c
-    5:5:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1010 -> c
-    6:6:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1011:1011 -> c
-    7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> c
-    7:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1011 -> c
-    8:9:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1012:1013 -> c
-    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> c
-    10:10:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1014 -> c
-    11:14:void addNewInstance(int,com.android.tools.r8.graph.DexType):1688:1691 -> c
-    15:15:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> c
-    15:15:void addNewInstance(int,com.android.tools.r8.graph.DexType):1692 -> c
-    16:18:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2003:2005 -> c
-    19:36:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2299:2316 -> c
-    37:37:void ensureNormalSuccessorBlock(int,int):2400:2400 -> c
-    38:38:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> c
-    38:38:void addGoto(int):1258 -> c
-    39:42:void addGoto(int):1259:1262 -> c
+    3:3:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1004:1004 -> c
+    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> c
+    4:4:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1005 -> c
+    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> c
+    5:5:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1006 -> c
+    6:6:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1007:1007 -> c
+    7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> c
+    7:7:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1007 -> c
+    8:9:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1008:1009 -> c
+    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
+    10:10:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1010 -> c
+    11:14:void addNewInstance(int,com.android.tools.r8.graph.DexType):1684:1687 -> c
+    15:15:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> c
+    15:15:void addNewInstance(int,com.android.tools.r8.graph.DexType):1688 -> c
+    16:18:com.android.tools.r8.ir.code.Value readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):1999:2001 -> c
+    19:36:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2295:2312 -> c
+    37:37:void ensureNormalSuccessorBlock(int,int):2396:2396 -> c
+    38:38:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> c
+    38:38:void addGoto(int):1254 -> c
+    39:42:void addGoto(int):1255:1258 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getCFG():478:478 -> d
     2:2:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):576:576 -> d
-    3:3:void resolveAndBuildNewArrayFilledData(int,int):838:838 -> d
-    4:4:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1018:1018 -> d
-    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> d
-    5:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1019 -> d
-    6:7:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1020:1021 -> d
-    8:8:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> d
-    8:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1021 -> d
-    9:10:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1022:1023 -> d
-    11:11:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> d
-    11:11:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1024 -> d
-    12:17:void addMoveException(int):1606:1611 -> d
-    18:23:boolean verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1615:1620 -> d
-    18:23:void addMoveException(int):1611 -> d
+    3:3:void resolveAndBuildNewArrayFilledData(int,int):834:834 -> d
+    4:4:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1014:1014 -> d
+    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> d
+    5:5:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1015 -> d
+    6:7:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1016:1017 -> d
+    8:8:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> d
+    8:8:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1017 -> d
+    9:10:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1018:1019 -> d
+    11:11:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> d
+    11:11:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1020 -> d
+    12:17:void addMoveException(int):1602:1607 -> d
+    18:23:boolean verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1611:1616 -> d
+    18:23:void addMoveException(int):1607 -> d
     1:1:com.android.tools.r8.ir.code.Value getReceiverValue():487:487 -> e
-    2:2:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1168:1168 -> e
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> e
-    3:3:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1169 -> e
-    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> e
-    4:4:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1170 -> e
-    5:5:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1172:1172 -> e
-    6:6:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> e
-    6:6:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1171 -> e
-    7:9:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1173:1175 -> e
-    10:10:void addTrivialIf(int,int):1266:1266 -> e
-    11:11:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> e
-    11:11:void addTrivialIf(int,int):1270 -> e
-    12:15:void addTrivialIf(int,int):1273:1276 -> e
-    16:24:void addMoveResult(int):1626:1634 -> e
-    25:34:void addMoveResult(int):1633:1642 -> e
+    2:2:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1164:1164 -> e
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> e
+    3:3:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1165 -> e
+    4:4:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> e
+    4:4:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1166 -> e
+    5:5:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1168:1168 -> e
+    6:6:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> e
+    6:6:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1167 -> e
+    7:9:void addDiv(com.android.tools.r8.ir.code.NumericType,int,int,int):1169:1171 -> e
+    10:10:void addTrivialIf(int,int):1262:1262 -> e
+    11:11:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> e
+    11:11:void addTrivialIf(int,int):1266 -> e
+    12:15:void addTrivialIf(int,int):1269:1272 -> e
+    16:24:void addMoveResult(int):1622:1630 -> e
+    25:34:void addMoveResult(int):1629:1638 -> e
     1:1:boolean isDebugMode():474:474 -> f
-    2:2:void addNullConst(int):1102:1102 -> f
-    3:4:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1179:1180 -> f
-    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> f
-    5:5:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1181 -> f
-    6:8:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1182:1184 -> f
-    9:9:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> f
-    9:9:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1183 -> f
-    10:12:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1185:1187 -> f
-    13:13:void checkInvokeArgumentRegisters(int,int):1599:1599 -> f
+    2:2:void addNullConst(int):1098:1098 -> f
+    3:4:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1175:1176 -> f
+    5:5:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> f
+    5:5:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1177 -> f
+    6:8:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1178:1180 -> f
+    9:9:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> f
+    9:9:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1179 -> f
+    10:12:void addDivLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1181:1183 -> f
+    13:13:void checkInvokeArgumentRegisters(int,int):1595:1595 -> f
     14:14:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> f
-    14:14:void checkInvokeArgumentRegisters(int,int):1599 -> f
-    15:15:void checkInvokeArgumentRegisters(int,int):1599:1599 -> f
-    1:8:void addReturn(int):1696:1703 -> g
-    9:11:void addReturn(com.android.tools.r8.ir.code.Return):1713:1715 -> g
-    9:11:void addReturn(int):1703 -> g
-    12:12:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> g
-    12:12:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1216 -> g
-    13:13:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> g
-    13:13:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1217 -> g
-    14:14:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1218:1218 -> g
-    15:15:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> g
-    15:15:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1218 -> g
-    16:17:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1219:1220 -> g
-    18:18:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> g
-    18:18:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1221 -> g
-    19:20:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2426:2427 -> g
+    14:14:void checkInvokeArgumentRegisters(int,int):1595 -> f
+    15:15:void checkInvokeArgumentRegisters(int,int):1595:1595 -> f
+    1:8:void addReturn(int):1692:1699 -> g
+    9:11:void addReturn(com.android.tools.r8.ir.code.Return):1709:1711 -> g
+    9:11:void addReturn(int):1699 -> g
+    12:12:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> g
+    12:12:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1212 -> g
+    13:13:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> g
+    13:13:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1213 -> g
+    14:14:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1214:1214 -> g
+    15:15:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> g
+    15:15:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1214 -> g
+    16:17:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1215:1216 -> g
+    18:18:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> g
+    18:18:void addMul(com.android.tools.r8.ir.code.NumericType,int,int,int):1217 -> g
+    19:20:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2422:2423 -> g
     21:21:void setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):498:498 -> g
-    21:21:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2428 -> g
-    22:24:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2429:2431 -> g
-    1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo getRemovedArgumentInfo():852:857 -> h
-    7:11:void addThisArgument(int):862:866 -> h
-    12:12:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1225:1225 -> h
-    13:13:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> h
-    13:13:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1226 -> h
-    14:15:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1227:1228 -> h
-    16:16:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> h
-    16:16:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1228 -> h
-    17:18:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1229:1230 -> h
-    19:19:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> h
-    19:19:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1231 -> h
-    1:5:void addThrow(int):1848:1852 -> i
-    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> i
-    6:6:void addThrow(int):1852 -> i
-    7:7:void addThrow(int):1853:1853 -> i
-    8:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1857:1857 -> i
-    9:9:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> i
-    9:9:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1858 -> i
-    10:10:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> i
-    10:10:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1859 -> i
-    11:11:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1860:1860 -> i
-    12:12:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> i
-    12:12:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1860 -> i
-    13:14:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1861:1862 -> i
-    15:15:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> i
-    15:15:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1863 -> i
-    1:1:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1867:1867 -> j
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> j
-    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1868 -> j
-    3:4:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1869:1870 -> j
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> j
-    5:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1870 -> j
-    6:7:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1871:1872 -> j
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> j
-    8:8:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1873 -> j
-    9:10:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2323:2324 -> j
-    11:11:boolean isOffsetProcessed(int):2357:2357 -> j
-    11:11:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2327 -> j
-    12:15:int getBlockStartOffset(int):2341:2344 -> j
-    12:15:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2328 -> j
-    16:17:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2329:2330 -> j
+    21:21:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2424 -> g
+    22:24:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2425:2427 -> g
+    1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo getRemovedArgumentInfo():848:853 -> h
+    7:11:void addThisArgument(int):858:862 -> h
+    12:12:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1221:1221 -> h
+    13:13:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> h
+    13:13:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1222 -> h
+    14:15:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1223:1224 -> h
+    16:16:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> h
+    16:16:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1224 -> h
+    17:18:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1225:1226 -> h
+    19:19:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> h
+    19:19:void addMulLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1227 -> h
+    1:5:void addThrow(int):1844:1848 -> i
+    6:6:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> i
+    6:6:void addThrow(int):1848 -> i
+    7:7:void addThrow(int):1849:1849 -> i
+    8:8:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1853:1853 -> i
+    9:9:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> i
+    9:9:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1854 -> i
+    10:10:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> i
+    10:10:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1855 -> i
+    11:11:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1856:1856 -> i
+    12:12:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> i
+    12:12:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1856 -> i
+    13:14:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1857:1858 -> i
+    15:15:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> i
+    15:15:void addOr(com.android.tools.r8.ir.code.NumericType,int,int,int):1859 -> i
+    1:1:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1863:1863 -> j
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> j
+    2:2:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1864 -> j
+    3:4:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1865:1866 -> j
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> j
+    5:5:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1866 -> j
+    6:7:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1867:1868 -> j
+    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> j
+    8:8:void addOrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1869 -> j
+    9:10:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2319:2320 -> j
+    11:11:boolean isOffsetProcessed(int):2353:2353 -> j
+    11:11:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2323 -> j
+    12:15:int getBlockStartOffset(int):2337:2340 -> j
+    12:15:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2324 -> j
+    16:17:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2325:2326 -> j
     18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:315 -> j
-    18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    18:19:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     20:21:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
     20:21:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315 -> j
-    20:21:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    20:21:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     22:27:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):315:320 -> j
-    22:27:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    22:27:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     28:29:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.replaceNormalPredecessor(int,int):284:285 -> j
     28:29:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):321 -> j
-    28:29:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    28:29:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     30:31:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):323:324 -> j
-    30:31:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    30:31:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     32:33:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(java.util.Collection):87:88 -> j
     32:33:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324 -> j
-    32:33:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    32:33:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     34:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):324:328 -> j
-    34:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    34:38:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     39:39:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):289:289 -> j
     39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):329 -> j
-    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    39:39:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
-    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    40:40:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     41:42:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):76:77 -> j
     41:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331 -> j
-    41:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    41:42:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):331:331 -> j
-    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
+    43:43:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
     44:44:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.split(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):314:314 -> j
-    44:44:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2330 -> j
-    45:48:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2332:2335 -> j
-    1:1:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1235:1235 -> k
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> k
-    2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1236 -> k
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> k
-    3:3:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1237 -> k
-    4:4:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1239:1239 -> k
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> k
-    5:5:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1238 -> k
-    6:7:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1240:1241 -> k
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> k
-    8:8:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1242 -> k
-    9:10:void checkRegister(int):2193:2194 -> k
+    44:44:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2326 -> j
+    45:48:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo ensureBlockWithoutEnqueuing(int):2328:2331 -> j
+    1:1:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1231:1231 -> k
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> k
+    2:2:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1232 -> k
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> k
+    3:3:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1233 -> k
+    4:4:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1235:1235 -> k
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> k
+    5:5:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1234 -> k
+    6:7:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1236:1237 -> k
+    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> k
+    8:8:void addRem(com.android.tools.r8.ir.code.NumericType,int,int,int):1238 -> k
+    9:10:void checkRegister(int):2189:2190 -> k
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> k
-    11:11:void checkRegister(int):2194 -> k
-    12:12:void checkRegister(int):2194:2194 -> k
-    13:13:void checkRegister(int):2191:2191 -> k
-    1:2:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1246:1247 -> l
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> l
-    3:3:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1248 -> l
-    4:6:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1249:1251 -> l
-    7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> l
-    7:7:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1250 -> l
-    8:9:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1252:1253 -> l
-    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> l
-    10:10:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1254 -> l
-    11:11:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2418:2418 -> l
-    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1746:1746 -> m
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> m
-    2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1747 -> m
-    3:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1748:1749 -> m
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> m
-    5:5:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1749 -> m
-    6:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1752:1753 -> m
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> m
-    8:8:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1754 -> m
-    9:10:boolean isIndexProcessed(int):2361:2362 -> m
-    11:12:void ensureSubroutineProcessedInstructions():2379:2380 -> m
-    11:12:boolean isIndexProcessed(int):2364 -> m
-    13:13:boolean isIndexProcessed(int):2365:2365 -> m
-    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1877:1877 -> n
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> n
-    2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1878 -> n
-    3:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1879:1880 -> n
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> n
-    5:5:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1880 -> n
-    6:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1881:1882 -> n
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> n
-    8:8:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1883 -> n
-    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1887:1887 -> o
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> o
-    2:2:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1888 -> o
-    3:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1889:1890 -> o
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> o
-    5:5:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1890 -> o
-    6:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1891:1892 -> o
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> o
-    8:8:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1893 -> o
-    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1897:1897 -> p
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> p
-    2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1898 -> p
-    3:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1899:1900 -> p
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> p
-    5:5:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1900 -> p
-    6:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1901:1902 -> p
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> p
-    8:8:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1903 -> p
-    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1907:1907 -> q
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> q
-    2:2:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1908 -> q
-    3:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1909:1910 -> q
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> q
-    5:5:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1910 -> q
-    6:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1911:1912 -> q
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> q
-    8:8:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1913 -> q
-    1:1:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> r
-    1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1737 -> r
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> r
-    2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1738 -> r
-    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1739:1739 -> r
-    4:4:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> r
-    4:4:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1739 -> r
-    5:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1740:1741 -> r
-    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> r
-    7:7:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1742 -> r
-    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1917:1917 -> s
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> s
-    2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1918 -> s
-    3:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1919:1920 -> s
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> s
-    5:5:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1920 -> s
-    6:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1921:1922 -> s
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> s
-    8:8:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1923 -> s
-    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1927:1927 -> t
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> t
-    2:2:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1928 -> t
-    3:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1929:1930 -> t
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> t
-    5:5:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1930 -> t
-    6:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1931:1932 -> t
-    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> t
-    8:8:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1933 -> t
-    1:7:java.lang.String toString():2602:2608 -> toString
-    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1937:1937 -> u
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> u
-    2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1938 -> u
-    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> u
-    3:3:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1939 -> u
-    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1940:1940 -> u
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> u
-    5:5:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1940 -> u
-    6:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1942:1949 -> u
-    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> u
-    14:14:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1950 -> u
-    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1954:1954 -> v
-    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2123:2123 -> v
-    2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1955 -> v
-    3:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1957:1958 -> v
-    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> v
-    5:5:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1958 -> v
-    6:9:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1959:1962 -> v
-    10:10:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2178:2178 -> v
-    10:10:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1962 -> v
-    11:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1963:1965 -> v
-    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2252:2252 -> v
-    14:14:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1966 -> v
-com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.ir.conversion.I$a:
+    11:11:void checkRegister(int):2190 -> k
+    12:12:void checkRegister(int):2190:2190 -> k
+    13:13:void checkRegister(int):2187:2187 -> k
+    1:2:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1242:1243 -> l
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> l
+    3:3:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1244 -> l
+    4:6:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1245:1247 -> l
+    7:7:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> l
+    7:7:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1246 -> l
+    8:9:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1248:1249 -> l
+    10:10:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> l
+    10:10:void addRemLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1250 -> l
+    11:11:com.android.tools.r8.ir.code.BasicBlock getTarget(int):2414:2414 -> l
+    1:1:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1742:1742 -> m
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> m
+    2:2:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1743 -> m
+    3:4:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1744:1745 -> m
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> m
+    5:5:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1745 -> m
+    6:7:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1748:1749 -> m
+    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> m
+    8:8:void addRsubLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1750 -> m
+    9:10:boolean isIndexProcessed(int):2357:2358 -> m
+    11:12:void ensureSubroutineProcessedInstructions():2375:2376 -> m
+    11:12:boolean isIndexProcessed(int):2360 -> m
+    13:13:boolean isIndexProcessed(int):2361:2361 -> m
+    1:1:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1873:1873 -> n
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> n
+    2:2:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1874 -> n
+    3:4:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1875:1876 -> n
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> n
+    5:5:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1876 -> n
+    6:7:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1877:1878 -> n
+    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> n
+    8:8:void addShl(com.android.tools.r8.ir.code.NumericType,int,int,int):1879 -> n
+    1:1:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1883:1883 -> o
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> o
+    2:2:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1884 -> o
+    3:4:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1885:1886 -> o
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> o
+    5:5:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1886 -> o
+    6:7:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1887:1888 -> o
+    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> o
+    8:8:void addShlLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1889 -> o
+    1:1:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1893:1893 -> p
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> p
+    2:2:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1894 -> p
+    3:4:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1895:1896 -> p
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> p
+    5:5:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1896 -> p
+    6:7:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1897:1898 -> p
+    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> p
+    8:8:void addShr(com.android.tools.r8.ir.code.NumericType,int,int,int):1899 -> p
+    1:1:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1903:1903 -> q
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> q
+    2:2:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1904 -> q
+    3:4:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1905:1906 -> q
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> q
+    5:5:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1906 -> q
+    6:7:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1907:1908 -> q
+    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> q
+    8:8:void addShrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1909 -> q
+    1:1:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> r
+    1:1:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1733 -> r
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> r
+    2:2:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1734 -> r
+    3:3:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1735:1735 -> r
+    4:4:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> r
+    4:4:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1735 -> r
+    5:6:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1736:1737 -> r
+    7:7:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> r
+    7:7:void addSub(com.android.tools.r8.ir.code.NumericType,int,int,int):1738 -> r
+    1:1:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1913:1913 -> s
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> s
+    2:2:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1914 -> s
+    3:4:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1915:1916 -> s
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> s
+    5:5:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1916 -> s
+    6:7:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1917:1918 -> s
+    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> s
+    8:8:void addUshr(com.android.tools.r8.ir.code.NumericType,int,int,int):1919 -> s
+    1:1:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1923:1923 -> t
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> t
+    2:2:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1924 -> t
+    3:4:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1925:1926 -> t
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> t
+    5:5:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1926 -> t
+    6:7:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1927:1928 -> t
+    8:8:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> t
+    8:8:void addUshrLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1929 -> t
+    1:7:java.lang.String toString():2598:2604 -> toString
+    1:1:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1933:1933 -> u
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> u
+    2:2:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1934 -> u
+    3:3:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> u
+    3:3:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1935 -> u
+    4:4:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1936:1936 -> u
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> u
+    5:5:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1936 -> u
+    6:13:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1938:1945 -> u
+    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> u
+    14:14:void addXor(com.android.tools.r8.ir.code.NumericType,int,int,int):1946 -> u
+    1:1:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1950:1950 -> v
+    2:2:com.android.tools.r8.ir.code.Value readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2119:2119 -> v
+    2:2:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1951 -> v
+    3:4:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1953:1954 -> v
+    5:5:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> v
+    5:5:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1954 -> v
+    6:9:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1955:1958 -> v
+    10:10:com.android.tools.r8.ir.code.Value writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2174:2174 -> v
+    10:10:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1958 -> v
+    11:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1959:1961 -> v
+    14:14:void addInstruction(com.android.tools.r8.ir.code.Instruction):2248:2248 -> v
+    14:14:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1962 -> v
+com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.w.c.M$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> a
     1:1:void <clinit>():151:151 -> <clinit>
-com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.ir.conversion.I$b:
+com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.w.c.M$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalPredecessors -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalSuccessors -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet normalPredecessors -> b
@@ -27383,7 +27404,7 @@
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:6:void <init>():268:273 -> <init>
     1:25:java.lang.String toString():337:361 -> toString
-com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.ir.conversion.I$c:
+com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.w.c.M$c:
     com.android.tools.r8.graph.DexType guard -> d
     int targetOffset -> f
     int sourceOffset -> e
@@ -27392,7 +27413,7 @@
     1:1:int access$600(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):193:193 -> a
     1:1:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):193:193 -> b
     1:1:int access$800(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):193:193 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.ir.conversion.I$d:
+com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.w.c.M$d:
     int sourceOffset -> d
     int targetOffset -> e
     com.android.tools.r8.ir.code.Position position -> f
@@ -27400,13 +27421,13 @@
     1:1:int access$200(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):207:207 -> a
     1:1:int access$300(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):207:207 -> b
     1:1:com.android.tools.r8.ir.code.Position access$500(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):207:207 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.ir.conversion.I$e:
+com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.w.c.M$e:
     java.util.List values -> a
     1:3:void <init>():230:232 -> <init>
     1:3:com.android.tools.r8.ir.conversion.IRBuilder$ValueList fromPhis(java.util.List,int):238:240 -> a
     1:9:boolean equals(java.lang.Object):252:260 -> equals
     1:1:int hashCode():247:247 -> hashCode
-com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.ir.conversion.I$f:
+com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.w.c.M$f:
     int firstInstructionIndex -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.code.BasicBlock block -> a
@@ -27415,7 +27436,7 @@
     2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):186:189 -> <init>
     1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> a
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):181:181 -> b
-com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.ir.conversion.J:
+com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.w.c.N:
     java.util.List neverMergePrefixes -> Q
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization uninstantiatedTypeOptimization -> D
@@ -27464,296 +27485,307 @@
     com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> h
     1:1:void <clinit>():119:119 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexClasses):185:185 -> <init>
-    2:174: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):168:340 -> <init>
-    175:175:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):353:353 -> <init>
+    2:170: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):168:336 -> <init>
+    171:171:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):349:349 -> <init>
     boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):689 -> a
-    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):689:689 -> a
-    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685:685 -> a
+    1:1:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685 -> a
+    2:2:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):685:685 -> a
+    3:3:void lambda$optimize$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):681:681 -> a
     4:4:java.lang.String lambda$new$0(java.lang.String):205:205 -> a
-    5:8:java.util.Set getDesugaredCallSites():344:347 -> a
-    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):448:455 -> a
-    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):388:389 -> a
-    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):457 -> a
-    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):395:397 -> a
-    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458 -> a
-    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459:459 -> a
-    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):419:420 -> a
-    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459 -> a
-    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):428:429 -> a
-    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):460 -> a
-    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):435:436 -> a
-    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):461 -> a
-    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):441:442 -> a
-    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):462 -> a
-    31:32:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):914:915 -> a
-    31:32:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):463 -> a
-    33:36:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):465:468 -> a
-    37:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):472:478 -> a
-    44:45:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):503:504 -> a
-    44:45:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):479 -> a
-    46:53:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):106:113 -> a
-    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):505 -> a
-    46:53:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):479 -> a
-    54:54:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):505:505 -> a
-    54:54:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):479 -> a
-    55:59:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):541:545 -> a
-    60:62:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):560:562 -> a
-    63:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):626:634 -> a
-    72:73:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):894:895 -> a
-    72:73:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):635 -> a
-    74:75:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):409:410 -> a
-    74:75:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):636 -> a
-    76:84:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):645:653 -> a
-    85:85:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):169:169 -> a
-    85:85:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175 -> a
-    85:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    86:87:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):175:176 -> a
-    86:87:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):653 -> a
-    88:140:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):654:706 -> a
-    141:141:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    141:141:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):706 -> a
-    142:142:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):707:707 -> a
-    143:144:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):403:404 -> a
-    143:144:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):708 -> a
-    145:152:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):709:716 -> a
-    153:155:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):395:397 -> a
-    153:155:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):717 -> a
-    156:157:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719:720 -> a
-    158:159:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):419:420 -> a
-    158:159:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):720 -> a
-    160:160:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722:722 -> a
-    161:162:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):428:429 -> a
-    161:162:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):723 -> a
-    163:164:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):435:436 -> a
-    163:164:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):724 -> a
-    165:167:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):725:727 -> a
-    168:169: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):905:906 -> a
-    168:169:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):728 -> a
-    170:170:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):730:730 -> a
-    171:172:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):914:915 -> a
-    171:172:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):731 -> a
-    173:175:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):733:735 -> a
-    176:194:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):734:752 -> a
-    195:198:com.android.tools.r8.graph.DexType computeOutlineClassType():956:959 -> a
-    195:198:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752 -> a
-    199:199:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    199:199:com.android.tools.r8.graph.DexType computeOutlineClassType():959 -> a
-    199:199:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752 -> a
-    200:200:com.android.tools.r8.graph.DexType computeOutlineClassType():961:961 -> a
-    200:200:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752 -> a
-    201:256:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):752:807 -> a
-    257:264:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):801:808 -> a
-    265:265:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):664:664 -> a
-    266:266:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):660:660 -> a
-    267:268:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):749:750 -> a
-    269:272:void waveStart(java.util.Collection):812:815 -> a
-    273:273:void addWaveDoneAction(com.android.tools.r8.utils.Action):826:826 -> a
-    274:274:boolean isInWave():836:836 -> a
-    274:274:void addWaveDoneAction(com.android.tools.r8.utils.Action):829 -> a
-    275:275:void addWaveDoneAction(com.android.tools.r8.utils.Action):832:832 -> a
-    276:276:void addWaveDoneAction(com.android.tools.r8.utils.Action):830:830 -> a
-    277:277:void addWaveDoneAction(com.android.tools.r8.utils.Action):827:827 -> a
-    278:278:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):840:840 -> a
-    279:284:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):850:855 -> a
-    285:303:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):854:872 -> a
-    304:315:java.lang.Object lambda$forEachSelectedOutliningMethod$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):857:868 -> a
-    316:319:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):877:880 -> a
-    320:331:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):879:890 -> a
-    332:332:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):924:924 -> a
-    333:342:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):937:946 -> a
-    343:343:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1025:1025 -> a
-    343:343:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):946 -> a
-    344:344:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):946:946 -> a
-    345:345:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):945:945 -> a
-    346:349:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):968:971 -> a
-    350:355:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):977:982 -> a
-    356:361:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):986:991 -> a
-    362:362:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    362:362:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):992 -> a
-    363:363:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):992:992 -> a
-    364:364:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):988:988 -> a
-    365:367:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):1009:1011 -> a
-    368:368:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):1010:1010 -> a
-    369:369:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1013:1013 -> a
-    370:370:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
-    370:370:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1017 -> a
-    371:371:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1017:1017 -> a
-    372:372:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1013:1013 -> a
-    373:379:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1034:1040 -> a
-    380:382:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1082:1084 -> a
-    383:388:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1083:1088 -> a
-    389:389:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1025:1025 -> a
-    389:389:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1088 -> a
-    390:390:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1088:1088 -> a
-    391:404:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1087:1100 -> a
-    405:410:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1731:1736 -> a
-    405:410:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1103 -> a
-    411:417:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1104:1110 -> a
-    418:418:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1286:1286 -> a
-    418:418:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1110 -> a
-    419:433:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1111:1125 -> a
-    434:434:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():984:984 -> a
-    434:434:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1125 -> a
-    435:454:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1126:1145 -> a
-    455:455:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1484 -> a
-    455:455:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    456:456:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    456:456:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484 -> a
-    456:456:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    457:459:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1486 -> a
-    457:459:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    460:460:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    460:460:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1486 -> a
-    460:460:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    461:464:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1487:1490 -> a
-    461:464:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1146 -> a
-    465:479:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1154:1168 -> a
-    480:480:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
-    480:480:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1169 -> a
-    481:585:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1170:1274 -> a
-    586:588:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1045:1047 -> a
-    586:588:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1275 -> a
-    589:597:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1278:1286 -> a
-    598:616:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1285:1303 -> a
-    617:617:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():984:984 -> a
-    617:617:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1303 -> a
-    618:641:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1304:1327 -> a
-    642:712:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1319:1389 -> a
-    713:713:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    713:713:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1389 -> a
-    714:724:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1390:1400 -> a
-    725:730:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):894:899 -> a
-    725:730:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1400 -> a
-    731:779:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1401:1449 -> a
-    780:780:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1294:1294 -> a
-    780:780:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1449 -> a
-    781:797:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1450:1466 -> a
-    798:803:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1470 -> a
-    804:804:void lambda$rewriteCodeInternal$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1202:1202 -> a
-    805:805:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1329:1329 -> a
-    806:807:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1474:1475 -> a
-    808:808:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    808:808:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1475 -> a
-    809:813:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1494:1498 -> a
-    809:813:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
-    814:814:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1478:1478 -> a
-    815:818:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1503:1506 -> a
-    815:818:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    819:823:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> a
-    819:823:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507 -> a
-    819:823:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    824:826:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1508:1510 -> a
-    824:826:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    827:827:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1025:1025 -> a
-    827:827:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510 -> a
-    827:827:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    828:828:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510:1510 -> a
-    828:828:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    829:833:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1509:1513 -> a
-    829:833:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
-    834:834:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616:1616 -> a
-    835:835:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1270:1270 -> a
-    835:835:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616 -> a
-    836:847:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1619:1630 -> a
-    848:850:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1676:1678 -> a
-    848:850:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1631 -> a
-    851:851:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1634:1634 -> a
-    852:853:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1683:1684 -> a
-    852:853:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1635 -> a
-    854:855:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1688:1689 -> a
-    854:855:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1638 -> a
-    856:857:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641:1642 -> a
-    858:862:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1662:1666 -> a
-    858:862:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1643 -> a
-    863:868:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1644:1649 -> a
-    869:880: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):1698:1709 -> a
-    869:880:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
-    881:882:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1624:1625 -> a
-    883:883:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1623:1623 -> a
-    884:884:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1671:1671 -> a
-    885:885:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1747:1747 -> a
-    886:886:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    886:886:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1748 -> a
-    887:904:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1749:1766 -> a
-    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):484:489 -> b
-    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):487:498 -> b
-    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):549:558 -> b
-    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):568:596 -> b
+    5:8:java.util.Set getDesugaredCallSites():340:343 -> a
+    9:16:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):444:451 -> a
+    17:18:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):384:385 -> a
+    17:18:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):453 -> a
+    19:21:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):391:393 -> a
+    19:21:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):454 -> a
+    22:22:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455:455 -> a
+    23:24:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):415:416 -> a
+    23:24:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):455 -> a
+    25:26:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):424:425 -> a
+    25:26:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):456 -> a
+    27:28:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):431:432 -> a
+    27:28:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):457 -> a
+    29:30:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):437:438 -> a
+    29:30:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):458 -> a
+    31:32:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):901:902 -> a
+    31:32:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):459 -> a
+    33:36:com.android.tools.r8.graph.DexApplication convert(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):461:464 -> a
+    37:43:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):468:474 -> a
+    44:45:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):499:500 -> a
+    44:45:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    46:53:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithout(com.android.tools.r8.graph.DexType):102:109 -> a
+    46:53:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):501 -> a
+    46:53:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    54:54:void clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):501:501 -> a
+    54:54:void handleSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):475 -> a
+    55:59:void convertClasses(java.lang.Iterable,java.util.concurrent.ExecutorService):537:541 -> a
+    60:62:void lambda$convertMethods$4(boolean,com.android.tools.r8.graph.DexEncodedMethod):556:558 -> a
+    63:71:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):622:630 -> a
+    72:73:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):881:882 -> a
+    72:73:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):631 -> a
+    74:75:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):405:406 -> a
+    74:75:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):632 -> a
+    76:84:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):641:649 -> a
+    85:85:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):156:156 -> a
+    85:85:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170 -> a
+    85:85:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
+    86:87:com.android.tools.r8.ir.conversion.MethodProcessor com.android.tools.r8.ir.conversion.CallGraph.createMethodProcessor(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):170:171 -> a
+    86:87:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):649 -> a
+    88:139:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):650:701 -> a
+    140:140:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    140:140:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):701 -> a
+    141:141:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):702:702 -> a
+    142:143:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):399:400 -> a
+    142:143:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):703 -> a
+    144:147:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):707:710 -> a
+    148:150:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):391:393 -> a
+    148:150:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):711 -> a
+    151:152:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):713:714 -> a
+    153:154:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):415:416 -> a
+    153:154:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):714 -> a
+    155:155:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):716:716 -> a
+    156:157:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):424:425 -> a
+    156:157:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):717 -> a
+    158:159:void synthesizeJava8UtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):431:432 -> a
+    158:159:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):718 -> a
+    160:162:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):719:721 -> a
+    163:164: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):892:893 -> a
+    163:164:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):722 -> a
+    165:165:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):724:724 -> a
+    166:167:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):901:902 -> a
+    166:167:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):725 -> a
+    168:170:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):727:729 -> a
+    171:186:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):728:743 -> a
+    187:190:com.android.tools.r8.graph.DexType computeOutlineClassType():943:946 -> a
+    187:190:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    191:191:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    191:191:com.android.tools.r8.graph.DexType computeOutlineClassType():946 -> a
+    191:191:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    192:192:com.android.tools.r8.graph.DexType computeOutlineClassType():948:948 -> a
+    192:192:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743 -> a
+    193:245:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):743:795 -> a
+    246:253:com.android.tools.r8.graph.DexApplication optimize(java.util.concurrent.ExecutorService):789:796 -> a
+    254:254:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):660:660 -> a
+    255:255:void lambda$optimize$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.MethodProcessor,java.util.function.BiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):656:656 -> a
+    256:257:void lambda$optimize$8(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):740:741 -> a
+    258:261:void waveStart(java.util.Collection):800:803 -> a
+    262:262:void addWaveDoneAction(com.android.tools.r8.utils.Action):814:814 -> a
+    263:263:boolean isInWave():824:824 -> a
+    263:263:void addWaveDoneAction(com.android.tools.r8.utils.Action):817 -> a
+    264:264:void addWaveDoneAction(com.android.tools.r8.utils.Action):820:820 -> a
+    265:265:void addWaveDoneAction(com.android.tools.r8.utils.Action):818:818 -> a
+    266:266:void addWaveDoneAction(com.android.tools.r8.utils.Action):815:815 -> a
+    267:267:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):828:828 -> a
+    268:273:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):838:843 -> a
+    274:291:void forEachSelectedOutliningMethod(java.util.concurrent.ExecutorService,java.util.function.BiConsumer):842:859 -> a
+    292:302:java.lang.Object lambda$forEachSelectedOutliningMethod$13(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiConsumer):845:855 -> a
+    303:306:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):864:867 -> a
+    307:318:void forEachSynthesizedServiceLoaderMethod(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexClass):866:877 -> a
+    319:319:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):911:911 -> a
+    320:329:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):924:933 -> a
+    330:330:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    330:330:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):933 -> a
+    331:331:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):933:933 -> a
+    332:332:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):932:932 -> a
+    333:336:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):955:958 -> a
+    337:342:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):964:969 -> a
+    343:348:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):973:978 -> a
+    349:349:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
+    349:349:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):979 -> a
+    350:350:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):979:979 -> a
+    351:351:void optimizeSynthesizedMethod(com.android.tools.r8.graph.DexEncodedMethod):975:975 -> a
+    352:354:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):996:998 -> a
+    355:355:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService,java.util.List):997:997 -> a
+    356:356:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1000:1000 -> a
+    357:357:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> a
+    357:357:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1004 -> a
+    358:358:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1004:1004 -> a
+    359:359:java.lang.Object lambda$optimizeSynthesizedMethodsConcurrently$15(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):1000:1000 -> a
+    360:366:void processMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1021:1027 -> a
+    367:369:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1069:1071 -> a
+    370:375:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1070:1075 -> a
+    376:376:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    376:376:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075 -> a
+    377:377:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1075:1075 -> a
+    378:391:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1074:1087 -> a
+    392:397:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1731:1736 -> a
+    392:397:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1090 -> a
+    398:404:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1091:1097 -> a
+    405:405:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1281:1281 -> a
+    405:405:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1097 -> a
+    406:420:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1098:1112 -> a
+    421:421:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
+    421:421:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1112 -> a
+    422:436:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1113:1127 -> a
+    437:437:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1484 -> a
+    437:437:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    438:438:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    438:438:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484 -> a
+    438:438:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    439:441:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1484:1486 -> a
+    439:441:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    442:442:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    442:442:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1486 -> a
+    442:442:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    443:446:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1487:1490 -> a
+    443:446:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1128 -> a
+    447:461:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1136:1150 -> a
+    462:462:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):90:90 -> a
+    462:462:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1151 -> a
+    463:566:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1152:1255 -> a
+    567:569:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1032:1034 -> a
+    567:569:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1256 -> a
+    570:578:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1259:1267 -> a
+    579:597:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1266:1284 -> a
+    598:598:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
+    598:598:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1284 -> a
+    599:622:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1285:1308 -> a
+    623:693:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1300:1370 -> a
+    694:694:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    694:694:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1370 -> a
+    695:705:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1371:1381 -> a
+    706:711:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):891:896 -> a
+    706:711:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1381 -> a
+    712:755:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1382:1425 -> a
+    756:760:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:193 -> a
+    756:760:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    761:767:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):205:211 -> a
+    761:767:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):196 -> a
+    761:767:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    768:771:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):198:201 -> a
+    768:771:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    772:788:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1426:1442 -> a
+    789:789:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:189 -> a
+    789:789:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1425 -> a
+    790:792:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1447:1449 -> a
+    793:793:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1289:1289 -> a
+    793:793:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1449 -> a
+    794:810:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1450:1466 -> a
+    811:816:void rewriteCodeInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer,com.android.tools.r8.origin.Origin):1465:1470 -> a
+    817:817:void lambda$rewriteCodeInternal$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1184:1184 -> a
+    818:818:com.android.tools.r8.ir.optimize.InliningOracle lambda$rewriteCodeInternal$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):1310:1310 -> a
+    819:820:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1474:1475 -> a
+    821:821:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    821:821:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1475 -> a
+    822:826:void finalizeToCf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1494:1498 -> a
+    822:826:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1476 -> a
+    827:827:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1478:1478 -> a
+    828:831:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1503:1506 -> a
+    828:831:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    832:836:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> a
+    832:836:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1507 -> a
+    832:836:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    837:839:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1508:1510 -> a
+    837:839:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    840:840:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1012:1012 -> a
+    840:840:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510 -> a
+    840:840:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    841:841:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1510:1510 -> a
+    841:841:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    842:846:void finalizeToDex(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1509:1513 -> a
+    842:846:void finalizeIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1479 -> a
+    847:847:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616:1616 -> a
+    848:848:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1265:1265 -> a
+    848:848:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1616 -> a
+    849:860:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1619:1630 -> a
+    861:863:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1676:1678 -> a
+    861:863:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1631 -> a
+    864:864:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1634:1634 -> a
+    865:866:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1683:1684 -> a
+    865:866:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1635 -> a
+    867:868:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1688:1689 -> a
+    867:868:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1638 -> a
+    869:870:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1641:1642 -> a
+    871:875:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1662:1666 -> a
+    871:875:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1643 -> a
+    876:881:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1644:1649 -> a
+    882:893: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):1698:1709 -> a
+    882:893:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1650 -> a
+    894:895:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1624:1625 -> a
+    896:896:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1623:1623 -> a
+    897:897:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1671:1671 -> a
+    898:898:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1747:1747 -> a
+    899:899:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    899:899:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1748 -> a
+    900:917:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1749:1766 -> a
+    1:6:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):480:485 -> b
+    7:18:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication$Builder):483:494 -> b
+    19:28:void convertMethods(com.android.tools.r8.graph.DexProgramClass):545:554 -> b
+    29:57:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):564:592 -> b
     58:58:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
+    58:58:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> b
     59:59:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
-    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:600 -> b
-    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> b
-    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):600 -> b
-    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):600:606 -> b
-    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603:603 -> b
+    59:59:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592 -> b
+    60:64:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):592:596 -> b
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    65:65:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596 -> b
+    66:72:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):596:602 -> b
+    73:73:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599:599 -> b
     74:74:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():27:27 -> b
-    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603 -> b
-    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):603:608 -> b
-    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> b
-    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):608 -> b
+    74:74:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599 -> b
+    75:80:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):599:604 -> b
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> b
+    81:81:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):604 -> b
     82:86:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1530:1534 -> b
-    82:86:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):609 -> b
-    87:89:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):758:760 -> b
-    90:90:boolean isInWave():836:836 -> b
-    91:93:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):1000:1002 -> b
-    94:102:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1058:1066 -> b
-    103:103:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1064:1064 -> b
+    82:86:void convertMethod(com.android.tools.r8.graph.DexEncodedMethod):605 -> b
+    87:89:void lambda$optimize$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):749:751 -> b
+    90:90:boolean isInWave():824:824 -> b
+    91:93:void optimizeSynthesizedMethodsConcurrently(java.util.Collection,java.util.concurrent.ExecutorService):987:989 -> b
+    94:102:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1045:1053 -> b
+    103:103:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,java.util.function.BiConsumer):1051:1051 -> b
     104:109:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1519:1524 -> b
     110:114:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1522:1526 -> b
     115:115:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1565:1565 -> b
-    116:116:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1307:1307 -> b
+    116:116:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1302:1302 -> b
     116:116:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1565 -> b
     117:133:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1569:1585 -> b
     134:137:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1715:1718 -> b
     134:137:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
-    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> b
+    138:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> b
     138:138:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1718 -> b
     138:138:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
     139:147:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1719:1727 -> b
     139:147:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1596 -> b
     148:152:boolean lambda$workaroundForwardingInitializerBug$18(com.android.tools.r8.ir.code.Instruction):1587:1591 -> b
     153:154:void printPhase(java.lang.String):1741:1742 -> b
-    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):511:530 -> c
-    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):529:535 -> c
-    28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):129:142 -> c
-    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):535 -> c
-    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):535:535 -> c
-    43:47:com.android.tools.r8.graph.DexApplication optimize():616:620 -> c
-    48:49:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):841:842 -> c
-    50:50:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexEncodedMethod):842:842 -> c
+    1:20:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):507:526 -> c
+    21:27:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):525:531 -> c
+    28:41:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):125:138 -> c
+    28:41:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):531 -> c
+    42:42:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication$Builder):531:531 -> c
+    43:47:com.android.tools.r8.graph.DexApplication optimize():612:616 -> c
+    48:49:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexProgramClass):829:830 -> c
+    50:50:void lambda$computeReachabilitySensitivity$11(com.android.tools.r8.graph.DexEncodedMethod):830:830 -> c
     51:56:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1542:1547 -> c
-    57:57:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1319:1319 -> c
+    57:57:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1314:1314 -> c
     57:57:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1547 -> c
     58:58:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548:1548 -> c
-    59:71:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3712:3724 -> c
+    59:71:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3680:3692 -> c
     59:71:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> c
     72:72:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> c
-    72:72:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3725 -> c
+    72:72:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3693 -> c
     72:72:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> c
-    73:74:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3725:3726 -> c
+    73:74:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3693:3694 -> c
     73:74:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> c
-    75:75:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3712:3712 -> c
+    75:75:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3680:3680 -> c
     75:75:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1548 -> c
     76:85:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1550:1559 -> c
     86:86:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1558:1558 -> c
     boolean lambda$convertMethod$5(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    1:1:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):543:543 -> d
-    2:2:void clearDexMethodCompilationState():920:920 -> d
-    1:7:boolean enableTryWithResourcesDesugaring():370:376 -> e
-    8:8:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):488:488 -> e
-    9:13:java.lang.Object lambda$forEachSynthesizedServiceLoaderMethod$14(com.android.tools.r8.graph.DexEncodedMethod):882:886 -> e
-    1:1:boolean enableTwrCloseResourceDesugaring():366:366 -> f
-    2:2:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):527:527 -> f
-    3:3:void lambda$waveStart$10(com.android.tools.r8.graph.DexEncodedMethod):815:815 -> f
-    1:2:boolean removeLambdaDeserializationMethods():380:381 -> g
-    1:3:void waveDone():820:822 -> h
-com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.ir.conversion.L:
+    1:1:void lambda$convertClasses$3(com.android.tools.r8.graph.DexProgramClass):539:539 -> d
+    2:2:void clearDexMethodCompilationState():907:907 -> d
+    1:7:boolean enableTryWithResourcesDesugaring():366:372 -> e
+    8:8:com.android.tools.r8.graph.DexType lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexProgramClass):484:484 -> e
+    9:13:java.lang.Object lambda$forEachSynthesizedServiceLoaderMethod$14(com.android.tools.r8.graph.DexEncodedMethod):869:873 -> e
+    1:1:boolean enableTwrCloseResourceDesugaring():362:362 -> f
+    2:2:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$2(com.android.tools.r8.graph.DexProgramClass):523:523 -> f
+    3:3:void lambda$waveStart$10(com.android.tools.r8.graph.DexEncodedMethod):803:803 -> f
+    1:2:boolean removeLambdaDeserializationMethods():376:377 -> g
+    1:3:void waveDone():808:810 -> h
+com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.w.c.P:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> c
@@ -27768,7 +27800,7 @@
     19:39:boolean unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):484:504 -> a
     19:39:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):111 -> a
     40:58:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):114:132 -> a
-    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():984:984 -> a
+    59:59:boolean com.android.tools.r8.utils.InternalOptions$TestingOptions.desugarLambdasThroughLensCodeRewriter():979:979 -> a
     59:59:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):132 -> a
     60:63:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):133:136 -> a
     64:104:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:175 -> a
@@ -27843,7 +27875,7 @@
     551:551:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):671 -> a
     552:555:boolean hasAccessToInvokeTargetFromContext(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):674:677 -> a
     1:1:com.android.tools.r8.ir.code.Instruction lambda$rewrite$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):375:375 -> b
-com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.ir.conversion.K:
+com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.w.c.O:
     com.android.tools.r8.ir.code.Instruction current -> b
     java.util.Set affectedPhis -> d
     com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> e
@@ -27854,7 +27886,7 @@
     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):688:692 -> <init>
     1:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):697:710 -> a
     15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):707:707 -> a
-com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.ir.conversion.M:
+com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.w.c.Q:
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
@@ -27879,35 +27911,21 @@
     void markForceInline(com.android.tools.r8.graph.DexEncodedMethod) -> h
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> i
     void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> j
-com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.ir.conversion.MethodProcessor:
+com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.w.c.S:
     java.util.Deque waves -> b
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):35:37 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():41:41 -> a
-    2:25:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallSiteInformation):46:69 -> a
-    26:30:void lambda$createWaves$1(java.util.Set,com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.ir.conversion.CallGraph,java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):56:60 -> a
-    31:31:void lambda$createWaves$0(java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):61:61 -> a
-    32:39:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):106:113 -> a
-    40:48:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):112:120 -> a
-    49:49:java.lang.Object lambda$forEachMethod$2(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):115:115 -> a
-    1:11:void extractLeaves(java.util.Set,java.util.function.Consumer):81:91 -> extractLeaves
-com.android.tools.r8.ir.conversion.PartialCallGraphBuilder -> com.android.tools.r8.ir.conversion.PartialCallGraphBuilder:
-    java.util.Set seeds -> e
-    boolean $assertionsDisabled -> f
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):21:23 -> <init>
-    1:4:void process(java.util.concurrent.ExecutorService):28:31 -> a
-    5:12:void process(java.util.concurrent.ExecutorService):30:37 -> a
-    13:14:boolean verifyAllMethodsWithCodeExists():49:50 -> a
-    1:1:java.lang.Object lambda$process$0(com.android.tools.r8.graph.DexEncodedMethod):33:33 -> b
-    1:1:com.android.tools.r8.ir.conversion.CallGraph build(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):17:17 -> build
-    1:3:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):41:43 -> c
-    4:4:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):42:42 -> c
-com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.ir.conversion.PostMethodProcessor:
-    1:11:void extractRoots(java.util.Set,java.util.function.Consumer):21:31 -> extractRoots
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.ir.conversion.N:
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):34:36 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():40:40 -> a
+    2:25:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallSiteInformation):45:68 -> a
+    26:30:void lambda$createWaves$1(java.util.Set,com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.ir.conversion.CallGraph,java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):55:59 -> a
+    31:31:void lambda$createWaves$0(java.util.Set,com.android.tools.r8.ir.conversion.CallGraph$Node):60:60 -> a
+    32:42:void extractLeaves(java.util.Set,java.util.function.Consumer):74:84 -> a
+    43:50:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):99:106 -> a
+    51:59:void forEachMethod(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.function.Consumer,com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):105:113 -> a
+    60:60:java.lang.Object lambda$forEachMethod$2(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):108:108 -> a
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.w.c.T:
     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
@@ -27929,11 +27947,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.X:
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.w.c.c0:
     1:7:boolean isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):184:190 -> a
     1:7:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):104 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.ir.conversion.O:
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.ir.conversion.Q:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.w.c.U:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.w.c.W:
     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
@@ -27944,7 +27962,7 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock access$002(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
     1:1:com.android.tools.r8.ir.code.Phi access$100(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):587:587 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap access$300(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):587:587 -> c
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.ir.conversion.P:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.w.c.V:
     1:1:void <init>():589:589 -> <init>
     1:1:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping build(com.android.tools.r8.ir.code.BasicBlock):616:616 -> a
     2:2:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):628:628 -> a
@@ -27967,7 +27985,7 @@
     82:82:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch):708:708 -> a
     83:83:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):622:622 -> a
     83:83:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch):708 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.ir.conversion.T:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.w.c.Y:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
@@ -27976,7 +27994,7 @@
     1:29:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):273:301 -> a
     30:30:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
     30:30:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):301 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.ir.conversion.S:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.w.c.X:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:1:void <clinit>():195:195 -> <clinit>
@@ -27990,7 +28008,7 @@
     15:16:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):216 -> a
     17:19:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):217:219 -> a
     20:46:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):218:244 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.ir.conversion.V:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.w.c.a0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap mapping -> c
     com.android.tools.r8.ir.code.Value stringHashValue -> b
     boolean $assertionsDisabled -> d
@@ -28002,7 +28020,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$200(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):305:305 -> a
     2:2:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder builder(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):583:583 -> a
     1:1:com.android.tools.r8.ir.code.Value access$500(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):305:305 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.ir.conversion.U:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.w.c.Z:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.ir.code.Phi idValue -> c
     com.android.tools.r8.ir.code.Value stringValue -> d
@@ -28034,7 +28052,7 @@
     31:31:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):400:400 -> b
     32:32:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():0:0 -> b
     32:32:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):399 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.ir.conversion.W:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.w.c.b0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():736:736 -> <clinit>
     1:2:com.android.tools.r8.ir.code.BasicBlock getTrueTarget(com.android.tools.r8.ir.code.If):739:740 -> a
@@ -28045,7 +28063,7 @@
     18:23:com.android.tools.r8.ir.code.Value getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):766:771 -> a
     24:25:com.android.tools.r8.ir.code.Value getStringHashValueFromSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.graph.DexItemFactory):779:780 -> a
     26:28:boolean isSameStringHashValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):797:799 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.ir.conversion.Y:
+com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.w.c.d0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> b
     boolean $assertionsDisabled -> e
@@ -28055,10 +28073,10 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.IdentifierNameStringMarker):43:47 -> <init>
     1:21:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):51:71 -> a
     22:45:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):80:103 -> a
-    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    46:46:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     46:46:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):104 -> a
     47:52:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):104:109 -> a
-    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    53:53:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     53:53:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):110 -> a
     54:75:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):111:132 -> a
     76:88:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):129:141 -> a
@@ -28067,7 +28085,7 @@
     91:91:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
     91:91:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):141 -> a
     92:104:void removeStringSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):142:154 -> a
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.ir.conversion.a0:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.w.c.f0:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -28081,13 +28099,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.Z:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.w.c.e0:
     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.b0:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.w.c.g0:
     java.util.Map unificationParents -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
@@ -28142,7 +28160,7 @@
     162:162:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):239 -> a
     163:165:boolean verifyNoConstrainedUses(com.android.tools.r8.ir.code.Value,java.util.Set):239:241 -> a
     166:168:com.android.tools.r8.ir.code.Value canonical(com.android.tools.r8.ir.code.Value):279:281 -> a
-com.android.tools.r8.ir.desugar.AccessorMethodSourceCode -> com.android.tools.r8.w.c.a:
+com.android.tools.r8.ir.desugar.AccessorMethodSourceCode -> com.android.tools.r8.w.d.a:
     boolean $assertionsDisabled -> o
     1:1:void <clinit>():21:21 -> <clinit>
     1:6:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):24:29 -> <init>
@@ -28178,7 +28196,7 @@
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode.descriptor():33:33 -> m
     1:1:boolean delegatingToConstructor():68 -> m
     2:2:boolean delegatingToConstructor():68:68 -> m
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.w.c.b:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.w.d.b:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set holders -> e
@@ -28191,190 +28209,172 @@
     2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):67:74 -> <init>
     1:7:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApiLevel):78:84 -> a
     8:8:void desugar(com.android.tools.r8.ir.code.IRCode):89:89 -> a
-    9:9:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    9:9:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     9:9:void desugar(com.android.tools.r8.ir.code.IRCode):93 -> a
-    10:24:void desugar(com.android.tools.r8.ir.code.IRCode):94:108 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedMethod quickLookUp(com.android.tools.r8.graph.DexMethod):146:146 -> a
-    25:25:void desugar(com.android.tools.r8.ir.code.IRCode):108 -> a
-    26:26:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    26:26:com.android.tools.r8.graph.DexEncodedMethod quickLookUp(com.android.tools.r8.graph.DexMethod):146 -> a
-    26:26:void desugar(com.android.tools.r8.ir.code.IRCode):108 -> a
-    27:33:com.android.tools.r8.graph.DexEncodedMethod quickLookUp(com.android.tools.r8.graph.DexMethod):150:156 -> a
-    27:33:void desugar(com.android.tools.r8.ir.code.IRCode):108 -> a
-    34:34:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    34:34:com.android.tools.r8.graph.DexEncodedMethod quickLookUp(com.android.tools.r8.graph.DexMethod):156 -> a
-    34:34:void desugar(com.android.tools.r8.ir.code.IRCode):108 -> a
-    35:35:com.android.tools.r8.graph.DexEncodedMethod quickLookUp(com.android.tools.r8.graph.DexMethod):160:160 -> a
-    35:35:void desugar(com.android.tools.r8.ir.code.IRCode):108 -> a
-    36:62:void desugar(com.android.tools.r8.ir.code.IRCode):112:138 -> a
-    63:63:boolean hasRewrittenMethodPrefix(com.android.tools.r8.graph.DexType):178:178 -> a
-    64:70:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):183:189 -> a
-    71:71:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    71:71:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):189 -> a
-    72:72:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):169:169 -> a
-    72:72:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):191 -> a
-    73:73:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    73:73:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):170 -> a
-    73:73:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):191 -> a
-    74:74:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):171:171 -> a
-    74:74:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):191 -> a
-    75:95:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):192:212 -> a
-    96:96:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    96:96:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):212 -> a
-    97:127:void synthesizeUtilityClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):215:245 -> a
-    128:128:boolean lambda$synthesizeUtilityClasses$0(com.android.tools.r8.graph.DexProgramClass):241:241 -> a
-    129:147:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):250:268 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.w.c.b$a:
+    10:17:void desugar(com.android.tools.r8.ir.code.IRCode):94:101 -> a
+    18:36:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):199:217 -> a
+    18:36:void desugar(com.android.tools.r8.ir.code.IRCode):101 -> a
+    37:42:void desugar(com.android.tools.r8.ir.code.IRCode):106:111 -> a
+    43:43:boolean hasRewrittenMethodPrefix(com.android.tools.r8.graph.DexType):126:126 -> a
+    44:50:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):132:138 -> a
+    51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    51:51:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):138 -> a
+    52:52:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):117:117 -> a
+    52:52:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):140 -> a
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
+    53:53:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):118 -> a
+    53:53:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):140 -> a
+    54:54:java.util.Collection findSynthesizedFrom(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexType):119:119 -> a
+    54:54:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):140 -> a
+    55:75:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):141:161 -> a
+    76:76:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    76:76:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):161 -> a
+    77:107:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):164:194 -> a
+    108:108:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.DexProgramClass):190:190 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.w.d.b$a:
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriter -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1320:1320 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1325:1326 -> <init>
+    1:1:void <clinit>():1246:1246 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1250:1251 -> <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):1332:1333 -> a
-    3:3:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1343:1343 -> a
-    4:4:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1348:1348 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.w.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):1256:1257 -> a
+    3:3:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1267:1267 -> a
+    4:4:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1272:1272 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.w.d.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):1359:1359 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1363:1365 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1283:1283 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1287:1289 -> <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):1371:1372 -> 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):1371:1371 -> a
-    4:11:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1377:1384 -> a
-    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    12:12:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1384 -> a
-    13:24:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1385:1396 -> a
-    25:25:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1402:1402 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.w.c.b$c:
+    1:2:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1295:1296 -> 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):1295:1295 -> a
+    4:11:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1301:1308 -> a
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    12:12:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1308 -> a
+    13:24:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1309:1320 -> a
+    25:25:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1326:1326 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.w.d.b$c:
     void rewrite(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory) -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.w.c.b$d:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.w.d.b$d:
     com.android.tools.r8.graph.DexMethod method -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1264:1265 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1190:1191 -> <init>
     com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod) -> a
     com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView) -> a
     boolean requiresGenerationOfCode() -> a
     void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RetargetCoreLibraryMethodProvider -> com.android.tools.r8.w.c.b$e:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RetargetCoreLibraryMethodProvider -> com.android.tools.r8.w.d.b$e:
     com.android.tools.r8.graph.DexType newHolder -> b
     com.android.tools.r8.graph.DexMethod targetMethod -> c
     boolean isStatic -> d
-    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):1285:1287 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):1211:1213 -> <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):1293:1294 -> 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):1293:1293 -> a
-    4:10:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1299:1305 -> a
-    11:11:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1311:1311 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.w.c.b$f:
+    1:2:void rewriteInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):1219:1220 -> 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):1219:1219 -> a
+    4:10:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1225:1231 -> a
+    11:11:com.android.tools.r8.graph.Code generateTemplateMethod(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1237:1237 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.w.d.b$f:
     java.util.Map rewritable -> a
-    java.util.Map virtualRewrites -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():271:271 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):280:280 -> <init>
-    2:35:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):274:307 -> <init>
-    1:1:boolean isEmpty():325:325 -> a
-    2:2:void visit(java.util.function.Consumer):329:329 -> a
-    3:132:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):334:463 -> a
-    133:133:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1078:1078 -> a
-    134:136:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1213:1215 -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():220:220 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):225:225 -> <init>
+    2:31:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):223:252 -> <init>
+    1:1:boolean isEmpty():257:257 -> a
+    2:2:void visit(java.util.function.Consumer):261:261 -> a
+    3:132:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):266:395 -> a
+    133:133:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$0(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1010:1010 -> a
+    134:136:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1144:1146 -> a
     137:137:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    137:137:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1216 -> a
-    138:143:void warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1203:1208 -> a
-    138:143:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1218 -> a
-    144:144:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1220:1220 -> a
-    145:151:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1240:1246 -> a
-    145:151:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1221 -> a
-    152:161:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1222:1231 -> a
-    162:162:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1229:1229 -> a
-    163:164:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1251:1252 -> a
-    165:165:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1256:1256 -> a
-    1:6:boolean matchesVirtualRewrite(com.android.tools.r8.graph.DexMethod):312:317 -> b
-    7:345:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):469:807 -> b
-    346:346:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1100:1100 -> b
+    137:137:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1147 -> a
+    138:143:void warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1134:1139 -> a
+    138:143:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1149 -> a
+    144:144:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1151:1151 -> a
+    145:151:java.util.List findDexEncodedMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):1167:1173 -> a
+    145:151:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1152 -> a
+    152:157:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1153:1158 -> a
+    158:158:void initializeRetargetCoreLibraryMembers(com.android.tools.r8.graph.AppView):1156:1156 -> a
+    159:160:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1178:1179 -> a
+    161:161:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1183:1183 -> a
+    1:339:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):401:739 -> b
+    340:340:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1031:1031 -> b
     1:6:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):74:79 -> c
-    1:6:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
+    1:6:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     7:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):77:110 -> c
-    7:40:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
+    7:40:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):105:105 -> c
-    41:41:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
+    41:41:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
     42:60:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators.generateMapOf(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod,int):102:120 -> c
-    42:60:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1121 -> c
-    61:218:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):814:971 -> c
-    1:7:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1138:1144 -> d
-    1:98:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):978:1075 -> e
-    99:124:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1072:1097 -> e
-    125:149:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1094:1118 -> e
-    150:168:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1115:1133 -> e
-    1:47:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1151:1197 -> f
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.w.c.b$g:
+    42:60:com.android.tools.r8.graph.Code lambda$initializeJava9MethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1052 -> c
+    61:218:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):746:903 -> c
+    1:7:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1069:1075 -> d
+    1:98:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):910:1007 -> e
+    99:123:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1004:1028 -> e
+    124:148:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1025:1049 -> e
+    149:167:void initializeJava9MethodProviders(com.android.tools.r8.graph.DexItemFactory):1046:1064 -> e
+    1:47:void initializeOptionalMethodProviders(com.android.tools.r8.graph.DexItemFactory):1082:1128 -> f
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.w.d.b$g:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexType receiverType -> e
-    1:1:void <clinit>():1414:1414 -> <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):1420:1421 -> <init>
-    1:8:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1426:1433 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.w.c.b$h:
+    1:1:void <clinit>():1338:1338 -> <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):1344:1345 -> <init>
+    1:8:com.android.tools.r8.graph.DexMethod provideMethod(com.android.tools.r8.graph.AppView):1350:1357 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.w.d.b$h:
     com.android.tools.r8.graph.Code create(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod) -> a
-com.android.tools.r8.ir.desugar.ClassProcessor -> com.android.tools.r8.w.c.c:
+com.android.tools.r8.ir.desugar.ClassProcessor -> com.android.tools.r8.w.d.c:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set processedClasses -> d
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> c
     boolean $assertionsDisabled -> f
     java.util.Map createdMethods -> e
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):40:40 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):36:43 -> <init>
-    1:1:java.util.Set getForwardMethods():47:47 -> a
-    2:21:void process(com.android.tools.r8.graph.DexClass):51:70 -> a
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):39:39 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):35:42 -> <init>
+    1:1:java.util.Set getForwardMethods():46:46 -> a
+    2:21:void process(com.android.tools.r8.graph.DexClass):50:69 -> a
     22:22:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    22:22:void process(com.android.tools.r8.graph.DexClass):70 -> a
-    23:28:void process(com.android.tools.r8.graph.DexClass):71:76 -> a
-    29:30:void process(com.android.tools.r8.graph.DexClass):73:74 -> a
+    22:22:void process(com.android.tools.r8.graph.DexClass):69 -> a
+    23:28:void process(com.android.tools.r8.graph.DexClass):70:75 -> a
+    29:30:void process(com.android.tools.r8.graph.DexClass):72:73 -> a
     31:31:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    31:31:void process(com.android.tools.r8.graph.DexClass):74 -> a
+    31:31:void process(com.android.tools.r8.graph.DexClass):73 -> a
     32:32:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     32:32:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    32:32:void process(com.android.tools.r8.graph.DexClass):74 -> a
-    33:46:void process(com.android.tools.r8.graph.DexClass):74:87 -> a
-    47:91:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):162:206 -> a
-    47:91:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    32:32:void process(com.android.tools.r8.graph.DexClass):73 -> a
+    33:46:void process(com.android.tools.r8.graph.DexClass):73:86 -> a
+    47:91:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):144:188 -> a
+    47:91:void process(com.android.tools.r8.graph.DexClass):96 -> a
     92:92:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    92:92:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):206 -> a
-    92:92:void process(com.android.tools.r8.graph.DexClass):97 -> a
-    93:107:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):209:223 -> a
-    93:107:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    92:92:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):188 -> a
+    92:92:void process(com.android.tools.r8.graph.DexClass):96 -> a
+    93:107:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):191:205 -> a
+    93:107:void process(com.android.tools.r8.graph.DexClass):96 -> a
     108:108:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    108:108:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):223 -> a
-    108:108:void process(com.android.tools.r8.graph.DexClass):97 -> a
+    108:108:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):205 -> a
+    108:108:void process(com.android.tools.r8.graph.DexClass):96 -> a
     109:109:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     109:109:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    109:109:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):223 -> a
-    109:109:void process(com.android.tools.r8.graph.DexClass):97 -> a
-    110:158:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):223:271 -> a
-    110:158:void process(com.android.tools.r8.graph.DexClass):97 -> a
-    159:159:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    159:159:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):271 -> a
-    159:159:void process(com.android.tools.r8.graph.DexClass):97 -> a
-    160:167:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):273:280 -> a
-    160:167:void process(com.android.tools.r8.graph.DexClass):97 -> a
-    168:180:void process(com.android.tools.r8.graph.DexClass):98:110 -> a
-    181:182:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):114:115 -> a
-    183:183:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    183:183:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):115 -> a
-    184:188:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):118:122 -> a
-    189:196:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexMethod):146:153 -> a
-    189:196:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):123 -> a
-    197:197:com.android.tools.r8.graph.DexMethod retargetMethod(com.android.tools.r8.graph.DexMethod):151:151 -> a
-    197:197:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):123 -> a
-    198:209:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):126:137 -> a
-    210:214:void hideCandidates(java.util.List,java.util.List,java.util.List):290:294 -> a
-    215:215:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
-    215:215:void hideCandidates(java.util.List,java.util.List,java.util.List):294 -> a
-    216:229:void hideCandidates(java.util.List,java.util.List,java.util.List):296:309 -> a
-    230:230:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
-    230:230:void hideCandidates(java.util.List,java.util.List,java.util.List):294 -> a
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.w.c.d:
+    109:109:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):205 -> a
+    109:109:void process(com.android.tools.r8.graph.DexClass):96 -> a
+    110:146:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):205:241 -> a
+    110:146:void process(com.android.tools.r8.graph.DexClass):96 -> a
+    147:147:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    147:147:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):241 -> a
+    147:147:void process(com.android.tools.r8.graph.DexClass):96 -> a
+    148:155:java.util.List collectMethodsToImplement(com.android.tools.r8.graph.DexClass,boolean):243:250 -> a
+    148:155:void process(com.android.tools.r8.graph.DexClass):96 -> a
+    156:168:void process(com.android.tools.r8.graph.DexClass):97:109 -> a
+    169:170:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):113:114 -> a
+    171:171:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    171:171:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):114 -> a
+    172:186:com.android.tools.r8.graph.DexEncodedMethod addForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):117:131 -> a
+    187:191:void hideCandidates(java.util.List,java.util.List,java.util.List):260:264 -> a
+    192:192:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    192:192:void hideCandidates(java.util.List,java.util.List,java.util.List):264 -> a
+    193:206:void hideCandidates(java.util.List,java.util.List,java.util.List):266:279 -> a
+    207:207:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
+    207:207:void hideCandidates(java.util.List,java.util.List,java.util.List):264 -> a
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.w.d.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
     boolean $assertionsDisabled -> c
@@ -28434,7 +28434,7 @@
     156:156:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):248 -> a
     157:157:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):252:252 -> a
     1:1:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):96:96 -> b
-com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring -> com.android.tools.r8.w.c.e:
+com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring -> com.android.tools.r8.w.d.e:
     boolean $assertionsDisabled -> i
     java.util.Map metNestHosts -> h
     1:1:void <clinit>():40:40 -> <clinit>
@@ -28447,7 +28447,7 @@
     20:20:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> a
     20:20:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):69 -> a
     21:31:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):71:81 -> a
-    32:32:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    32:32:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:40 -> a
     32:32:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):81 -> a
     33:37:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):80:84 -> a
     38:45:void rewriteNestBasedAccesses(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):83:90 -> a
@@ -28472,7 +28472,7 @@
     87:87:boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List):154:154 -> a
     88:88:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):159:159 -> a
     89:89:void reportIncompleteNest(java.util.List):164:164 -> a
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.w.c.g:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.w.d.g:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():19:23 -> <init>
@@ -28493,8 +28493,8 @@
     42:42:java.util.List createCandidatesList():116:116 -> a
     1:8:java.util.List createFullList():123:130 -> b
     1:3:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection wrapInCollection():136:138 -> c
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.w.c.f:
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.w.c.g$a:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.w.d.f:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.w.d.g$a:
     java.util.List hidden -> b
     java.util.List live -> a
     com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection EMPTY -> c
@@ -28504,93 +28504,90 @@
     1:1:java.util.List access$000(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):30:30 -> a
     2:4:com.android.tools.r8.graph.DexMethod getSingleCandidate(com.android.tools.r8.graph.DexMethod):48:50 -> a
     1:1:java.util.List access$100(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):30:30 -> b
-com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.w.c.h:
+com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.w.d.h:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map callBackMethods -> d
     com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> c
-    java.util.Set trackedCallBackAPIs -> e
-    java.util.Set trackedAPIs -> f
-    boolean $assertionsDisabled -> g
-    1:1:void <clinit>():60:60 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):71:71 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.AppView):67:80 -> <init>
-    1:1:void desugar(com.android.tools.r8.ir.code.IRCode):86:86 -> a
-    2:9:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):129:136 -> a
-    2:9:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
+    boolean $assertionsDisabled -> e
+    1:1:void <clinit>():59:59 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):68:68 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):66:71 -> <init>
+    1:1:void desugar(com.android.tools.r8.ir.code.IRCode):76:76 -> a
+    2:9:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):119:126 -> a
+    2:9:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
     10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    10:10:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):136 -> a
-    10:10:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
-    11:15:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):140:144 -> a
-    11:15:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
-    16:37:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):183:204 -> a
-    16:37:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):144 -> a
-    16:37:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
-    38:39:void addCallBackSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):209:210 -> a
-    38:39:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):205 -> a
-    38:39:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):144 -> a
-    38:39:void desugar(com.android.tools.r8.ir.code.IRCode):90 -> a
-    40:56:void desugar(com.android.tools.r8.ir.code.IRCode):92:108 -> a
-    57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    57:57:void desugar(com.android.tools.r8.ir.code.IRCode):108 -> a
-    58:63:void desugar(com.android.tools.r8.ir.code.IRCode):109:114 -> a
-    64:78: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):289:303 -> a
-    64:78:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    79:80:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):420:421 -> a
-    79:80: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):306 -> a
-    79:80:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    81:81:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444:444 -> a
-    81:81:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):421 -> a
-    81:81: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):306 -> a
-    81:81:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    82:82:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    82:82:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444 -> a
-    82:82:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):421 -> a
-    82:82: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):306 -> a
-    82:82:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    83:85:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):422:424 -> a
-    83:85: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):306 -> a
-    83:85:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    86:109: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):309:332 -> a
-    86:109:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    110:113:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):411:414 -> a
-    110:113: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):334 -> a
-    110:113:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    114:114:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444:444 -> a
-    114:114:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):414 -> a
-    114:114: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):334 -> a
-    114:114:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    115:115:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    115:115:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):444 -> a
-    115:115:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):414 -> a
-    115: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):334 -> a
-    115:115:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    116:116:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):415:415 -> a
-    116:116: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):334 -> a
-    116:116:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    117:138: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):333:354 -> a
-    117:138:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    139:139: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
-    139:139: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):350 -> a
-    139:139:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    140:141: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):356:357 -> a
-    140:141:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    142:162: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):356:376 -> a
-    142:162:void desugar(com.android.tools.r8.ir.code.IRCode):115 -> a
-    163:172:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):150:159 -> a
-    173:173:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    173:173:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):159 -> a
-    174:184:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):163:173 -> a
-    185:199: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):215:229 -> a
-    200:208:void generateWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):235:243 -> a
-    209:215:void generateTrackDesugaredAPIWarnings(java.util.Set,java.lang.String):248:254 -> a
-    216:220:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):258:262 -> a
-    221:223:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):278:280 -> a
-    224:241:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):385:402 -> a
-    242:252: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):430:440 -> a
-    253:253: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):439:439 -> a
-    254:255:boolean canConvert(com.android.tools.r8.graph.DexType):448:449 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.w.c.i:
+    10:10:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):126 -> a
+    10:10:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    11:15:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):130:134 -> a
+    11:15:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    16:34:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):173:191 -> a
+    16:34:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):134 -> a
+    16:34:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    35:36:void addCallBackSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):196:197 -> a
+    35:36:void generateCallBack(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):192 -> a
+    35:36:void generateCallBackIfNeeded(com.android.tools.r8.ir.code.IRCode):134 -> a
+    35:36:void desugar(com.android.tools.r8.ir.code.IRCode):80 -> a
+    37:53:void desugar(com.android.tools.r8.ir.code.IRCode):82:98 -> a
+    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    54:54:void desugar(com.android.tools.r8.ir.code.IRCode):98 -> a
+    55:60:void desugar(com.android.tools.r8.ir.code.IRCode):99:104 -> a
+    61:72: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):262:273 -> a
+    61:72:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    73:74:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):390:391 -> a
+    73:74: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):276 -> a
+    73:74:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    75:75:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414:414 -> a
+    75:75:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    75:75: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):276 -> a
+    75:75:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    76:76:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    76:76:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):391 -> a
+    76:76: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):276 -> a
+    76:76:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    77:79:com.android.tools.r8.ir.code.Instruction createReturnConversionAndReplaceUses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):392:394 -> a
+    77:79: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):276 -> a
+    77:79:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    80:103: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):279:302 -> a
+    80:103:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    104:107:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):381:384 -> a
+    104:107:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    104:107:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    108:108:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414:414 -> a
+    108:108:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    108:108:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    108:108:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    109:109:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    109:109:com.android.tools.r8.ir.code.Value createConversionValue(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.DexType):414 -> a
+    109:109:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):384 -> a
+    109:109:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    109:109:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    110:110:com.android.tools.r8.ir.code.Instruction createParameterConversion(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):385:385 -> a
+    110:110:void rewriteLibraryInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,java.util.ListIterator):304 -> a
+    110:110:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    111:132: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):303:324 -> a
+    111:132:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    133:133: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
+    133:133: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):320 -> a
+    133:133:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    134:135: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):326:327 -> a
+    134:135:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    136:156: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):326:346 -> a
+    136:156:void desugar(com.android.tools.r8.ir.code.IRCode):105 -> a
+    157:166:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):140:149 -> a
+    167:167:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    167:167:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):149 -> a
+    168:178:boolean overridesLibraryMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):153:163 -> a
+    179:193: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):202:216 -> a
+    194:198:void generateWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):222:226 -> a
+    199:203:void warnInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):231:235 -> a
+    204:206:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):251:253 -> a
+    207:224:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):355:372 -> a
+    225:235: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):400:410 -> a
+    236:236: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):409:409 -> a
+    237:238:boolean canConvert(com.android.tools.r8.graph.DexType):418:419 -> a
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.w.d.i:
     java.util.Map rewritePrefix -> c
     java.util.Map emulateLibraryInterface -> d
     java.util.List dontRewriteInvocation -> h
@@ -28614,7 +28611,7 @@
     1:1:java.util.Map getRewritePrefix():85:85 -> g
     1:1:boolean isLibraryCompilation():81:81 -> h
     1:9:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration empty():40:48 -> i
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.w.c.i$a:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.w.d.i$a:
     java.util.Map rewritePrefix -> d
     boolean $assertionsDisabled -> j
     java.util.List dontRewriteInvocation -> i
@@ -28662,7 +28659,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):191 -> f
     6:6:int sharpIndex(java.lang.String,java.lang.String):191:191 -> f
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.w.c.j:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.w.d.j:
     int minAPILevel -> d
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder configurationBuilder -> a
     com.android.tools.r8.utils.Reporter reporter -> b
@@ -28703,7 +28700,7 @@
     88:88:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):48:48 -> a
     89:91:java.lang.RuntimeException com.android.tools.r8.utils.Reporter.fatalError(com.android.tools.r8.Diagnostic):71:73 -> a
     89:91:com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration parse(com.android.tools.r8.StringResource):48 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.w.c.k:
+com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.w.d.k:
     java.util.Map typeWrappers -> b
     java.util.Map vivifiedTypeWrappers -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -28828,7 +28825,7 @@
     1:1:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):147:147 -> c
     1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):127:127 -> d
     1:1:boolean isSynthesizedWrapper(com.android.tools.r8.graph.DexType):123:123 -> e
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.w.c.l:
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.w.d.l:
     java.util.concurrent.ConcurrentHashMap nearestEmulatedInterfaceCache -> g
     java.util.Set synthesizedMethods -> h
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -28855,380 +28852,373 @@
     16:23:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):159:166 -> a
     24:24:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):165:165 -> a
     25:25:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):163:163 -> a
-    26:65:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):177:216 -> a
-    66:66:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):524:524 -> a
-    66:66:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):217 -> a
-    67:71:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):228:232 -> a
-    72:72:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
-    72:72:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233 -> a
-    73:73:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):234:234 -> a
-    74:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):232:240 -> a
-    83:83:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
-    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
-    84:84:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    84:84:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> a
-    84:84:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
-    85:85:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
-    85:85:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
-    86:86:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
-    87:118:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:271 -> a
-    119:120:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
-    119:120:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):270 -> a
-    121:121:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:272 -> a
-    122:122:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    122:122:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
-    123:123:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    123:123:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    123:123:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
-    124:125:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):275:276 -> a
-    126:144:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:290 -> a
-    145:146:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
-    145:146:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289 -> a
-    147:147:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:291 -> a
-    148:148:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    148:148:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
-    149:149:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    149:149:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    149:149:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
-    150:150:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293:293 -> a
-    151:189:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:329 -> a
-    190:190:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    190:190:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
-    191:191:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    191:191:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    191:191:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
-    192:192:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331:331 -> a
-    193:202:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):329:338 -> a
-    203:203:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> a
-    203:203:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
-    204:204:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> a
-    204:204:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> a
-    204:204:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
-    205:205:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):340:340 -> a
-    206:206:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):338:338 -> a
-    207:209:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):312:314 -> a
-    210:210:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
-    210:210:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    210:210:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314 -> a
-    211:249:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:352 -> a
-    250:250:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    250:250:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):352 -> a
-    251:251:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:362 -> a
-    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    252:252:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362 -> a
-    253:265:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:374 -> a
-    266:266:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):236:236 -> a
-    267:267: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):386:386 -> a
-    268:268:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    268:268: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):386 -> a
-    269:270:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):386:387 -> a
-    271:272:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):537:538 -> a
-    271:272: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):387 -> a
-    273:273:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):388:388 -> a
-    274:274:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> a
-    274:274:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):388 -> a
-    275:276:void rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):388:389 -> a
-    277:279: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):629:631 -> a
-    277:279: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):391 -> a
-    280:280: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):628:628 -> a
-    280:280: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):391 -> a
-    281:282: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):392:393 -> a
-    283:283: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):389:389 -> a
-    284:284:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):464:464 -> a
-    285:285:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    285:285:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):464 -> a
-    286:287:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):465:466 -> a
-    288:288:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> a
-    288:288:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):468 -> a
-    289:303:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):472:486 -> a
-    304:304:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    304:304:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):486 -> a
-    305:318:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):490:503 -> a
-    319:319:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    319:319:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
-    320:320:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    320:320:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    320:320:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
-    321:335:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503:517 -> a
-    336:336:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    336:336:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
-    337:337:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    337:337:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    337:337:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
-    338:338:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517:517 -> a
-    339:339:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:528 -> a
-    340:340:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    340:340:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528 -> a
-    341:345:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:532 -> a
-    346:351:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):587:592 -> a
-    352:352:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    352:352:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):592 -> a
-    353:362:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):594:603 -> a
-    363:363:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    363:363:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):603 -> a
-    364:364:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):605:605 -> a
-    365:366:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):755:756 -> a
+    26:81:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):177:232 -> a
+    82:82:com.android.tools.r8.graph.DexMethod staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
+    82:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):233 -> a
+    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):234:234 -> a
+    84:92:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):232:240 -> a
+    93:93:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
+    93:93:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    94:94:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    94:94:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> a
+    94:94:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    95:95:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
+    95:95:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241 -> a
+    96:96:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    97:128:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):240:271 -> a
+    129:130:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
+    129:130:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):270 -> a
+    131:131:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:272 -> a
+    132:132:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    132:132:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
+    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    133:133:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    133:133:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):274 -> a
+    134:135:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):275:276 -> a
+    136:154:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):272:290 -> a
+    155:156:com.android.tools.r8.graph.DexMethod amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
+    155:156:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):289 -> a
+    157:157:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:291 -> a
+    158:158:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    158:158:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
+    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    159:159:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    159:159:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
+    160:160:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293:293 -> a
+    161:199:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:329 -> a
+    200:200:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    200:200:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
+    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    201:201:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    201:201:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330 -> a
+    202:202:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331:331 -> a
+    203:212:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):329:338 -> a
+    213:213:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> a
+    213:213:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
+    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> a
+    214:214:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> a
+    214:214:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):339 -> a
+    215:215:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):340:340 -> a
+    216:216:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):338:338 -> a
+    217:219:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):312:314 -> a
+    220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> a
+    220:220:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    220:220:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314 -> a
+    221:259:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:352 -> a
+    260:260:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    260:260:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):352 -> a
+    261:261:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:362 -> a
+    262:262:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    262:262:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362 -> a
+    263:275:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):362:374 -> a
+    276:276:java.util.Set lambda$rewriteMethodReferences$0(com.android.tools.r8.graph.DexLibraryClass):236:236 -> a
+    277:277: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):386:386 -> a
+    278:278:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    278:278: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):386 -> a
+    279:280: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):386:387 -> a
+    281:282:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):537:538 -> a
+    281:282: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):387 -> a
+    283:283: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):388:388 -> a
+    284:284:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> a
+    284:284: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):388 -> a
+    285:286: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):388:389 -> a
+    287:289: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):629:631 -> a
+    287:289: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):391 -> a
+    290:290: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):628:628 -> a
+    290:290: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):391 -> a
+    291:292: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):392:393 -> a
+    293:293: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):389:389 -> a
+    294:294:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):464:464 -> a
+    295:295:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    295:295:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):464 -> a
+    296:297:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):465:466 -> a
+    298:298:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> a
+    298:298:boolean isMatchingEmulatedInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):468 -> a
+    299:313:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):472:486 -> a
+    314:314:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    314:314:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):486 -> a
+    315:328:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):490:503 -> a
+    329:329:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    329:329:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
+    330:330:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    330:330:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    330:330:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503 -> a
+    331:345:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):503:517 -> a
+    346:346:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    346:346:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
+    347:347:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    347:347:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    347:347:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517 -> a
+    348:348:com.android.tools.r8.graph.DexType minimalInterfaceOf(java.util.Set):517:517 -> a
+    349:349:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):524:524 -> a
+    350:355:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):587:592 -> a
+    356:356:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    356:356:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):592 -> a
+    357:366:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):594:603 -> a
     367:367:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    367:367:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):756 -> a
-    368:372:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):760:764 -> a
-    373:373:java.lang.String getCompanionClassDescriptor(java.lang.String):771:771 -> a
-    374:377:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:779 -> a
-    378:382:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):788:792 -> a
-    383:392:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):837:846 -> a
-    393:393:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):843:843 -> a
-    394:394:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    395:395:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    396:396:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    396:396:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    397:399:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):926:928 -> a
-    400:400:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964:964 -> a
-    401:401:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    401:401:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964 -> a
-    402:405:java.util.Map processEmulatedInterfaceHierarchy():575:578 -> a
-    402:405:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):556 -> a
-    402:405:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    406:407:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):557:558 -> a
-    406:407:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    408:408:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    408:408:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):558 -> a
-    408:408:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    409:413:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):560:564 -> a
-    409:413:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    414:419:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:641 -> a
-    414:419:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    414:419:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    420:426:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
-    420:426:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    420:426:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    427:427:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    427:427:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
-    427:427:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    427:427:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    428:428:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
-    428:428:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    428:428:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    429:447:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:665 -> a
-    429:447:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    429:447:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    448:448:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    448:448:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):665 -> a
-    448:448:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    448:448:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    449:449:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666:666 -> a
-    449:449:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    449:449:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    450:456:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):612:618 -> a
-    450:456:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
-    450:456:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    450:456:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    457:457:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    457:457:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):618 -> a
-    457:457:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
-    457:457:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    457:457:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    458:458:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):620:620 -> a
-    458:458:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
-    458:458:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    458:458:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    459:463:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
-    459:463:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    459:463:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    464:466:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1284:1286 -> a
-    464:466:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
-    464:466:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    464:466:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    467:467:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
-    467:467:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    467:467:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    468:468:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
-    468:468:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    468:468:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    469:469:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
-    469:469:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    469:469:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    470:470:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1284:1284 -> a
-    470:470:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
-    470:470:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    470:470:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    471:472:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:681 -> a
-    471:472:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    471:472:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    473:473:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    473:473:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):681 -> a
+    367:367:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):603 -> a
+    368:368:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):605:605 -> a
+    369:370:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):755:756 -> a
+    371:371:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    371:371:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):756 -> a
+    372:376:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):760:764 -> a
+    377:377:java.lang.String getCompanionClassDescriptor(java.lang.String):771:771 -> a
+    378:381:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:779 -> a
+    382:386:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):788:792 -> a
+    387:396:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):837:846 -> a
+    397:397:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):843:843 -> a
+    398:398:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    399:399:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
+    400:400:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    400:400:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
+    401:403:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.util.List,com.android.tools.r8.graph.DexType):926:928 -> a
+    404:404:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964:964 -> a
+    405:405:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    405:405:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964 -> a
+    406:409:java.util.Map processEmulatedInterfaceHierarchy():575:578 -> a
+    406:409:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):556 -> a
+    406:409:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    410:411:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):557:558 -> a
+    410:411:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    412:412:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    412:412:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):558 -> a
+    412:412:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    413:417:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):560:564 -> a
+    413:417:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    418:423:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):636:641 -> a
+    418:423:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    418:423:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    424:430:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):640:646 -> a
+    424:430:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    424:430:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    431:431:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    431:431:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648 -> a
+    431:431:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    431:431:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    432:432:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):648:648 -> a
+    432:432:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    432:432:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    433:451:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):647:665 -> a
+    433:451:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    433:451:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    452:452:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    452:452:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):665 -> a
+    452:452:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    452:452:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    453:453:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666:666 -> a
+    453:453:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    453:453:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    454:460:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):612:618 -> a
+    454:460:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    454:460:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    454:460:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    461:461:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    461:461:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):618 -> a
+    461:461:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    461:461:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    461:461:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    462:462:boolean implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):620:620 -> a
+    462:462:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):666 -> a
+    462:462:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    462:462:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    463:467:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:671 -> a
+    463:467:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    463:467:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    468:470:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1266 -> a
+    468:470:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
+    468:470:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    468:470:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    471:471:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672:672 -> a
+    471:471:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    471:471:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    472:472:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):670:670 -> a
+    472:472:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    472:472:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    473:473:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):667:667 -> a
     473:473:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     473:473:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    474:476:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):682:684 -> a
-    474:476:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    474:476:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    477:477:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> a
-    477:477:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):685 -> a
+    474:474:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1264 -> a
+    474:474:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):672 -> a
+    474:474:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    474:474:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    475:476:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680:681 -> a
+    475:476:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    475:476:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    477:477:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    477:477:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):681 -> a
     477:477:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     477:477:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    478:478:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
-    478:478:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    478:478:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    479:479:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    479:479:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
-    479:479:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    479:479:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    480:480:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
-    480:480:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    480:480:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    481:483:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1284:1286 -> a
-    481:483:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
-    481:483:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    481:483:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    484:484:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
+    478:480:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):682:684 -> a
+    478:480:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    478:480:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    481:481:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> a
+    481:481:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):685 -> a
+    481:481:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    481:481:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    482:482:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
+    482:482:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    482:482:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    483:483:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
+    483:483:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690 -> a
+    483:483:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    483:483:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    484:484:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):690:690 -> a
     484:484:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     484:484:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    485:485:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
-    485:485:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    485:485:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    486:486:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
-    486:486:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    486:486:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    487:487:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1284:1284 -> a
-    487:487:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
-    487:487:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    487:487:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    488:488:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
+    485:487:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1266 -> a
+    485:487:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
+    485:487:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    485:487:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    488:488:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691:691 -> a
     488:488:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     488:488:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> 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):629:631 -> a
-    489:491:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
-    489:491:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    489:491:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> 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):628:628 -> a
-    492:492:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    489:489:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):689:689 -> a
+    489:489:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    489:489:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    490:490:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):686:686 -> a
+    490:490:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    490:490:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    491:491:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1264:1264 -> a
+    491:491:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):691 -> a
+    491:491:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    491:491:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    492:492:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:697 -> a
     492:492:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
     492:492:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    493:493:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
-    493:493:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    493:493:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    494:494:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
-    494:494:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    494:494:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    495:536:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
-    495:536:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
-    495:536:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    537:537:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
-    537:537:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566 -> a
-    537:537:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    538:539:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566:567 -> a
-    538:539:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
-    540:550:void duplicateEmulatedInterfaces():936:946 -> a
-    540:550:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    551:556:void duplicateEmulatedInterfaces():945:950 -> a
-    551:556:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
-    557:557:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:971 -> a
-    558:559:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1026:1027 -> a
-    558:559:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    560:561:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
-    560:561:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1028 -> a
-    560:561:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    562:565:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1029:1032 -> a
-    562:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
-    566:572:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:977 -> a
-    573:575:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1009:1011 -> a
-    573:575:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
-    576:577:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
-    576:577:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1012 -> a
-    576:577:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
-    578:587:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1013:1022 -> a
-    578:587:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
-    588:592:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978:982 -> a
-    593:593:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
-    593:593:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    594:598:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982:986 -> a
-    599:599:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    599:599:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
-    600:601:void renameEmulatedInterfaces():881:882 -> a
-    600:601:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    602:610:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):894:902 -> a
-    602:610:void renameEmulatedInterfaces():883 -> a
-    602:610:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    611:614:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):913:916 -> a
-    611:614:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
-    611:614:void renameEmulatedInterfaces():883 -> a
-    611:614:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    615:615:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904:904 -> a
-    615:615:void renameEmulatedInterfaces():883 -> a
-    615:615:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    616:616:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    616:616:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904 -> a
-    616:616:void renameEmulatedInterfaces():883 -> a
-    616:616:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    617:617:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906:906 -> a
-    617:617:void renameEmulatedInterfaces():883 -> a
-    617:617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    618:620:void renameEmulatedInterfaces():884:886 -> a
-    618:620:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    621:623:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):920:922 -> a
-    621:623:void renameEmulatedInterfaces():887 -> a
-    621:623:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
-    624:624:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):990:990 -> a
-    625:627:void clear():997:999 -> a
-    625:627:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):993 -> a
-    628:642:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1036:1050 -> a
-    643:643:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1043:1043 -> a
-    644:644:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067:1067 -> a
-    645:645:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
-    645:645:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067 -> a
-    646:649:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1070:1073 -> a
-    650:650: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):1089:1089 -> a
-    651:652:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1102:1103 -> a
-    651:652: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):1093 -> a
-    653:653:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    653:653: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):1103 -> a
-    653:653: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):1093 -> a
-    654:655:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1059:1060 -> a
-    654:655: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):1105 -> a
-    654:655: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):1093 -> a
-    656:658: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):1106:1108 -> a
-    656:658: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):1093 -> a
-    659:659:boolean isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):524:524 -> a
-    659:659: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):1114 -> a
-    659:659: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):1093 -> a
-    660:666: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):1119:1125 -> a
-    660:666: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):1093 -> a
-    667:667:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
-    667:667: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):1125 -> a
-    667:667: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):1093 -> a
-    668:668:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    668:668:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
-    668:668: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):1125 -> a
-    668:668: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):1093 -> a
-    669:669:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    669:669:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
-    669:669: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):1125 -> a
-    669:669: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):1093 -> a
-    670:670:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
-    670:670: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):1125 -> a
-    670:670: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):1093 -> a
-    671:687: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):1129:1145 -> a
-    671:687: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):1093 -> a
-    688:688: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):1094:1094 -> a
-    689:691: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):1109:1111 -> a
-    689:691: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):1093 -> a
-    692:692:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    692:692: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):1111 -> a
-    692:692: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):1093 -> a
-    693:693:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1111:1111 -> a
-    693:693:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
-    694:694:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
-    695:695:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    695:695:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
-    696:696:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    696:696:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
-    697:697:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
+    493:495: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):629:631 -> a
+    493:495:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    493:495:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    493:495:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    496:496: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):628:628 -> a
+    496:496:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699 -> a
+    496:496:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    496:496:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    497:497:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):699:699 -> a
+    497:497:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    497:497:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    498:498:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):698:698 -> a
+    498:498:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    498:498:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    499:540:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:738 -> a
+    499:540:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):563 -> a
+    499:540:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    541:541:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
+    541:541:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566 -> a
+    541:541:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    542:543:void generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566:567 -> a
+    542:543:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):965 -> a
+    544:554:void duplicateEmulatedInterfaces():936:946 -> a
+    544:554:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    555:560:void duplicateEmulatedInterfaces():945:950 -> a
+    555:560:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    561:561:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:971 -> a
+    562:563:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1026:1027 -> a
+    562:563:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    564:565:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
+    564:565:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1028 -> a
+    564:565:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    566:569:java.util.Set processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1029:1032 -> a
+    566:569:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971 -> a
+    570:576:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):971:977 -> a
+    577:579:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1009:1011 -> a
+    577:579:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    580:581:boolean shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1004:1005 -> a
+    580:581:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1012 -> a
+    580:581:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    582:591:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor):1013:1022 -> a
+    582:591:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978 -> a
+    592:596:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):978:982 -> a
+    597:597:boolean isInMainDexList(com.android.tools.r8.graph.DexType):815:815 -> a
+    597:597:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
+    598:602:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982:986 -> a
+    603:603:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    603:603:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):986 -> a
+    604:605:void renameEmulatedInterfaces():881:882 -> a
+    604:605:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    606:614:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):894:902 -> a
+    606:614:void renameEmulatedInterfaces():883 -> a
+    606:614:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    615:618:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):913:916 -> a
+    615:618:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
+    615:618:void renameEmulatedInterfaces():883 -> a
+    615:618:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    619:619:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904:904 -> a
+    619:619:void renameEmulatedInterfaces():883 -> a
+    619:619:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    620:620:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    620:620:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904 -> a
+    620:620:void renameEmulatedInterfaces():883 -> a
+    620:620:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    621:621:com.android.tools.r8.graph.DexType inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906:906 -> a
+    621:621:void renameEmulatedInterfaces():883 -> a
+    621:621:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    622:624:void renameEmulatedInterfaces():884:886 -> a
+    622:624:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    625:627:void renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):920:922 -> a
+    625:627:void renameEmulatedInterfaces():887 -> a
+    625:627:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):987 -> a
+    628:628:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):990:990 -> a
+    629:631:void clear():997:999 -> a
+    629:631:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):993 -> a
+    632:646:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1036:1050 -> a
+    647:647:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1043:1043 -> a
+    648:648:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067:1067 -> a
+    649:649:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
+    649:649:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1067 -> a
+    650:653:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1070:1073 -> a
+    654:654: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):1089:1089 -> a
+    655:656:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1102:1103 -> a
+    655:656: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):1093 -> a
+    657:657:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    657:657: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):1103 -> a
+    657:657: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):1093 -> a
+    658:659:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1059:1060 -> a
+    658:659: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):1105 -> a
+    658:659: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):1093 -> a
+    660:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1106:1125 -> a
+    660:679:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    680:680:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
+    680:680:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1125 -> a
+    680:680:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093 -> a
+    681:681:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    681:681:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
+    681:681: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):1125 -> a
+    681:681: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):1093 -> a
+    682:682:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    682:682:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
+    682:682: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):1125 -> a
+    682:682: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):1093 -> a
+    683:683:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
+    683:683: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):1125 -> a
+    683:683: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):1093 -> a
+    684:700: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):1129:1145 -> a
+    684:700: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):1093 -> a
+    701:701: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):1094:1094 -> a
+    702:704: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):1109:1111 -> a
+    702:704: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):1093 -> a
+    705:705:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    705:705: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):1111 -> a
+    705:705: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):1093 -> a
+    706:706: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):1111:1111 -> a
+    706:706: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):1093 -> a
+    707:707:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1150:1150 -> a
+    708:708:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    708:708:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1152 -> a
+    709:709:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
+    709:709:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1153 -> a
+    710:710:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):1155:1155 -> a
     1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):171:171 -> b
-    2:3:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
-    4:4:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):742:742 -> b
-    4:4:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750 -> b
-    5:5:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):751:751 -> b
-    6:6:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> b
-    7:7:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> b
-    7:7:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> b
+    2:2:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:528 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
+    3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528 -> b
+    4:8:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):528:532 -> b
+    9:10:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
+    11:11:java.lang.String getEmulateLibraryInterfaceClassDescriptor(java.lang.String):742:742 -> b
+    11:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750 -> b
+    12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):751:751 -> b
+    13:13:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> b
+    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> b
+    14:14:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> b
     1:1:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807:807 -> c
     2:2:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> c
     2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):807 -> c
@@ -29269,12 +29259,12 @@
     35:46:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):406 -> e
     47:47:com.android.tools.r8.graph.DexType nearestEmulatedInterfaceImplementingWithCache(com.android.tools.r8.graph.DexMethod):408:408 -> e
     48:53:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):546:551 -> e
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.w.c.l$a:
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.w.d.l$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>():126:130 -> <clinit>
     1:1:void <init>(java.lang.String,int):122:122 -> <init>
-com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.w.c.m:
+com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.w.d.m:
     java.util.Map syntheticClasses -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> b
@@ -29326,7 +29316,7 @@
     212:212:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):222 -> a
     213:227:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):224:238 -> a
     228:280:java.util.List process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):215:267 -> a
-com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.w.c.n:
+com.android.tools.r8.ir.desugar.LambdaBridgeMethodSourceCode -> com.android.tools.r8.w.d.n:
     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
@@ -29338,7 +29328,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.LambdaClass -> com.android.tools.r8.w.c.u:
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.w.d.u:
     java.util.concurrent.atomic.AtomicBoolean addToMainDexList -> i
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexField lambdaField -> g
@@ -29410,7 +29400,7 @@
     39:47:com.android.tools.r8.graph.DexEncodedField[] synthesizeInstanceFields():290:298 -> e
     39:47:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():167 -> e
     48:59:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():168:179 -> e
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.w.c.o:
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.w.d.o:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():665:665 -> <clinit>
@@ -29421,14 +29411,14 @@
     3:26:boolean ensureAccessibility():675:698 -> a
     27:27:boolean ensureAccessibility():696:696 -> a
     28:28:com.android.tools.r8.ir.conversion.SourceCode lambda$ensureAccessibility$0(com.android.tools.r8.ir.code.Position):691:691 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.w.c.p:
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.w.d.p:
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):624:625 -> <init>
     1:6:boolean ensureAccessibility():632:637 -> a
     7:7:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):157:157 -> a
     7:7:boolean ensureAccessibility():638 -> a
     8:22:boolean ensureAccessibility():641:655 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.w.c.q:
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.w.d.q:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():574:574 -> <clinit>
@@ -29438,16 +29428,16 @@
     7:7:boolean ensureAccessibility():590 -> a
     8:25:boolean ensureAccessibility():593:610 -> a
     26:33:boolean ensureAccessibility():609:616 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.w.c.r:
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.w.d.r:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):543:543 -> <init>
     boolean ensureAccessibility() -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.w.c.s:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.w.d.s:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> e
     1:1:void <clinit>():553:553 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass):555:556 -> <init>
     1:5:boolean ensureAccessibility():562:566 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.w.c.t:
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.w.d.t:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> c
     com.android.tools.r8.graph.DexMethod callTarget -> a
@@ -29456,7 +29446,7 @@
     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):494:498 -> <init>
     boolean ensureAccessibility() -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):505:505 -> a
-com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.w.c.v:
+com.android.tools.r8.ir.desugar.LambdaClassConstructorSourceCode -> com.android.tools.r8.w.d.v:
     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>
@@ -29465,7 +29455,7 @@
     7:7:void lambda$prepareInstructions$1(int,com.android.tools.r8.ir.conversion.IRBuilder):29:29 -> c
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):38:38 -> d
     1:17:void prepareInstructions():25:41 -> h
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.w.c.w:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.w.d.w:
     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>
@@ -29475,13 +29465,13 @@
     1:8:boolean equals(java.lang.Object):63:70 -> equals
     1:25:void prepareInstructions():25:49 -> h
     1:2:int hashCode():57:58 -> hashCode
-com.android.tools.r8.ir.desugar.LambdaCreateInstanceSourceCode -> com.android.tools.r8.w.c.x:
+com.android.tools.r8.ir.desugar.LambdaCreateInstanceSourceCode -> com.android.tools.r8.w.d.x:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Position):18:18 -> <init>
     1:1:void lambda$prepareInstructions$1(java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):37:37 -> a
     1:1:void lambda$prepareInstructions$0(int,com.android.tools.r8.ir.conversion.IRBuilder):25:25 -> b
     1:1:void lambda$prepareInstructions$2(int,com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> c
     1:21:void prepareInstructions():24:44 -> h
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.w.c.y:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.w.d.y:
     java.util.Set bridges -> g
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.ir.desugar.LambdaDescriptor MATCH_FAILED -> j
@@ -29528,7 +29518,7 @@
     95:96:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):267:268 -> b
     1:4:com.android.tools.r8.graph.DexType getImplReceiverType():85:88 -> c
     5:6:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfo):225:226 -> c
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.w.c.z:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.w.d.z:
     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>
@@ -29537,7 +29527,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):437:437 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):435:435 -> 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
@@ -29547,12 +29537,12 @@
     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():513:513 -> 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():335:335 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     64:64:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():513 -> a
     64:64:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     65:65:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:522 -> a
     65:65:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     66:66:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522 -> a
     66:66:void lambda$prepareInstructions$2(com.android.tools.r8.ir.desugar.LambdaClass$Target,com.android.tools.r8.graph.DexMethod,java.util.List,java.util.List,com.android.tools.r8.ir.conversion.IRBuilder):235 -> a
     67:77:boolean com.android.tools.r8.ir.desugar.LambdaClass$Target.holderIsInterface():522:532 -> a
@@ -29564,7 +29554,7 @@
     95:112:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):289:306 -> a
     113:113:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57:57 -> a
     113:113:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
-    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):437:437 -> a
+    114:114:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):435:435 -> a
     114:114:com.android.tools.r8.graph.DexType getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):57 -> a
     114:114:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):308 -> a
     115:156:int adjustType(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):310:351 -> a
@@ -29610,7 +29600,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.LambdaRewriter -> com.android.tools.r8.w.c.B:
+com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.w.d.B:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString constructorName -> e
@@ -29636,12 +29626,12 @@
     41:42:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):164:165 -> a
     43:54: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):377:388 -> a
     43:54:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
-    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    55:55:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     55:55: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):387 -> a
     55:55:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
     56:89: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):390:423 -> a
     56:89:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
-    90:90:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    90:90: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):40:40 -> a
     90:90: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):423 -> a
     90:90:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):170 -> a
     91:116: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):425:450 -> a
@@ -29656,75 +29646,75 @@
     123:123:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
     124:126:void desugarLambdas(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175:177 -> a
     127:134:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):185:192 -> a
-    135:140:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):470:475 -> a
-    135:140:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    141:141:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):474 -> a
-    141:141:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    142:159:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):480:497 -> a
-    142:159:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    160:161:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
-    160:161:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499 -> a
-    160:161:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    162:163:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499:500 -> a
-    162:163:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
-    164:166:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):200:202 -> a
-    167:167:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):201:201 -> a
-    168:176:boolean removeLambdaDeserializationMethods(java.lang.Iterable):210:218 -> a
-    177:177:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
-    177:177:boolean removeLambdaDeserializationMethods(java.lang.Iterable):218 -> a
-    178:180:boolean removeLambdaDeserializationMethods(java.lang.Iterable):219:221 -> a
-    181:187:void adjustAccessibility():237:243 -> a
-    188:188:void adjustAccessibility():242:242 -> a
-    189:190:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):252:253 -> a
-    191:200:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):259:268 -> a
-    201:201:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):265:265 -> a
-    202:206:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):287:291 -> a
-    207:213:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
-    207:213:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
-    214:214:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290:290 -> a
-    215:215:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
-    215:215:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
-    216:220:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):301:305 -> a
-    221:227:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
-    221:227:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
-    228:232:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306:310 -> a
-    233:233:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
-    233:233:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):310 -> a
-    234:241:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):311:318 -> a
-    242:252:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):338:348 -> a
-    242:252:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    253:253:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):347:347 -> a
-    253:253:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    254:254:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):346:346 -> a
-    254:254:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    255:255:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):344:344 -> a
-    255:255:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
-    256:256:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
-    256:256:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
-    257:257:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325:325 -> a
-    258:258:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    258:258:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325 -> a
-    259:259:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325:325 -> a
-    260:260:boolean isInMainDexList(com.android.tools.r8.graph.DexType):295:295 -> a
-    260:260:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):326 -> a
-    261:261:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):327:327 -> a
-    262:264:java.lang.Object getKnown(java.util.Map,java.lang.Object):352:354 -> a
+    135:145:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):465:475 -> a
+    135:145:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    146:146:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    146:146:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):474 -> a
+    146:146:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    147:164:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):480:497 -> a
+    147:164:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    165:166:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.LambdaClass.getCreateInstanceMethod():141:142 -> a
+    165:166:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499 -> a
+    165:166:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    167:168:void patchInstructionSimple(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom):499:500 -> a
+    167:168:void desugarLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeCustom,com.android.tools.r8.ir.code.IRCode):196 -> a
+    169:171:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):200:202 -> a
+    172:172:boolean verifyNoLambdasToDesugar(com.android.tools.r8.ir.code.IRCode):201:201 -> a
+    173:181:boolean removeLambdaDeserializationMethods(java.lang.Iterable):210:218 -> a
+    182:182:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):194:194 -> a
+    182:182:boolean removeLambdaDeserializationMethods(java.lang.Iterable):218 -> a
+    183:185:boolean removeLambdaDeserializationMethods(java.lang.Iterable):219:221 -> a
+    186:192:void adjustAccessibility():237:243 -> a
+    193:193:void adjustAccessibility():242:242 -> a
+    194:195:com.android.tools.r8.graph.DexProgramClass getLambdaClass(com.android.tools.r8.graph.DexType):252:253 -> a
+    196:205:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):259:268 -> a
+    206:206:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):265:265 -> a
+    207:211:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):287:291 -> a
+    212:218:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
+    212:218:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
+    219:219:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290:290 -> a
+    220:220:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
+    220:220:com.android.tools.r8.ir.desugar.LambdaDescriptor inferLambdaDescriptor(com.android.tools.r8.graph.DexCallSite):290 -> a
+    221:225:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):301:305 -> a
+    226:232:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):358:364 -> a
+    226:232:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    233:237:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306:310 -> a
+    238:238:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
+    238:238:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):310 -> a
+    239:246:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):311:318 -> a
+    247:257:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):338:348 -> a
+    247:257:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    258:258:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):347:347 -> a
+    258:258:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    259:259:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):346:346 -> a
+    259:259:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    260:260:void addRewritingPrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):344:344 -> a
+    260:260:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):321 -> a
+    261:261:java.lang.Object putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):365:365 -> a
+    261:261:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):306 -> a
+    262:262:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325:325 -> a
+    263:263:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    263:263:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325 -> a
+    264:264:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):325:325 -> a
+    265:265:boolean isInMainDexList(com.android.tools.r8.graph.DexType):295:295 -> a
+    265:265:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):326 -> a
+    266:266:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexType):327:327 -> a
+    267:269:java.lang.Object getKnown(java.util.Map,java.lang.Object):352:354 -> a
     1:1:boolean hasLambdaClassPrefix(com.android.tools.r8.graph.DexType):91:91 -> b
     2:4:java.util.Set getDesugaredCallSites():273:275 -> b
-com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.w.c.A:
+com.android.tools.r8.ir.desugar.LambdaRewriter$1 -> com.android.tools.r8.w.d.A:
     com.android.tools.r8.ir.conversion.LensCodeRewriter val$lensCodeRewriter -> a
     com.android.tools.r8.ir.desugar.LambdaRewriter this$0 -> c
     com.android.tools.r8.graph.DexEncodedMethod val$method -> b
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaRewriter,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.graph.DexEncodedMethod):125:125 -> <init>
     1:4:void registerCallSite(com.android.tools.r8.graph.DexCallSite):129:132 -> registerCallSite
-com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.w.c.C:
+com.android.tools.r8.ir.desugar.LambdaRewriterGraphLense -> com.android.tools.r8.w.d.C:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):20:24 -> <init>
     6:6:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.graph.DexItemFactory):19:19 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):31:33 -> mapInvocationType
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.w.c.D:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.w.d.D:
     java.util.Map bridges -> b
     java.util.Map getFieldBridges -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -29783,15 +29773,15 @@
     60:65:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):301:306 -> a
     66:67:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):219:220 -> a
     66:67:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    68:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1298:1300 -> a
+    68:70:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278:1280 -> a
     68:70:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     68:70:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    71:74:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1299:1302 -> a
+    71:74:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1279:1282 -> a
     71:74:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     71:74:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     75:75:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):221:221 -> a
     75:75:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
-    76:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1298:1298 -> a
+    76:76:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):1278:1278 -> a
     76:76:com.android.tools.r8.graph.DexMethod computeInitializerBridge(com.android.tools.r8.graph.DexMethod):220 -> a
     76:76:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):306 -> a
     77:84:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):308:315 -> a
@@ -29807,7 +29797,7 @@
     1:1:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):114:114 -> d
     2:15:void processNest(java.util.List):125:138 -> d
     2:15:java.lang.Object lambda$asyncProcessNest$0(com.android.tools.r8.graph.DexClass):117 -> d
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.w.c.D$a:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.w.d.D$a:
     com.android.tools.r8.graph.DexEncodedField field -> a
     boolean isGet -> b
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,boolean):431:433 -> <init>
@@ -29826,7 +29816,7 @@
     2:2:boolean isGet():454:454 -> g
     2:2:boolean isStaticGet():470 -> g
     1:1:int hashCode():438:438 -> hashCode
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.w.c.E:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.w.d.E:
     com.android.tools.r8.graph.DexClass currentClass -> a
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring this$0 -> c
     com.android.tools.r8.graph.DexMethod context -> b
@@ -29858,7 +29848,7 @@
     1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):365:365 -> registerInvokeVirtual
     1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):411:411 -> registerStaticFieldRead
     1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):416:416 -> registerStaticFieldWrite
-com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.w.c.F:
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLense -> com.android.tools.r8.w.d.F:
     java.util.Map getFieldMap -> b
     java.util.Map putFieldMap -> c
     com.android.tools.r8.graph.DexType nestConstructorType -> a
@@ -29874,14 +29864,14 @@
     1:16:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):115:130 -> lookupMethod
     1:6:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):102:107 -> lookupPrototypeChanges
     1:2:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):67:68 -> lookupPutFieldForMethod
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.w.c.G:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.w.d.G:
     1:1:void <init>():19:19 -> <init>
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
     2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto):34:38 -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.w.c.G$a:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.w.d.G$a:
     java.util.Map rewritten -> b
     java.util.Map initialPrefixes -> c
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -29929,12 +29919,12 @@
     35:36:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
     37:37:com.android.tools.r8.graph.DexType computePrefix(com.android.tools.r8.graph.DexType):131:131 -> b
     37:37:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType):107 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.w.c.H:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.w.d.H:
     1:1:void <init>():155:155 -> <init>
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.w.c.I:
+com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.w.d.I:
     boolean $assertionsDisabled -> k
     java.util.Map lensGetFieldBridges -> i
     java.util.Map lensPutFieldBridges -> j
@@ -29944,8 +29934,8 @@
     2:4:void <init>(com.android.tools.r8.graph.AppView):34:36 -> <init>
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1055 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> a
     2:2:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44 -> a
     3:4:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:45 -> a
     5:5:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.DexApplication$Builder):44:44 -> a
@@ -29961,7 +29951,7 @@
     40:46:void addDeferredBridgesAndMapMethods(java.util.Map,java.util.Map):79:85 -> a
     47:50:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):126:129 -> a
     51:54:void reportIncompleteNest(java.util.List):135:138 -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.w.c.O:
+com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.w.d.O:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -30035,8 +30025,8 @@
     165:165:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.DexMethod,java.lang.String):458 -> a
     1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.ir.desugar.StringConcatRewriter):39:39 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.w.c.J:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.w.c.N:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.w.d.J:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.w.d.N:
     java.util.ListIterator blocks -> c
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> f
     com.android.tools.r8.graph.AppView appView -> a
@@ -30056,13 +30046,13 @@
     4:4:void addChunk(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod):313:313 -> a
     5:5:void addChunk(java.lang.String,com.android.tools.r8.graph.DexMethod):317:317 -> a
     6:11:void desugar():338:343 -> a
-    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     12:12:void desugar():343 -> a
     13:13:void desugar():344:344 -> a
     14:15:void appendInstruction(com.android.tools.r8.ir.code.Instruction):308:309 -> a
     14:15:void desugar():344 -> a
     16:17:void desugar():347:348 -> 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):38:38 -> 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):40:40 -> a
     18:18:void desugar():348 -> a
     19:20:void appendInstruction(com.android.tools.r8.ir.code.Instruction):308:309 -> a
     19:20:void desugar():347 -> a
@@ -30072,30 +30062,30 @@
     25:25:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):413:413 -> a
     25:25:void desugar():352 -> a
     26:35:void desugar():356:365 -> a
-    36:36:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    36:36:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     36:36:void desugar():365 -> a
     37:38:void desugar():369:370 -> a
     39:69:void desugar():369:399 -> a
     1:1:com.android.tools.r8.ir.code.IRCode access$600(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder):283:283 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.w.c.K:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.w.d.K:
     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.w.c.L:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.w.d.L:
     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.w.c.M:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.w.d.M:
     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>
     1:2:com.android.tools.r8.ir.code.Value getOrCreateValue():443:444 -> a
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     3:3:com.android.tools.r8.ir.code.Value getOrCreateValue():444 -> a
     4:8:com.android.tools.r8.ir.code.Value getOrCreateValue():445:449 -> a
     9:9:com.android.tools.r8.ir.code.Value getOrCreateValue():445:445 -> a
-com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.w.c.P:
+com.android.tools.r8.ir.desugar.SynthesizedLambdaSourceCode -> com.android.tools.r8.w.d.P:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.desugar.LambdaClass lambda -> m
     com.android.tools.r8.graph.DexMethod currentMethod -> l
@@ -30110,7 +30100,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.w.c.Q:
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.w.d.Q:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set referencingClasses -> d
     boolean $assertionsDisabled -> e
@@ -30201,11 +30191,11 @@
     628:670:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):128 -> a
     671:704:void synthesizeUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.InternalOptions):130:163 -> a
     705:705:boolean lambda$synthesizeUtilityClass$0(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
-    706:706:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    706:706:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     706:706:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):78 -> a
     707:723:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):79:95 -> a
     724:728:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):94:98 -> a
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.w.c.R.a:
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.w.d.R.a:
     1:25:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1541:1565 -> A
     26:30:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1562:1566 -> A
     31:31:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1560:1560 -> A
@@ -30689,7 +30679,7 @@
     24:24:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1525:1525 -> z
     25:42:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1519:1536 -> z
     1:15:com.android.tools.r8.graph.CfCode ShortMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4815:4829 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.w.c.R.b:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.w.d.R.b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:5:void rewriteLogicalAnd(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:24 -> a
@@ -30698,20 +30688,20 @@
     6:6:void rewriteLogicalOr(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):32:32 -> b
     1:5:void rewriteLogicalXor(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):38:42 -> c
     6:6:void rewriteLogicalXor(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):41:41 -> c
-com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.w.c.R.c:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.w.d.R.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.w.c.R.d:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.w.d.R.d:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void rewriteListOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):20:20 -> a
     2:8:void rewriteToCollectionMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory,java.lang.String):35:41 -> a
     1:1:void rewriteMapOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):30:30 -> b
     1:1:void rewriteSetOfEmpty(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):25:25 -> c
-com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.w.c.R.e:
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.w.d.R.e:
     boolean com.android.tools.r8.utils.NumberUtils.is16Bit(long) -> a
     1:4:java.util.Set com.android.tools.r8.utils.CollectionUtils.mergeSets(java.util.Collection,java.util.Collection):13:16 -> a
     5:6:java.util.Deque com.android.tools.r8.utils.DequeUtils.newArrayDeque(java.lang.Object):13:14 -> a
@@ -30736,12 +30726,12 @@
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> b
     3:9:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteRequireNonNull(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):29:35 -> b
     1:6:void com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):19:24 -> c
-com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.w.c.R.f:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.w.d.R.f:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:4:void rewriteCompare(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):22:25 -> a
     5:5:void rewriteCompare(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):24:24 -> a
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.w.c.R.g:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.w.d.R.g:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:4:void rewriteAsIdentity(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexItemFactory):33:36 -> a
@@ -30804,40 +30794,47 @@
     boolean $assertionsDisabled -> d
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode mode -> c
     1:1:void <clinit>():40:40 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):58:58 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.AppView):55:62 -> <init>
-    1:6:void logResults():67:72 -> a
-    7:7:void logResults():71:71 -> a
-    8:33:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):80:105 -> a
-    34:50:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):103:119 -> a
-    51:57:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):118:124 -> a
-    58:80:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):132:154 -> a
-    81:100:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):161:180 -> a
-    101:101:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    101:101:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):184 -> a
-    102:112:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):185:195 -> a
-    113:113:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    113:113:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):195 -> a
-    114:124:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):196:206 -> a
-    125:125:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    125:125:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207 -> a
-    126:126:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):209:209 -> a
-    127:127:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    127:127:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):209 -> a
-    128:128:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):211:211 -> a
-    129:129:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    129:129:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):210 -> a
-    130:151:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):212:233 -> a
-    152:152:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    152:152:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):233 -> a
-    153:153:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):233:233 -> a
-    154:179:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):241:266 -> a
-    180:187:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):265:272 -> a
-    188:188:java.lang.Object lambda$revisitMethods$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):268:268 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.AppView):58:65 -> <init>
+    1:6:void logResults():70:75 -> a
+    7:7:void logResults():74:74 -> a
+    8:20:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):83:95 -> a
+    21:21:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1124:1124 -> a
+    21:21:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):96 -> a
+    22:31:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):97:106 -> a
+    32:32:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMethodWithDynamicDispatch():1124:1124 -> a
+    32:32:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106 -> a
+    33:33:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):108:108 -> a
+    34:50:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):106:122 -> a
+    51:57:void collectCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode):121:127 -> a
+    58:75:void recordArgumentsIfNecessary(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,java.util.List):135:152 -> a
+    76:95:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):159:178 -> a
+    96:96:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    96:96:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):182 -> a
+    97:107:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):183:193 -> a
+    108:108:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    108:108:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):193 -> a
+    109:119:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):194:204 -> a
+    120:120:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    120:120:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):205 -> a
+    121:121:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207:207 -> a
+    122:122:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    122:122:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):207 -> a
+    123:123:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):209:209 -> a
+    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    124:124:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):208 -> a
+    125:146:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):210:231 -> a
+    147:147:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    147:147:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):231 -> a
+    148:148:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):231:231 -> a
+    149:175:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):239:265 -> a
+    176:184:void revisitMethods(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):264:272 -> a
+    185:185:java.lang.Object lambda$revisitMethods$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):267:267 -> a
 com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode -> com.android.tools.r8.ir.optimize.d:
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode COLLECT -> a
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode REVISIT -> b
-    1:3:void <clinit>():48:50 -> <clinit>
+    com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode FINISH -> c
+    1:5:void <clinit>():48:52 -> <clinit>
     1:1:void <init>(java.lang.String,int):47:47 -> <init>
 com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.ir.optimize.g:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
@@ -30845,626 +30842,575 @@
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction waveDoneAction -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-    1:1:void <clinit>():61:61 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):100:100 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):98:103 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization):61:61 -> a
-    2:6:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):107:111 -> a
+    1:1:void <clinit>():60:60 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):99:99 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):97:102 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization):60:60 -> a
+    2:6:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):106:110 -> a
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    7:7:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):111 -> a
-    8:27:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):119:138 -> a
-    28:52:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):259:283 -> a
-    28:52:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    53:53:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):287:287 -> a
-    53:53:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    53:53:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
+    7:7:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):110 -> a
+    8:27:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):118:137 -> a
+    28:52:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):258:282 -> a
+    28:52:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    53:53:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):286:286 -> a
+    53:53:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    53:53:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    54:54:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):287 -> a
-    54:54:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    54:54:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    55:89:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):289:323 -> a
-    55:89:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    55:89:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
+    54:54:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):286 -> a
+    54:54:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    54:54:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    55:89:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):288:322 -> a
+    55:89:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    55:89:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
     90:90: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
-    90:90:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):323 -> a
-    90:90:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    90:90:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    91:93:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):323:325 -> a
-    91:93:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    91:93:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    94:94:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:138 -> a
-    95:95:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):325:325 -> a
-    95:95:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):283 -> a
-    95:95:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138 -> a
-    96:104:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:147 -> a
+    90:90:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):322 -> a
+    90:90:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    90:90:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    91:93:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):322:324 -> a
+    91:93:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    91:93:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    94:94:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137:137 -> a
+    95:95:com.android.tools.r8.graph.DexValue getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):324:324 -> a
+    95:95:com.android.tools.r8.graph.DexValue getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):282 -> a
+    95:95:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):137 -> a
+    96:104:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):138:146 -> a
     105:105:boolean com.android.tools.r8.ir.code.ConstNumber.getBooleanValue():72:72 -> a
-    105:105:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):148 -> a
-    106:122:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):148:164 -> a
-    123:155:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):140:172 -> a
-    156:156:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
-    156:156:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):176 -> a
-    157:183:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):177:203 -> a
-    184:184:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
-    184:184:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):204 -> a
-    185:185:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):204:204 -> a
-    186:186:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):95:95 -> a
-    186:186:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):204 -> a
-    187:231:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):210:254 -> a
-    232:232:com.android.tools.r8.graph.DexField lambda$optimize$0(com.android.tools.r8.graph.DexEncodedField):222:222 -> a
-    233:234:void lambda$optimize$1():243:244 -> a
-    235:235:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):331:331 -> a
-    236:236:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    236:236:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):333 -> a
-    237:237:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
-    237:237:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):334 -> a
-    238:359:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):335:456 -> a
-    360:467:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):349:456 -> a
-    468:566:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):358:456 -> a
-    567:569:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):365:367 -> a
-    570:571:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):445:446 -> a
-    570:571:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):368 -> a
-    572:572:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):369:369 -> a
-    573:577:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():818:822 -> a
-    573:577:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):374 -> a
-    578:596:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):377:395 -> a
-    597:604:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):490:497 -> a
-    597:604:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):402 -> a
-    605:612:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):404:411 -> a
-    613:613:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
-    613:613:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):411 -> a
-    614:658:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):412:456 -> a
-    659:689:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):426:456 -> a
-    690:714:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):432:456 -> a
-    715:722:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):451:458 -> a
-    723:723:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):456:456 -> a
-    724:724:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$2(com.android.tools.r8.graph.DexField):420:420 -> a
-    725:726:java.util.Collection validateFinalFieldPuts(java.util.Map,java.util.Map):483:484 -> a
-    727:735:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):501:509 -> a
+    105:105:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147 -> a
+    106:122:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):147:163 -> a
+    123:155:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):139:171 -> a
+    156:156:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    156:156:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):175 -> a
+    157:183:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):176:202 -> a
+    184:184:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    184:184:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
+    185:185:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:203 -> a
+    186:186:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):84:84 -> a
+    186:186:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203 -> a
+    187:231:void optimize(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):209:253 -> a
+    232:232:com.android.tools.r8.graph.DexField lambda$optimize$0(com.android.tools.r8.graph.DexEncodedField):221:221 -> a
+    233:234:void lambda$optimize$1():242:243 -> a
+    235:235:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$2(com.android.tools.r8.graph.DexField):417:417 -> a
+    236:237:java.util.Collection validateFinalFieldPuts(java.util.Map,java.util.Map):480:481 -> a
+    238:246:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):498:506 -> a
+    247:247:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    247:247:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):330 -> a
+    248:248:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
+    248:248:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):331 -> a
+    249:370:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):332:453 -> a
+    371:478:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):346:453 -> a
+    479:577:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):355:453 -> a
+    578:580:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):362:364 -> a
+    581:582:boolean com.android.tools.r8.graph.DexClass.definesStaticField(com.android.tools.r8.graph.DexField):445:446 -> a
+    581:582:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):365 -> a
+    583:583:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):366:366 -> a
+    584:588:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():819:823 -> a
+    584:588:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):371 -> a
+    589:607:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):374:392 -> a
+    608:615:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.StaticPut):487:494 -> a
+    608:615:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):399 -> a
+    616:623:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):401:408 -> a
+    624:624:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNotNull():334:334 -> a
+    624:624:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):408 -> a
+    625:669:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):409:453 -> a
+    670:700:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):423:453 -> a
+    701:725:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):429:453 -> a
+    726:733:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):448:455 -> a
+    734:734:java.util.Collection findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.Set):453:453 -> a
 com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.ir.optimize.f:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization this$0 -> c
     java.util.Set noLongerWrittenFields -> b
-    1:3:void <init>(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization,java.util.Map,java.util.Set):70:72 -> <init>
-    1:2:void join(java.util.Map,java.util.Set):78:79 -> a
-    3:5:void execute():85:87 -> a
-    6:10:void execute():86:90 -> a
+    1:3:void <init>(com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization,java.util.Map,java.util.Set):69:71 -> <init>
+    1:2:void join(java.util.Map,java.util.Set):77:78 -> a
+    3:5:void execute():84:86 -> a
+    6:10:void execute():85:89 -> a
 com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.ir.optimize.h:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.InternalOptions options -> d
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
-    1:1:void <clinit>():134:134 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):153:157 -> <init>
+    1:1:void <clinit>():131:131 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):150:154 -> <init>
     boolean lambda$computeConstantArrayValues$9(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):231:231 -> a
-    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):315:338 -> a
-    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):405:405 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1278:1278 -> a
-    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):405 -> a
-    28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():629:630 -> a
-    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):405 -> a
-    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):412:423 -> a
-    42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> a
-    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):423 -> a
-    43:50:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):424:431 -> a
-    51:87: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):583:619 -> a
-    88:88:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):447:447 -> a
-    88:88: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):620 -> a
-    89:103: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):621:635 -> a
-    104:104:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):447:447 -> a
-    104:104: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):636 -> a
-    105:114: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):637:646 -> a
-    115:128: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):696:709 -> a
-    129:129: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):706:706 -> a
-    130:141:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):719:730 -> a
-    142:149:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):735:742 -> a
-    150:150:int codeUnitMargin():749:749 -> a
-    151:151:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):911:911 -> a
-    152:152:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1088:1088 -> a
-    153:153:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1152:1152 -> a
-    154:154:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1151:1151 -> a
-    155:161:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1162:1168 -> a
-    155:161:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1155 -> a
-    162:162:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1155:1155 -> a
-    163:167:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1154:1158 -> a
-    168:175:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1312:1319 -> a
+    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):228:228 -> a
+    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):312:335 -> a
+    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402:402 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1273:1273 -> a
+    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402 -> a
+    28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():625:626 -> a
+    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):402 -> a
+    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):409:420 -> a
+    42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> a
+    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):420 -> a
+    43:50:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):421:428 -> a
+    51:87: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):580:616 -> a
+    88:88:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):444:444 -> a
+    88:88: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):617 -> a
+    89:103: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):618:632 -> a
+    104:104:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):444:444 -> a
+    104:104: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):633 -> a
+    105:114: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):634:643 -> a
+    115:128: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):693:706 -> a
+    129:129: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):703:703 -> a
+    130:141:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):716:727 -> a
+    142:149:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):732:739 -> a
+    150:150:int codeUnitMargin():746:746 -> a
+    151:151:int lambda$rewriteSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):908:908 -> a
+    152:152:void lambda$removeSwitchMaps$2(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1082:1082 -> a
+    153:153:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1146:1146 -> a
+    154:154:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1145:1145 -> a
+    155:161:com.android.tools.r8.graph.DexType getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1156:1162 -> a
+    155:161:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1149 -> a
+    162:162:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1149:1149 -> a
+    163:167:boolean checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1148:1152 -> a
+    168:175:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1306:1313 -> a
     176:176:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    176:176:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1319 -> a
-    177:179:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1323:1325 -> a
-    180:180:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
-    180:180:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330 -> a
-    181:185:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1331:1335 -> a
-    186:186:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
-    186:186:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1336 -> a
-    187:199:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1336:1348 -> a
-    200:200:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
-    200:200:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1347 -> a
-    201:201:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1346:1346 -> a
-    202:212:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1491:1501 -> a
+    176:176:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1313 -> a
+    177:179:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1317:1319 -> a
+    180:180:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
+    180:180:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1324 -> a
+    181:185:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1325:1329 -> a
+    186:186:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    186:186:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330 -> a
+    187:199:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1330:1342 -> a
+    200:200:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    200:200:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1341 -> a
+    201:201:void processAssertions(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1340:1340 -> a
+    202:212:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1482:1492 -> a
     213:213:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    213:213:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1502 -> a
-    214:233:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1503:1522 -> a
-    234:253:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1521:1540 -> a
-    254:254:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    254:254:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1541 -> a
-    255:271:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1542:1558 -> a
-    272:272:boolean lambda$removeInstanceOfInstructionIfTrivial$3(com.android.tools.r8.ir.code.Value):1533:1533 -> a
-    273:275:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1565:1567 -> a
-    276:276:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    276:276:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1567 -> a
-    277:278:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1569:1570 -> a
-    279:289: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):1575:1585 -> a
-    290:291:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1751:1752 -> a
-    292:384:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1815:1907 -> a
-    385:397:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1912:1924 -> a
-    398:400:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1918:1920 -> a
-    401:401:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1239:1239 -> a
-    401:401:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1921 -> a
-    402:402:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1921:1921 -> a
-    403:450:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):1959:2006 -> a
-    451:456:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2334:2339 -> a
-    457:457:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2355:2355 -> a
-    458:464:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2343:2349 -> a
-    458:464:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2356 -> a
-    465:467:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2358:2360 -> a
-    468:468:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
-    468:468:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2360 -> a
-    469:482:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2361:2374 -> a
-    483:492:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2321:2330 -> a
-    483:492:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2375 -> a
-    493:508:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2376:2391 -> a
-    509:510: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):2541:2542 -> a
-    511:511:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2707:2707 -> a
-    512:512:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> a
-    512:512:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2707 -> a
-    513:514:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2707:2708 -> a
-    515:542:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2718:2745 -> a
-    543:543:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> a
-    543:543:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2749 -> a
-    544:558:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2764:2778 -> a
-    559:584:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):2952:2977 -> a
-    585:587: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):2988:2990 -> a
-    588:590: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
-    588:590: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):2990 -> a
-    591:592:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):2991:2992 -> a
-    593:613:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3149:3169 -> a
-    614:614:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
-    614:614:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3169 -> a
-    615:631:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3169:3185 -> a
-    632:632:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3184:3184 -> a
-    633:633:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    633:633:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3183 -> a
-    634:645:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3183:3194 -> a
-    646:668:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3205:3227 -> a
-    669:669: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
-    669:669:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3227 -> a
-    670:670:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3228:3228 -> a
-    671:705: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):3265:3299 -> a
-    671:705:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3232 -> a
-    706:728:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3233:3255 -> a
-    729:729: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
-    729:729:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3255 -> a
-    730:734:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3310:3314 -> a
-    735:735: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
-    735:735:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3314 -> a
-    736:740:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3315:3319 -> a
-    741:741:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3372:3372 -> a
-    742:746:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3378:3382 -> a
-    742:746:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    747:747:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    747:747:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3382 -> a
-    747:747:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    748:748:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3387:3387 -> a
-    748:748:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    749:749:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3384:3384 -> a
-    749:749:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    750:750:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    750:750:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3384 -> a
-    750:750:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    751:751:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3384:3384 -> a
-    751:751:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3374 -> a
-    752:753: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):3393:3394 -> a
-    754:754:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    754:754: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):3395 -> a
-    755:755:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3397:3397 -> a
-    756:756:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    756:756:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3397 -> a
-    757:758:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3397:3398 -> a
-    759:779:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3408:3428 -> a
-    780:780:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    780:780:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3427 -> a
-    781:787:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3430:3436 -> a
-    788:826:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3434:3472 -> a
-    827:830:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
-    827:830:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3472 -> a
-    831:853:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3473:3495 -> a
-    854:854:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    854:854:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3495 -> a
-    855:856:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3496:3497 -> a
-    857:872:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3496:3511 -> a
-    873:880:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3515:3522 -> a
-    881:891:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3535:3545 -> a
-    881:891:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    892:892:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3523:3523 -> a
-    893:918:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3568:3593 -> a
-    893:918:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3523 -> a
-    919:923:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3524:3528 -> a
-    924:924:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3525:3525 -> a
+    213:213:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1493 -> a
+    214:233:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1494:1513 -> a
+    234:249:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1512:1527 -> a
+    250:250:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    250:250:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1528 -> a
+    251:267:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1529:1545 -> a
+    268:268:boolean lambda$removeInstanceOfInstructionIfTrivial$3(com.android.tools.r8.ir.code.Value):1524:1524 -> a
+    269:271:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1552:1554 -> a
+    272:272:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    272:272:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1554 -> a
+    273:274:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1556:1557 -> a
+    275:285: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):1562:1572 -> a
+    286:287:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1738:1739 -> a
+    288:380:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,java.util.Map,java.util.function.Predicate):1802:1894 -> a
+    381:393:void insertConstantInBlock(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode):1899:1911 -> a
+    394:396:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1905:1907 -> a
+    397:397:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1234:1234 -> a
+    397:397:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1908 -> a
+    398:398:boolean lambda$insertConstantInBlock$8(com.android.tools.r8.ir.code.Instruction,boolean,com.android.tools.r8.ir.code.Instruction):1908:1908 -> a
+    399:446:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):1946:1993 -> a
+    447:452:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2321:2326 -> a
+    453:453:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2342:2342 -> a
+    454:460:boolean hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2330:2336 -> a
+    454:460:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2343 -> a
+    461:463:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2345:2347 -> a
+    464:464:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
+    464:464:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2347 -> a
+    465:478:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2348:2361 -> a
+    479:488:boolean shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2308:2317 -> a
+    479:488:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2362 -> a
+    489:504:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2363:2378 -> a
+    505:506: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):2509:2510 -> a
+    507:507:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675:2675 -> a
+    508:508:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> a
+    508:508:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675 -> a
+    509:510:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2675:2676 -> a
+    511:538:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2686:2713 -> a
+    539:539:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> a
+    539:539:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2717 -> a
+    540:554:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.com.google.common.base.Supplier,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.base.Supplier):2732:2746 -> a
+    555:580:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):2920:2945 -> a
+    581:583: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):2956:2958 -> a
+    584:586: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
+    584:586: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):2958 -> a
+    587:588: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):2959:2960 -> a
+    589:609:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3117:3137 -> a
+    610:610: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):40:40 -> a
+    610:610:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3137 -> a
+    611:627:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3137:3153 -> a
+    628:628:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3152:3152 -> a
+    629:629:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    629:629:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3151 -> a
+    630:641:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3151:3162 -> a
+    642:664:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3173:3195 -> a
+    665:665: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
+    665:665:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3195 -> a
+    666:666:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3196:3196 -> a
+    667:701: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):3233:3267 -> a
+    667:701:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3200 -> a
+    702:724:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3201:3223 -> a
+    725:725: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
+    725:725:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3223 -> a
+    726:730:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3278:3282 -> a
+    731:731: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
+    731:731:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3282 -> a
+    732:736:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3283:3287 -> a
+    737:737:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3340:3340 -> a
+    738:742:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3346:3350 -> a
+    738:742:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    743:743:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    743:743:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3350 -> a
+    743:743:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    744:744:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3355:3355 -> a
+    744:744:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    745:745:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352:3352 -> a
+    745:745:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    746:746:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    746:746:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352 -> a
+    746:746:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    747:747:boolean isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3352:3352 -> a
+    747:747:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3342 -> a
+    748:749: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):3361:3362 -> a
+    750:750:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    750:750: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):3363 -> a
+    751:751: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):3365:3365 -> a
+    752:752:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    752:752: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):3365 -> a
+    753:754: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):3365:3366 -> a
+    755:775:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3376:3396 -> a
+    776:776:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    776:776:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3395 -> a
+    777:783:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3398:3404 -> a
+    784:822:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3402:3440 -> a
+    823:826:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
+    823:826:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3440 -> a
+    827:849:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3441:3463 -> a
+    850:850:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    850:850:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3463 -> a
+    851:852:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3464:3465 -> a
+    853:868:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3464:3479 -> a
+    869:876:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3483:3490 -> a
+    877:887:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3503:3513 -> a
+    877:887:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    888:888:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3491:3491 -> a
+    889:914:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3536:3561 -> a
+    889:914:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3491 -> a
+    915:919:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3492:3496 -> a
+    920:920:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493:3493 -> a
+    921:921:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    921:921:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493 -> a
+    922:922:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    922:922:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    922:922:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493 -> a
+    923:923:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3493:3493 -> a
+    924:924:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511:3511 -> a
+    924:924:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
     925:925:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    925:925:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3525 -> a
+    925:925:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511 -> a
+    925:925:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
     926:926:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     926:926:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    926:926:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3525 -> a
-    927:927:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3525:3525 -> a
-    928:928:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3543:3543 -> a
-    928:928:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
+    926:926:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511 -> a
+    926:926:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    927:927:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3511:3511 -> a
+    927:927:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    928:928:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507:3507 -> a
+    928:928:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
     929:929:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    929:929:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3543 -> a
-    929:929:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
+    929:929:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507 -> a
+    929:929:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
     930:930:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     930:930:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    930:930:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3543 -> a
-    930:930:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    931:931:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3543:3543 -> a
-    931:931:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    932:932:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3539:3539 -> a
-    932:932:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    933:933:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    933:933:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3539 -> a
-    933:933:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    934:934:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    934:934:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    934:934:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3539 -> a
-    934:934:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    935:935:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3539:3539 -> a
-    935:935:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3522 -> a
-    936:942:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3549:3555 -> a
-    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):303:304 -> b
-    3:12:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):343:352 -> b
-    13:13:boolean lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.ConstInstruction):1760:1760 -> b
-    14:60:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2789:2835 -> b
-    61:62:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1059:1060 -> b
-    61:62:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2835 -> b
-    63:74:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2836:2847 -> b
-    75:75:boolean lambda$logArgumentTypes$12(com.android.tools.r8.ir.code.Instruction):3417:3417 -> b
-    76:78:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3656:3658 -> b
-    79:79:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3656:3656 -> b
-    1:4:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1673:1676 -> c
-    5:13:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1691:1699 -> c
-    5:13:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
+    930:930:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507 -> a
+    930:930:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    931:931:com.android.tools.r8.ir.code.NewInstance findNewInstance(com.android.tools.r8.ir.code.Phi):3507:3507 -> a
+    931:931:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3490 -> a
+    932:938:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3517:3523 -> a
+    1:2:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):300:301 -> b
+    3:12:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):340:349 -> b
+    13:13:boolean lambda$shortenLiveRanges$6(com.android.tools.r8.ir.code.ConstInstruction):1747:1747 -> b
+    14:60:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2757:2803 -> b
+    61:62:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1055:1056 -> b
+    61:62:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2803 -> b
+    63:74:void processMethodsNeverReturningNormally(com.android.tools.r8.ir.code.IRCode):2804:2815 -> b
+    75:75:boolean lambda$logArgumentTypes$12(com.android.tools.r8.ir.code.Instruction):3385:3385 -> b
+    76:78:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3624:3626 -> b
+    79:79:com.android.tools.r8.graph.DexMethod lambda$workaroundNumberConversionRegisterAllocationBug$13():3624:3624 -> b
+    1:4:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1660:1663 -> c
+    5:13:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1678:1686 -> c
+    5:13:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
     14:14:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
-    14:14:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1699 -> c
-    14:14:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
-    15:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1699:1701 -> c
-    15:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
-    18:25:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1722:1729 -> c
-    18:25:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1702 -> c
-    18:25:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
-    26:27:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1707:1708 -> c
-    26:27:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1677 -> c
-    28:28:java.util.List lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):1901:1901 -> c
-    29:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2567:2617 -> c
-    80:80:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> c
-    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2618 -> c
-    81:90:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2620:2629 -> c
-    91:91:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2628:2628 -> c
-    92:92:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> c
-    92:92:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2635 -> c
-    93:93:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2638:2638 -> c
-    94:107:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2637:2650 -> c
-    108:108:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2649:2649 -> c
-    109:109:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> c
-    109:109:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2656 -> c
-    110:110:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2659:2659 -> c
-    111:130:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2658:2677 -> c
-    1:1:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):170:170 -> d
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> d
-    2:2:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):172 -> d
-    3:25:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):174:196 -> d
-    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> d
-    26:26:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):208 -> d
-    27:28:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):211:212 -> d
+    14:14:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1686 -> c
+    14:14:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    15:17:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1686:1688 -> c
+    15:17:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    18:25:boolean hasPath(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1709:1716 -> c
+    18:25:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1689 -> c
+    18:25:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    26:27:boolean canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop):1694:1695 -> c
+    26:27:boolean shouldBeLitInstruction(com.android.tools.r8.ir.code.Instruction):1664 -> c
+    28:28:java.util.List lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):1888:1888 -> c
+    29:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2535:2585 -> c
+    80:80:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2586 -> c
+    81:90:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2588:2597 -> c
+    91:91:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2596:2596 -> c
+    92:92:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    92:92:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2603 -> c
+    93:93:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2606:2606 -> c
+    94:107:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2605:2618 -> c
+    108:108:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2617:2617 -> c
+    109:109:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> c
+    109:109:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2624 -> c
+    110:110:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2627:2627 -> c
+    111:130:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2626:2645 -> c
+    1:1:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):167:167 -> d
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> d
+    2:2:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):169 -> d
+    3:25:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):171:193 -> d
+    26:26:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1089:1089 -> d
+    26:26:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):205 -> d
+    27:28:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):208:209 -> d
     29:29:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> d
-    29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):212 -> d
-    30:33:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):212:215 -> d
-    34:34:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> d
-    34:34:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):172 -> d
-    1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1055:1060 -> e
+    29:29:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):209 -> d
+    30:33:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):209:212 -> d
+    34:34:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> d
+    34:34:void removeAssumeInstructions(com.android.tools.r8.ir.code.IRCode):169 -> d
+    1:6:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1049:1054 -> e
     7:45:com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo com.android.tools.r8.ir.optimize.SwitchUtils.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):63:101 -> e
-    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1060 -> e
-    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1062:1069 -> e
+    7:45:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1054 -> e
+    46:53:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1056:1063 -> e
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> e
     54:54:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> e
-    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1069 -> e
-    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1070:1081 -> e
+    54:54:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1063 -> e
+    55:66:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1064:1075 -> e
     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):282:282 -> e
-    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1083 -> e
-    68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1086:1094 -> e
-    1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1360:1386 -> f
+    67:67:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1077 -> e
+    68:76:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):1080:1088 -> e
+    1:27:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1354:1380 -> f
     28:28:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> f
-    28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1386 -> f
-    29:29:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1387:1387 -> f
-    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> f
-    30:30:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1388 -> f
-    31:36:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1390:1395 -> f
-    37:53: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):1427:1443 -> f
-    37:53:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
+    28:28:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1380 -> f
+    29:29:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1381:1381 -> f
+    30:30:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> f
+    30:30:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1382 -> f
+    31:36:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1384:1389 -> f
+    37:53: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):1418:1434 -> f
+    37:53:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     54:54:boolean com.android.tools.r8.graph.DexType.isFloatType():216:216 -> f
-    54:54: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):1443 -> f
-    54:54:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    55:92: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):1444:1481 -> f
-    55:92:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
+    54:54: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):1434 -> f
+    54:54:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    55:92: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):1435:1472 -> f
+    55:92:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
     93:93:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> f
-    93:93: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):1481 -> f
-    93:93:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    94: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):1481:1483 -> f
-    94:96:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1395 -> f
-    97:105:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1396:1404 -> f
-    106:106:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> f
-    106:106:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1416 -> f
-    107:111:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1417:1421 -> f
-    1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3043:3043 -> g
-    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> g
-    2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3047 -> g
-    3:65:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3048:3110 -> g
-    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> h
-    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3114 -> h
-    2:26:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3115:3139 -> h
-    27:27:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> h
-    27:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3140 -> h
-    28:32:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3141:3145 -> h
-    1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1173:1173 -> i
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> i
-    2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1173 -> i
-    3:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1176:1209 -> i
-    37:84:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1208:1255 -> i
-    85:85:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> i
-    85:85:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256 -> i
-    86:87:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1257:1258 -> i
-    88:88:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> i
-    88:88:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1259 -> i
-    89:90:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1261:1262 -> i
-    91:91:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> i
-    91:91:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1262 -> i
-    92:94:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1262:1264 -> i
-    1:58:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):242:299 -> j
-    1:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3329:3345 -> k
-    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> k
-    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3352 -> k
-    19:34:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3353:3368 -> k
-    1:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1737:1791 -> l
-    56:56:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():27:27 -> l
-    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1791 -> l
-    57:57:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> l
-    57:57:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1792 -> l
-    58:60:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1793:1795 -> l
-    61:87:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1780:1806 -> l
-    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2036:2036 -> m
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> m
-    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2036 -> m
-    3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2039:2047 -> m
-    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2012:2028 -> m
-    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2048 -> m
-    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2051:2067 -> m
-    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2066:2083 -> m
-    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):1932:1948 -> m
-    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2084 -> m
-    81:127:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2088:2134 -> m
-    1:1:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2395:2395 -> n
-    2:7:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2401:2406 -> n
-    2:7:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    8:22:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3022:3036 -> n
-    8:22:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2407 -> n
-    8:22:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    23:25:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> n
-    23:25:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3037 -> n
-    23:25:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2407 -> n
-    23:25:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    26:26:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3038:3038 -> n
-    26:26:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2407 -> n
-    26:26:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    27:38:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2996:3007 -> n
-    27:38:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    27:38:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    39:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> n
-    39:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    39:52:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    39:52:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> n
-    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    53:53:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    53:53:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    54:54:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> n
-    54:54:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    54:54:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    54:54:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    55:55:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> n
-    55:55:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    55:55:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    55:55:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    56:56:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> n
-    56:56:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007 -> n
-    56:56:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    56:56:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    57:57:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3007:3007 -> n
-    57:57:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    57:57:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    58:60:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> n
-    58:60:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3008 -> n
-    58:60:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    58:60:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    61:65:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3009:3013 -> n
-    61:65:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    61:65:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    66:68:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):98:100 -> n
-    66:68:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3014 -> n
-    66:68:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    66:68:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    69:69:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3015:3015 -> n
-    69:69:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2408 -> n
-    69:69:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    70:72:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2881:2883 -> n
-    70:72:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    70:72:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    73:73:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> n
-    73:73:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2883 -> n
-    73:73:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    73:73:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    74:108:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2884:2918 -> n
-    74:108:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    74:108:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    109:109:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> n
-    109:109:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2919 -> n
-    109:109:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    109:109:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    110:131:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2921:2942 -> n
-    110:131:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2410 -> n
-    110:131:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    132:155:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2415:2438 -> n
-    132:155:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    156:156:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    156:156:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2439 -> n
-    156:156:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    157:171:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2442:2456 -> n
-    157:171:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    172:172:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    172:172:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2457 -> n
-    172:172:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    173:173:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2448:2448 -> n
-    173:173:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    174:174:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    174:174:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2449 -> n
-    174:174:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    175:185:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2464:2474 -> n
-    175:185:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    186:186:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    186:186:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2475 -> n
-    186:186:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    187:202:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2478:2493 -> n
-    187:202:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    203:203:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    203:203:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2494 -> n
-    203:203:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    204:204:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2484:2484 -> n
-    204:204:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    205:205:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    205:205:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2485 -> n
-    205:205:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    206:210:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2504:2508 -> n
-    206:210:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    211:211:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    211:211:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2509 -> n
-    211:211:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    212:212:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2511:2511 -> n
-    212:212:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    213:213:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    213:213:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2512 -> n
-    213:213:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    214:216:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2517:2519 -> n
-    214:216:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    217:217:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    217:217:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2521 -> n
-    217:217:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    218:218:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2546:2546 -> n
-    218:218:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2523 -> n
-    218:218:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    219:221:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2530:2532 -> n
-    219:221:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    222:222:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> n
-    222:222:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2532 -> n
-    222:222:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    223:226:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2532:2535 -> n
-    223:226:boolean simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2396 -> n
-    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2171:2176 -> o
-    7:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2215:2233 -> o
-    7:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2176 -> o
-    26:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2181:2191 -> o
-    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2140:2162 -> o
-    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2193 -> o
-    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2194:2207 -> o
-    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2167:2167 -> o
-    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2193 -> o
-    1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1593:1622 -> p
-    1:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1633:1658 -> q
-    27:45:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1646:1664 -> q
-    1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3655:3700 -> r
-    1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1107:1121 -> s
-    16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):358:376 -> s
-    16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1122 -> s
-    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1124:1124 -> s
-    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):382:395 -> s
-    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1125 -> s
-    50:66:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1129:1145 -> s
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2683:2683 -> t
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2578 -> t
-    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.<init>():119:119 -> t
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2683 -> t
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2578 -> t
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2686:2699 -> t
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2578 -> t
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2579:2579 -> u
-    2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> u
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2579 -> u
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1738:1738 -> v
+    93:93: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):1472 -> f
+    93:93:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    94: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):1472:1474 -> f
+    94:96:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1389 -> f
+    97:119:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1390:1412 -> f
+    1:1:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3011:3011 -> g
+    2:2:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> g
+    2:2:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3015 -> g
+    3:65:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):3016:3078 -> g
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> h
+    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3082 -> h
+    2:26:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3083:3107 -> h
+    27:27:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> h
+    27:27:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3108 -> h
+    28:32:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3109:3113 -> h
+    1:1:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1167:1167 -> i
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> i
+    2:2:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1167 -> i
+    3:36:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1170:1203 -> i
+    37:91:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1202:1256 -> i
+    92:92:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> i
+    92:92:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256 -> i
+    93:95:void rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1256:1258 -> i
+    1:14:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):843:856 -> j
+    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1001:1008 -> j
+    15:22:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1027:1029 -> j
+    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1012 -> j
+    23:25:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1013:1021 -> j
+    26:34:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):858 -> j
+    35:59:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):860:884 -> j
+    60:60:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> j
+    60:60:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):884 -> j
+    61:88:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):885:912 -> j
+    89:89:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    89:89:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):912 -> j
+    90:104:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):913:927 -> j
+    105:105:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    105:105:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):927 -> j
+    106:142:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):929:965 -> j
+    143:143:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    143:143:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):965 -> j
+    144:144:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):967:967 -> j
+    145:159:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):751:765 -> j
+    145:159:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    160:160:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
+    160:160:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):765 -> j
+    160:160:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    161:172:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):771:782 -> j
+    161:172:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    173:173:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> j
+    173:173:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):782 -> j
+    173:173:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    174:223:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):783:832 -> j
+    174:223:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    224:224:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> j
+    224:224:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):833 -> j
+    224:224:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    225:225:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):838:838 -> j
+    225:225:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> j
+    226:250:void rewriteSwitch(com.android.tools.r8.ir.code.IRCode):972:996 -> j
+    1:58:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):239:296 -> k
+    1:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3297:3313 -> l
+    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> l
+    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3320 -> l
+    19:34:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3321:3336 -> l
+    1:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1724:1778 -> m
+    56:56:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():28:28 -> m
+    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1778 -> m
+    57:57:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> m
+    57:57:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1779 -> m
+    58:60:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1780:1782 -> m
+    61:87:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1767:1793 -> m
+    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2023:2023 -> n
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> n
+    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2023 -> n
+    3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2026:2034 -> n
+    12:28:boolean allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):1999:2015 -> n
+    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2035 -> n
+    29:45:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2038:2054 -> n
+    46:63:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2053:2070 -> n
+    64:80:short[] computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):1919:1935 -> n
+    64:80:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2071 -> n
+    81:127:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2075:2121 -> n
+    1:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2158:2163 -> o
+    7:25:void removeDebugWriteOfPhi(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.DebugLocalWrite):2202:2220 -> o
+    7:25:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2163 -> o
+    26:36:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2168:2178 -> o
+    37:59:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2127:2149 -> o
+    37:59:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2180 -> o
+    60:73:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2181:2194 -> o
+    74:74:boolean hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2154:2154 -> o
+    74:74:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2180 -> o
+    1:6:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2382:2387 -> p
+    7:21:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2990:3004 -> p
+    7:21:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2388 -> p
+    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 -> p
+    22:24:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3005 -> p
+    22:24:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2388 -> p
+    25:25:boolean flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3006:3006 -> p
+    25:25:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2388 -> p
+    26:37:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2964:2975 -> p
+    26:37:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    38:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> p
+    38:51:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    38:51:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> p
+    52:52:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    52:52:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> p
+    53:53:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    53:53:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    54:54:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> p
+    54:54:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    54:54:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    55:55:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> p
+    55:55:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975 -> p
+    55:55:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    56:56:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2975:2975 -> p
+    56:56:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    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 -> p
+    57:59:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2976 -> p
+    57:59:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    60:64:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2977:2981 -> p
+    60:64:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    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 -> p
+    65:67:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2982 -> p
+    65:67:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    68:68:void rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2983:2983 -> p
+    68:68:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2389 -> p
+    69:71:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2849:2851 -> p
+    69:71:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    72:72:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> p
+    72:72:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2851 -> p
+    72:72:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    73:107:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2852:2886 -> p
+    73:107:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    108:108:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> p
+    108:108:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2887 -> p
+    108:108:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    109:130:boolean simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2889:2910 -> p
+    109:130:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2391 -> p
+    131:155:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2396:2420 -> p
+    156:156:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    156:156:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2421 -> p
+    157:171:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2424:2438 -> p
+    172:172:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    172:172:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2439 -> p
+    173:173:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2430:2430 -> p
+    174:174:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    174:174:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2431 -> p
+    175:185:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2446:2456 -> p
+    186:186:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    186:186:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2457 -> p
+    187:202:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2460:2475 -> p
+    203:203:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    203:203:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2476 -> p
+    204:204:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2466:2466 -> p
+    205:205:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2514:2514 -> p
+    205:205:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2467 -> p
+    206:209:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2486:2489 -> p
+    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):2514:2514 -> p
+    210:210:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2490 -> p
+    211:211:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2492:2492 -> p
+    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):2514:2514 -> p
+    212:212:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2493 -> p
+    213:215:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2499:2501 -> p
+    216:216:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> p
+    216:216:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2501 -> p
+    217:219:void simplifyIf(com.android.tools.r8.ir.code.IRCode):2501:2503 -> p
+    1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1580:1609 -> q
+    1:26:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1620:1645 -> r
+    27:45:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1633:1651 -> r
+    1:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3623:3668 -> s
+    1:15:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1101:1115 -> t
+    16:34:void collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):355:373 -> t
+    16:34:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1116 -> t
+    35:35:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1118:1118 -> t
+    36:49:void collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):379:392 -> t
+    36:49:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1119 -> t
+    50:66:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1123:1139 -> t
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2651:2651 -> u
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.<init>():119:119 -> u
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2651 -> u
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2654:2667 -> u
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2546 -> u
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2547:2547 -> v
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> v
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1738 -> v
-    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):219:231 -> w
-    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):228:234 -> w
-    1:14:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):846:859 -> x
-    15:22:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1007:1014 -> x
-    15:22:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):861 -> x
-    23:25:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.IntSwitch,int):1033:1035 -> x
-    23:25:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1018 -> x
-    23:25:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):861 -> x
-    26:34:com.android.tools.r8.ir.optimize.SwitchCaseEliminator removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.InstructionListIterator):1019:1027 -> x
-    26:34:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):861 -> x
-    35:59:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):863:887 -> x
-    60:60:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> x
-    60:60:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):887 -> x
-    61:88:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):888:915 -> x
-    89:89:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> x
-    89:89:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):915 -> x
-    90:104:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):916:930 -> x
-    105:105:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> x
-    105:105:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):930 -> x
-    106:142:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):932:968 -> x
-    143:143:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> x
-    143:143:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):968 -> x
-    144:144:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):970:970 -> x
-    145:176:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):754:785 -> x
-    145:176:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):971 -> x
-    177:177:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> x
-    177:177:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):785 -> x
-    177:177:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):971 -> x
-    178:233:int findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):786:841 -> x
-    178:233:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):971 -> x
-    234:258:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):975:999 -> x
-    259:259:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> x
-    259:259:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):999 -> x
-    260:263:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):999:1002 -> x
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$11(com.android.tools.r8.ir.code.IRCode):2547 -> v
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1725:1725 -> w
+    2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> w
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.IRCode):1725 -> w
+    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):216:228 -> x
+    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):225:231 -> x
 com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.ir.optimize.h$a:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
-    1:1:void <clinit>():2442:2442 -> <clinit>
+    1:1:void <clinit>():2424:2424 -> <clinit>
 com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.ir.optimize.h$b:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():2237:2237 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2237:2237 -> <init>
-    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2241:2242 -> <init>
-    1:6:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2301:2306 -> a
-    7:11:int getHashCode(com.android.tools.r8.ir.code.Value):2312:2316 -> a
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2237:2237 -> doEquivalent
-    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2250:2250 -> doEquivalent
-    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2237 -> doEquivalent
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1211:1211 -> doEquivalent
-    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2250 -> doEquivalent
-    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2237 -> doEquivalent
-    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2254:2269 -> doEquivalent
-    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2237 -> doEquivalent
-    1:1:int doHash(java.lang.Object):2237:2237 -> doHash
-    2:16:int doHash(com.android.tools.r8.ir.code.Instruction):2280:2294 -> doHash
-    2:16:int doHash(java.lang.Object):2237 -> doHash
+    1:1:void <clinit>():2224:2224 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2224:2224 -> <init>
+    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2228:2229 -> <init>
+    1:6:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2288:2293 -> a
+    7:11:int getHashCode(com.android.tools.r8.ir.code.Value):2299:2303 -> a
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2224:2224 -> doEquivalent
+    2:2:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2237:2237 -> doEquivalent
+    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> doEquivalent
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> doEquivalent
+    3:3:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2237 -> doEquivalent
+    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> doEquivalent
+    4:19:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2241:2256 -> doEquivalent
+    4:19:boolean doEquivalent(java.lang.Object,java.lang.Object):2224 -> doEquivalent
+    1:1:int doHash(java.lang.Object):2224:2224 -> doHash
+    2:16:int doHash(com.android.tools.r8.ir.code.Instruction):2267:2281 -> doHash
+    2:16:int doHash(java.lang.Object):2224 -> doHash
 com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.ir.optimize.h$c:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
@@ -31472,59 +31418,59 @@
     com.android.tools.r8.ir.code.IRCode code -> c
     boolean $assertionsDisabled -> h
     int right -> e
-    1:1:void <clinit>():512:512 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):520:521 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):530:530 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):535:535 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):545:545 -> a
-    4:9:com.android.tools.r8.ir.code.BasicBlock build():550:555 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
-    10:10:com.android.tools.r8.ir.code.BasicBlock build():555 -> a
-    11:16:com.android.tools.r8.ir.code.BasicBlock build():556:561 -> a
+    1:1:void <clinit>():509:509 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):517:518 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):527:527 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):532:532 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):542:542 -> a
+    4:9:com.android.tools.r8.ir.code.BasicBlock build():547:552 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock build():552 -> a
+    11:16:com.android.tools.r8.ir.code.BasicBlock build():553:558 -> a
     17:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1392:1395 -> a
-    17:20:com.android.tools.r8.ir.code.BasicBlock build():561 -> a
-    21:23:com.android.tools.r8.ir.code.BasicBlock build():563:565 -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):540:540 -> b
+    17:20:com.android.tools.r8.ir.code.BasicBlock build():558 -> a
+    21:23:com.android.tools.r8.ir.code.BasicBlock build():560:562 -> a
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):537:537 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.ir.optimize.h$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>():137:139 -> <clinit>
-    1:1:void <init>(java.lang.String,int):136:136 -> <init>
+    1:3:void <clinit>():134:136 -> <clinit>
+    1:1:void <init>(java.lang.String,int):133:133 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.ir.optimize.h$e:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.Position):440:441 -> <init>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position):437:438 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.ir.optimize.h$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():649:649 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):653:653 -> <init>
-    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):651:657 -> <init>
-    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):670:670 -> a
-    2:2:int getMax():666:666 -> a
-    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):670 -> a
-    3:3:int getMin():662:662 -> a
-    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):670 -> a
-    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):670:671 -> a
-    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):687:687 -> a
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):649:649 -> b
-    2:2:int getMax():666:666 -> b
-    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):675 -> b
-    3:3:int getMin():662:662 -> b
-    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):675 -> b
-    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):676:676 -> b
+    1:1:void <clinit>():646:646 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):650:650 -> <init>
+    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):648:654 -> <init>
+    1:1:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667:667 -> a
+    2:2:int getMax():663:663 -> a
+    2:2:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667 -> a
+    3:3:int getMin():659:659 -> a
+    3:3:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667 -> a
+    4:5:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):667:668 -> a
+    6:6:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):684:684 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):646:646 -> b
+    2:2:int getMax():663:663 -> b
+    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):672 -> b
+    3:3:int getMin():659:659 -> b
+    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):672 -> b
+    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):673:673 -> b
     5:5:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):114:114 -> b
-    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):680 -> b
-    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):680:680 -> b
+    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):677 -> b
+    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):677:677 -> b
     7:7:int com.android.tools.r8.ir.code.IntSwitch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):103:103 -> b
-    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):682 -> b
-    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):682:682 -> b
+    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):679 -> b
+    8:8:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):679:679 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.ir.optimize.h$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>():1355:1356 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1354:1354 -> <init>
+    1:2:void <clinit>():1349:1350 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1348:1348 -> <init>
 com.android.tools.r8.ir.optimize.CodeRewriter$SCC -> com.android.tools.r8.ir.optimize.h$h:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
@@ -31533,26 +31479,26 @@
     java.util.Deque preorderStack -> e
     boolean $assertionsDisabled -> g
     int currentTime -> a
-    1:1:void <clinit>():3600:3600 -> <clinit>
-    1:8:void <init>():3600:3607 -> <init>
-    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3600:3600 -> <init>
-    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3610:3612 -> a
-    1:33:void dfs(com.android.tools.r8.ir.code.Value):3616:3648 -> b
+    1:1:void <clinit>():3568:3568 -> <clinit>
+    1:8:void <init>():3568:3575 -> <init>
+    9:9:void <init>(com.android.tools.r8.ir.optimize.CodeRewriter$1):3568:3568 -> <init>
+    1:3:java.util.List computeSCC(com.android.tools.r8.ir.code.Value):3578:3580 -> a
+    1:33:void dfs(com.android.tools.r8.ir.code.Value):3584:3616 -> b
 com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.ir.optimize.h$i:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap 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):458:458 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Position):454:454 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):467:467 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):472:472 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):477:477 -> a
-    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):483:504 -> a
+    1:1:void <init>(com.android.tools.r8.ir.code.Position):455:455 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Position):451:451 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):464:464 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):469:469 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):474:474 -> a
+    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):480:501 -> a
     26:29:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.IRMetadata):1422:1425 -> a
-    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):504 -> a
-    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):505:506 -> 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):495:495 -> 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):501:501 -> b
+    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):501 -> a
+    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):502:503 -> 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):492:492 -> 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):498:498 -> b
 com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.ir.optimize.j:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> e
     boolean $assertionsDisabled -> f
@@ -31644,79 +31590,85 @@
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isForcedInliningOracle() -> a
     1:13:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):94:106 -> a
-    1:13:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356 -> a
+    1:13:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
     14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
     14:14:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):106 -> a
-    14:14:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356 -> a
+    14:14:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
     15:30:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):107:122 -> a
-    15:30:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356 -> a
-    31:31:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:360 -> a
+    15:30:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    31:31:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):355:355 -> a
     32:50:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):130:148 -> a
-    32:50:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
+    32:50:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
     51:52:boolean isDoubleInliningTarget(com.android.tools.r8.graph.DexEncodedMethod):210:211 -> a
     51:52:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):150 -> a
-    51:52:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
+    51:52:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
     53:55:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):151:153 -> a
-    53:55:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
+    53:55:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
     56:57:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.graph.DexEncodedMethod):133:134 -> a
-    56:57:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):364 -> a
-    58:59:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365:366 -> a
-    60:60:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365:365 -> a
+    56:57:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):359 -> a
+    58:59:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:361 -> a
+    60:60:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):360:360 -> a
     61:69:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):219:227 -> a
-    61:69:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370 -> a
-    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    61:69:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     70:70:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227 -> a
-    70:70:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370 -> a
-    71:145:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227:301 -> a
-    71:145:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370 -> a
-    146:146:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):300:300 -> a
-    146:146:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):370 -> a
-    147:147:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):374:374 -> a
-    148:150:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:97 -> a
-    148:150:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356 -> a
-    151:155:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):169:173 -> a
-    156:156:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    156:156:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):173 -> a
-    157:167:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):174:184 -> a
-    168:188:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):180:200 -> a
-    189:189:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
-    189:189:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
-    190:190:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):204:204 -> a
-    191:191:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
-    191:191:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
-    192:192:java.lang.Boolean lambda$canInlineStaticInvoke$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):182:182 -> a
-    193:197:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):306:310 -> a
-    198:198:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):309:309 -> a
-    199:199:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):316:316 -> a
-    200:211:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):325:336 -> a
-    200:211:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):317 -> a
-    212:212:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):318:318 -> a
-    213:213:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):347:347 -> a
-    214:215:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):383:384 -> a
-    216:216:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    216:216:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):384 -> a
-    217:223:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):386:392 -> a
-    224:224:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
-    224:224:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):392 -> a
-    225:236:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):392:403 -> a
-    237:241:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):416:420 -> a
-    242:244:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):426:428 -> a
-    245:245:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    245:245:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):428 -> a
-    246:246:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):430:430 -> a
-    247:258:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):440:451 -> a
-    259:350:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):467:558 -> a
-    351:356:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):565:570 -> a
-    357:357: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):582:582 -> a
-    358:360:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):593:595 -> a
-    358:360: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):585 -> a
-    361:361: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):586:586 -> a
-    362:378: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):680:696 -> a
-    362:378: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):587 -> a
-    379:411: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):615:647 -> a
-    412:412:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):706:706 -> a
-    413:447:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):712:746 -> a
-    448:454:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):758:764 -> a
+    70:70:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    71:142:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):227:298 -> a
+    71:142:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    143:145:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):297:299 -> a
+    143:145:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):365 -> a
+    146:146:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):369:369 -> a
+    147:149:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:97 -> a
+    147:149:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    150:154:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):169:173 -> a
+    155:155:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    155:155:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):173 -> a
+    156:166:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):174:184 -> a
+    167:187:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):180:200 -> a
+    188:188:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    188:188:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
+    189:189:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):204:204 -> a
+    190:190:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> a
+    190:190:boolean canInlineStaticInvoke(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):200 -> a
+    191:191:java.lang.Boolean lambda$canInlineStaticInvoke$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):182:182 -> a
+    192:192:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):311:311 -> a
+    193:204:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):320:331 -> a
+    193:204:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):312 -> a
+    205:205:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):313:313 -> a
+    206:206:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):342:342 -> a
+    207:208:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):378:379 -> a
+    209:209:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    209:209:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):379 -> a
+    210:216:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):381:387 -> a
+    217:217:boolean com.android.tools.r8.ir.analysis.type.TypeLatticeElement.isDefinitelyNull():330:330 -> a
+    217:217:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387 -> a
+    218:229:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):387:398 -> a
+    230:234:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):411:415 -> a
+    235:237:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):421:423 -> a
+    238:238:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    238:238:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):423 -> a
+    239:239:void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):425:425 -> a
+    240:331:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):443:534 -> a
+    332:332:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541:541 -> a
+    333:333:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    333:333:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541 -> a
+    334:336:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):544:546 -> a
+    337:337:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    337:337:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):541 -> a
+    338:338: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
+    339:339:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    339:339: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 -> a
+    340:342:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):569:571 -> a
+    340:342: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):561 -> a
+    343:343: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):562:562 -> a
+    344:360: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):656:672 -> a
+    344:360: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
+    361:361:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():561:561 -> a
+    361:361: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 -> a
+    362:394: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):591:623 -> a
+    395:395:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):682:682 -> a
+    396:420:void updateTypeInformationIfNeeded(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):688:712 -> a
+    421:428:void insertAssumeInstructionsToInlinee(com.android.tools.r8.ir.optimize.Assumer,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator,java.util.Set):724:731 -> a
 com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.ir.optimize.m:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
@@ -31726,7 +31678,7 @@
     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.DexType):48 -> a
     5:31:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):49:75 -> a
-    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Assume.getAliasForOutValue():199:199 -> a
+    32:32:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Assume.getAliasForOutValue():194:194 -> a
     32:32:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):75 -> a
     33:59:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):76:102 -> a
     60:76:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):101:117 -> a
@@ -31734,7 +31686,7 @@
     77:77:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):117 -> a
     78:108:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):119:149 -> a
     109:128:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):148:167 -> a
-    129:129:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    129:129:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     129:129:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):174 -> a
     130:152:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):176:198 -> a
     153:153:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
@@ -31750,12 +31702,12 @@
     1:1:void <clinit>():31:31 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):35:36 -> <init>
     1:3:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):42:44 -> a
-    4:81:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):54:131 -> a
-    4:81:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    82:87:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):130:135 -> a
-    82:87:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
-    88:103:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):160:175 -> a
-    1:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):146:155 -> b
+    4:76:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):54:126 -> a
+    4:76:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
+    77:82:void insertAssumeDynamicTypeInstructionsInBlock(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):125:130 -> a
+    77:82:void insertAssumeInstructionsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.function.Predicate):45 -> a
+    83:98:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement computeDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):155:170 -> a
+    1:10:com.android.tools.r8.ir.analysis.type.TypeLatticeElement computeDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):141:150 -> b
 com.android.tools.r8.ir.optimize.EnumInfoMapCollector -> com.android.tools.r8.ir.optimize.o:
     java.util.Map valueInfoMaps -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -31772,7 +31724,6 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():23:23 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,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.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
     boolean isForcedInliningOracle() -> a
@@ -31783,7 +31734,7 @@
     1:5:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):45:49 -> a
     6:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod):62:72 -> a
     6:16:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):58 -> a
-    17:20:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):122:125 -> a
+    17:20:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):113:116 -> a
 com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.ir.optimize.r:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -31834,81 +31785,72 @@
     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.Inliner:
-    java.util.Set doubleInlineCallers -> g
-    com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> e
-    java.util.Set doubleInlineSelectedTargets -> h
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> c
+    java.util.Set doubleInlineSelectedTargets -> g
     com.android.tools.r8.graph.AppView appView -> a
-    boolean $assertionsDisabled -> j
-    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> d
-    java.util.Map doubleInlineeCandidates -> i
-    boolean applyDoubleInlining -> f
+    boolean $assertionsDisabled -> i
+    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> c
+    java.util.Set doubleInlineCallers -> f
+    boolean applyDoubleInlining -> e
     java.util.Set blacklist -> b
-    1:1:void <clinit>():73:73 -> <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):91:91 -> <init>
-    2:17: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):82:97 -> <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.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):102:120 -> a
-    20:20:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):115:115 -> a
-    21:21:boolean isDoubleInliningEnabled():128:128 -> a
-    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):142:142 -> a
-    23:23:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1430 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):142 -> a
-    24:24:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1430:1430 -> a
-    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):142 -> a
-    25:30:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):1032:1037 -> a
-    25:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):143 -> a
+    com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> d
+    java.util.Map doubleInlineeCandidates -> h
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):85:85 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.ir.conversion.LensCodeRewriter):77:90 -> <init>
+    1:19:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):95:113 -> a
+    20:20:boolean isBlacklisted(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):108:108 -> a
+    21:21:boolean isDoubleInliningEnabled():121:121 -> a
+    22:22:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135:135 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1425 -> a
+    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135 -> a
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.canHaveDalvikCatchHandlerVerificationBug():1425:1425 -> a
+    24:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):135 -> a
+    25:30:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):991:996 -> a
+    25:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):136 -> a
     31:31:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    31:31:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):1037 -> a
-    31:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):143 -> a
-    32:44:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):144:156 -> a
-    45:47: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):134:136 -> a
-    45:47:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):157 -> a
-    48:53:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):158:163 -> a
-    54:58:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):185:189 -> a
+    31:31:boolean useReflectiveOperationExceptionOrUnknownClassInCatch(com.android.tools.r8.ir.code.IRCode):996 -> a
+    31:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):136 -> a
+    32:44:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):137:149 -> a
+    45:47: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):127:129 -> a
+    45:47:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):150 -> a
+    48:53:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):151:156 -> a
+    54:58:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):178:182 -> a
     59:59:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    59:59:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):189 -> a
-    60:60:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):190:190 -> a
-    61:68:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):194:201 -> a
+    59:59:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):182 -> a
+    60:60:boolean hasInliningAccess(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):183:183 -> a
+    61:68:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):187:194 -> a
     69:69:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
-    69:69:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):201 -> a
+    69:69:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):194 -> a
     70:70:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> a
-    70:70:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):204 -> a
-    71:72:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):209:210 -> a
-    73:80:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):245:252 -> a
-    81:94:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):251:264 -> a
-    95:99:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):254:258 -> a
-    100:106:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):254:260 -> a
-    107:131:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):784:808 -> a
-    132:133:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):833:834 -> a
-    134:142:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):843:851 -> a
-    143:143:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):862:862 -> a
-    143:143:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):845 -> a
-    144:144:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):852:852 -> a
-    145:145:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):862:862 -> a
-    146:187:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):879:920 -> a
-    188:199:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):919:930 -> a
-    200:207:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1020:1027 -> a
-    200:207:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):935 -> a
-    208:208:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):1025:1025 -> a
-    208:208:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):935 -> a
-    209:209:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):935:935 -> a
-    210:248:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):931:969 -> a
-    249:258: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.DexEncodedMethod):1047:1056 -> a
-    249:258:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):975 -> a
-    259:292:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):969:1002 -> a
-    293:295:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):70:72 -> a
-    293:295:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1002 -> a
-    296:296:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1003:1003 -> a
-    297:297:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):76:76 -> a
-    297:297:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1002 -> a
-    298:309:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1005:1016 -> a
-    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):169:175 -> b
-    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():905:905 -> b
-    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):175 -> b
-    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):227:238 -> b
-    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):215:221 -> c
+    70:70:boolean isVisibleWithFlags(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):197 -> a
+    71:72:boolean isDoubleInliningTarget(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.graph.DexEncodedMethod):202:203 -> a
+    73:80:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):238:245 -> a
+    81:94:void processDoubleInlineCallers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):244:257 -> a
+    95:99:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:251 -> a
+    100:106:java.lang.Object lambda$processDoubleInlineCallers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:253 -> a
+    107:131:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):773:797 -> a
+    132:133:void performForcedInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.Map):822:823 -> a
+    134:142:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):832:840 -> a
+    143:143:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):851:851 -> a
+    143:143:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):834 -> a
+    144:144:void performInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation):841:841 -> a
+    145:145:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.conversion.CallSiteInformation,int,int):851:851 -> a
+    146:185:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):868:907 -> a
+    186:193:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):979:986 -> a
+    186:193:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912 -> a
+    194:194:com.android.tools.r8.ir.code.Position getPositionForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexEncodedMethod):984:984 -> a
+    194:194:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912 -> a
+    195:195:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):912:912 -> a
+    196:231:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):908:943 -> a
+    232:241: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.DexEncodedMethod):1006:1015 -> a
+    232:241:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):949 -> a
+    242:274:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):943:975 -> a
+    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):162:168 -> b
+    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():1022:1022 -> b
+    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):168 -> b
+    9:20:void recordDoubleInliningCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):220:231 -> b
+    1:7:boolean satisfiesRequirementsForDoubleInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):208:214 -> c
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.Inliner$a:
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> d
@@ -31919,113 +31861,109 @@
     com.android.tools.r8.ir.optimize.Inliner$Constraint ALWAYS -> g
     com.android.tools.r8.ir.optimize.Inliner$Constraint SUBCLASS -> f
     int value -> a
-    1:17:void <clinit>():274:290 -> <clinit>
-    18:47:void <clinit>():274:303 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):294:295 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():274:274 -> a
-    1:1:boolean isSet(int):307:307 -> b
+    1:17:void <clinit>():267:283 -> <clinit>
+    18:47:void <clinit>():267:296 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):287:288 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():267:267 -> a
+    1:1:boolean isSet(int):300:300 -> b
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget:
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
     com.android.tools.r8.graph.DexType targetHolder -> b
     boolean $assertionsDisabled -> c
-    1:9:void <clinit>():325:333 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):335:338 -> <init>
-    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):341:345 -> <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):368:370 -> a
+    1:9:void <clinit>():318:326 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):328:331 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):334:338 -> <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):361:363 -> a
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> 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):371 -> 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):372:380 -> 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):364 -> 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):365:373 -> a
     14:14:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> 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):381 -> 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):383:387 -> 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):374 -> 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):376:380 -> a
     20:20:boolean com.android.tools.r8.graph.DexType.isSamePackage(com.android.tools.r8.graph.DexType):85:85 -> 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):390 -> 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):391:391 -> 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):397:402 -> 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):383 -> 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):384:384 -> 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):390:395 -> a
     28:28:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> 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):405 -> 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):407:408 -> a
-    1:5:boolean equals(java.lang.Object):358:362 -> equals
-    1:4:int hashCode():350:353 -> hashCode
+    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):398 -> 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):400:401 -> a
+    1:5:boolean equals(java.lang.Object):351:355 -> equals
+    1:4:int hashCode():343:346 -> hashCode
     5:5:int com.android.tools.r8.graph.DexType.computeHashCode():43:43 -> hashCode
-    5:5:int hashCode():353 -> hashCode
-    1:51: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):413:463 -> meet
-    52:52:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):537:537 -> meet
-    52:52: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):463 -> meet
+    5:5:int hashCode():346 -> hashCode
+    1:51: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):406:456 -> meet
+    52:52:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):530:530 -> meet
+    52:52: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 -> meet
     53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> meet
-    53:53:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):538 -> meet
-    53:53: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):463 -> meet
-    54:59:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):539:544 -> meet
-    54:59: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):463 -> meet
+    53:53:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):531 -> meet
+    53:53: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 -> meet
+    54:59:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):532:537 -> meet
+    54:59: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 -> meet
     60:60:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> meet
-    60:60:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):544 -> meet
-    60:60: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):463 -> meet
-    61:63:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):545:547 -> meet
-    61:63: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):463 -> meet
-    64:71: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):464:471 -> meet
+    60:60:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):537 -> meet
+    60:60: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 -> meet
+    61:63:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):538:540 -> meet
+    61:63: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 -> meet
+    64:71: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):457:464 -> meet
     72:72:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> meet
-    72:72:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):514 -> meet
-    72:72: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):471 -> meet
-    73:80:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):516:523 -> meet
-    73:80: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):471 -> meet
+    72:72:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):507 -> meet
+    72:72: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):464 -> meet
+    73:80:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):509:516 -> meet
+    73:80: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):464 -> meet
     81:81:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> meet
-    81:81:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):523 -> meet
-    81: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):471 -> meet
-    82:86:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):525:529 -> meet
-    82: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):471 -> meet
-    87:121: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):475:509 -> meet
+    81:81:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):516 -> meet
+    81: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):464 -> meet
+    82:86:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):518:522 -> meet
+    82: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):464 -> meet
+    87:121: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):468:502 -> meet
 com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.ir.optimize.Inliner$b:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> b
     boolean shouldSynthesizeNullCheckForReceiver -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():572:572 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):580:583 -> <init>
-    1:1:void setShouldSynthesizeNullCheckForReceiver():587:587 -> a
-    2:17:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):597:612 -> a
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    18:18:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):612 -> a
-    19:43:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):613:637 -> a
+    1:1:void <clinit>():565:565 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.optimize.Inliner$Reason):573:576 -> <init>
+    1:1:void setShouldSynthesizeNullCheckForReceiver():580:580 -> a
+    2:17:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):589:604 -> a
+    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    18:18:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):604 -> a
+    19:43:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):605:629 -> a
     44:46: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
-    44:46:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):638 -> a
-    47:64:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):639:656 -> a
-    65:89:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):655:679 -> a
-    90:95:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):678:683 -> a
-    96:96:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    96:96:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):685 -> a
-    97:97:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):685:685 -> a
-    98:107:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):683:692 -> a
-    108:108:java.lang.Object com.android.tools.r8.utils.ListUtils.first(java.util.List):16:16 -> a
-    108:108:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):694 -> a
-    109:109:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):694:694 -> a
-    110:110: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.TypeLatticeElement):1040:1040 -> a
-    110:110:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):696 -> a
-    111:112:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):697:698 -> a
-    113:113:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):131:131 -> a
-    113:113:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):700 -> a
-    114:143:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):704:733 -> a
-    144:144:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):732:732 -> a
-    145:145:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
-    145:145:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):731 -> a
-    146:179:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):734:767 -> a
-    180:180:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):699:699 -> a
+    44:46:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):630 -> a
+    47:64:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):631:648 -> a
+    65:89:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):647:671 -> a
+    90:95:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):670:675 -> a
+    96:96:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    96:96:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):677 -> a
+    97:97:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):677:677 -> a
+    98:109:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):675:686 -> a
+    110:110: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.TypeLatticeElement):1036:1036 -> a
+    110:110:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):688 -> a
+    111:112:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):689:690 -> a
+    113:113:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):130:130 -> a
+    113:113:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):692 -> a
+    114:143:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):696:725 -> a
+    144:144:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):724:724 -> a
+    145:145:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
+    145:145:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):723 -> a
+    146:176:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.conversion.LensCodeRewriter):726:756 -> a
+    177:177:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):691:691 -> a
 com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.ir.optimize.s:
     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):776:778 -> <init>
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):765:767 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.ir.optimize.t:
     com.android.tools.r8.graph.DexEncodedMethod target -> a
     com.android.tools.r8.graph.DexType receiverType -> b
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):822:824 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):811:813 -> <init>
 com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.ir.optimize.Inliner$c:
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> e
     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:5:void <clinit>():560:564 -> <clinit>
-    1:1:void <init>(java.lang.String,int):559:559 -> <init>
-    1:1:boolean mustBeInlined():568:568 -> a
+    1:5:void <clinit>():553:557 -> <clinit>
+    1:1:void <init>(java.lang.String,int):552:552 -> <init>
 com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.u:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLense graphLense -> c
@@ -32097,7 +32035,6 @@
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType) -> a
 com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.ir.optimize.w:
-    boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     void ensureMethodProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback) -> a
     com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod) -> a
@@ -32210,72 +32147,72 @@
     java.util.Set warnedFields -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.Reporter reporter -> b
-    1:3:void <clinit>():46:48 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):87:87 -> <init>
-    2:37:void <init>(com.android.tools.r8.graph.AppView):54:89 -> <init>
-    1:5:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedField):93:97 -> a
-    6:13:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup lookupMemberRule(com.android.tools.r8.graph.DexDefinition):112:119 -> a
-    14:17:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):181:184 -> a
-    18:20:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):183:185 -> a
-    21:21: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):222:222 -> a
-    22:32:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):126:136 -> a
-    22:32: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):222 -> a
-    33:40:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):135:142 -> a
-    33:40: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):222 -> a
-    41:50:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):141:150 -> a
-    41:50: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):222 -> a
-    51:69:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):147:165 -> a
-    51:69: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):222 -> a
-    70:81:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):160:171 -> a
-    70:81: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):222 -> a
-    82:82: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):225:225 -> a
-    83:85:void setValueRangeFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.Value):209:211 -> a
-    83:85: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):225 -> a
-    86:99: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):228:241 -> a
-    100:107:void rewriteStaticGetWithConstantValues(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.StaticGet):345:352 -> a
-    108:153:void rewriteStaticGetWithConstantValues(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.StaticGet):351:396 -> a
-    154:154:java.lang.Boolean lambda$rewriteStaticGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):352:352 -> a
-    155:169:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):436:450 -> a
-    170:219:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):254:303 -> a
-    170:219:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    220:224:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):101:105 -> a
-    220:224:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):307 -> a
-    220:224:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    225:231:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):310:316 -> a
-    225:231:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    232:239:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):315:322 -> a
-    232:239:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    240:244:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):193:197 -> a
-    240:244:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321 -> a
-    240:244:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    245:248:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):195:198 -> a
-    245:248:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321 -> a
-    245:248:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    249:259:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):194:204 -> a
-    249:259:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321 -> a
-    249:259:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    260:270:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):325:335 -> a
-    260:270:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):449 -> a
-    271:277:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):451:457 -> a
-    278:286:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):452:460 -> a
-    287:308:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):405:426 -> a
-    287:308:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):459 -> a
-    309:310:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):464:465 -> a
-    311:311:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    311:311:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):465 -> a
-    312:314:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):465:467 -> a
+    1:3:void <clinit>():43:45 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):84:84 -> <init>
+    2:37:void <init>(com.android.tools.r8.graph.AppView):51:86 -> <init>
+    1:5:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedField):90:94 -> a
+    6:13:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup lookupMemberRule(com.android.tools.r8.graph.DexDefinition):109:116 -> a
+    14:17:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):178:181 -> a
+    18:20:com.android.tools.r8.ir.code.ConstNumber createConstNumberReplacement(com.android.tools.r8.ir.code.IRCode,long,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):180:182 -> a
+    21:21: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):218:218 -> a
+    22:32:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):123:133 -> a
+    22:32: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):218 -> a
+    33:40:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):132:139 -> a
+    33:40: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):218 -> a
+    41:50:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):138:147 -> a
+    41:50: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):218 -> a
+    51:69:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):144:162 -> a
+    51:69: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):218 -> a
+    70:81:com.android.tools.r8.ir.code.Instruction constantReplacementFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):157:168 -> a
+    70:81: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):218 -> a
+    82:82: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):221:221 -> a
+    83:85:void setValueRangeFromProguardRule(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.code.Value):205:207 -> a
+    83:85: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):221 -> a
+    86:99: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):224:237 -> a
+    100:107:void rewriteStaticGetWithConstantValues(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.StaticGet):341:348 -> a
+    108:153:void rewriteStaticGetWithConstantValues(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.StaticGet):347:392 -> a
+    154:154:java.lang.Boolean lambda$rewriteStaticGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):348:348 -> a
+    155:169:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):432:446 -> a
+    170:219:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):250:299 -> a
+    170:219:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    220:224:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedMethod):98:102 -> a
+    220:224:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):303 -> a
+    220:224:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    225:231:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):306:312 -> a
+    225:231:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    232:239:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):311:318 -> a
+    232:239:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    240:244:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):190:194 -> a
+    240:244:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    240:244:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    245:248:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):192:195 -> a
+    245:248:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    245:248:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    249:258:com.android.tools.r8.ir.code.ConstString createConstStringReplacement(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.TypeLatticeElement,com.android.tools.r8.graph.DebugLocalInfo):191:200 -> a
+    249:258:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):317 -> a
+    249:258:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    259:269:void rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):321:331 -> a
+    259:269:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):445 -> a
+    270:276:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):447:453 -> a
+    277:285:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):448:456 -> a
+    286:307:void rewriteInstanceGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet):401:422 -> a
+    286:307:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):455 -> a
+    308:309:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):460:461 -> a
+    310:310:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    310:310:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):461 -> a
+    311:313:void rewriteWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):461:463 -> a
 com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.ir.optimize.z:
     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):67:69 -> <init>
-    1:5:boolean equals(java.lang.Object):74:78 -> equals
-    1:1:int hashCode():83:83 -> hashCode
+    1:3:void <init>(com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType,com.android.tools.r8.shaking.ProguardMemberRule):64:66 -> <init>
+    1:5:boolean equals(java.lang.Object):71:75 -> equals
+    1:1:int hashCode():80:80 -> hashCode
 com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.ir.optimize.A:
     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>():57:59 -> <clinit>
-    1:1:void <init>(java.lang.String,int):56:56 -> <init>
+    1:3:void <clinit>():54:56 -> <clinit>
+    1:1:void <init>(java.lang.String,int):53:53 -> <init>
 com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.ir.optimize.C:
     java.util.function.Predicate methodTester -> e
     1:2:void <init>(com.android.tools.r8.graph.AppView):37:38 -> <init>
@@ -32343,7 +32280,7 @@
     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():932:932 -> a
+    15:15:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> 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):168:168 -> 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
@@ -32414,7 +32351,7 @@
     20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.Outliner$Outline.buildMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):581:581 -> a
     20:20:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1333 -> a
     21:30:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1334:1343 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     31:31:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1343 -> a
     32:63:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1344:1375 -> a
     64:70:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):1392:1398 -> a
@@ -32651,7 +32588,7 @@
     5:10:java.util.List orderedInValues(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):767:772 -> 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():335:335 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> 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):945:951 -> a
     39:71:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):957:989 -> a
@@ -32847,7 +32784,7 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView):71:77 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():81:81 -> a
     2:2:void rewrite(com.android.tools.r8.ir.code.IRCode):85:85 -> a
-    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    3:3:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     3:3:void rewrite(com.android.tools.r8.ir.code.IRCode):86 -> a
     4:72:void rewrite(com.android.tools.r8.ir.code.IRCode):87:155 -> a
     73:73:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
@@ -32885,7 +32822,7 @@
     247:248:com.android.tools.r8.graph.DexEncodedMethod createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List):225:226 -> a
     247:248:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):171 -> a
     249:249:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172:172 -> a
-    250:250:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    250:250:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     250:250:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):172 -> a
     251:251:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):173:173 -> a
 com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.ir.optimize.a0:
@@ -32947,15 +32884,15 @@
     1:7:com.android.tools.r8.shaking.AppInfoWithLiveness run():80:86 -> a
     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):168:168 -> 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):168:168 -> 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
+    17:35:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):103:121 -> a
+    36:36:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    36:36:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):121 -> a
+    37:47:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):122:132 -> a
+    48:48:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    48:48:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):132 -> a
+    49:60:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):132:143 -> a
+    61:61:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):107:107 -> a
+    62:64:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):148:150 -> a
 com.android.tools.r8.ir.optimize.SwitchUtils$1 -> com.android.tools.r8.ir.optimize.e0:
 com.android.tools.r8.ir.optimize.SwitchUtils$EnumSwitchInfo -> com.android.tools.r8.ir.optimize.f0:
     com.android.tools.r8.ir.code.Instruction arrayGet -> b
@@ -33005,13 +32942,10 @@
     287:295:void rewrite(com.android.tools.r8.ir.code.IRCode):408:416 -> a
     296:316: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,java.util.Set,java.util.Set):536:556 -> a
     296:316:void rewrite(com.android.tools.r8.ir.code.IRCode):415 -> a
-    317:317:void rewrite(com.android.tools.r8.ir.code.IRCode):425:425 -> a
-    318:318:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> a
-    318:318:void rewrite(com.android.tools.r8.ir.code.IRCode):426 -> a
-    319:321:void rewrite(com.android.tools.r8.ir.code.IRCode):427:429 -> a
-    322:322:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
-    322:322:void rewrite(com.android.tools.r8.ir.code.IRCode):429 -> a
-    323:325:void rewrite(com.android.tools.r8.ir.code.IRCode):429:431 -> a
+    317:318:void rewrite(com.android.tools.r8.ir.code.IRCode):425:426 -> a
+    319:319:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
+    319:319:void rewrite(com.android.tools.r8.ir.code.IRCode):426 -> a
+    320:325:void rewrite(com.android.tools.r8.ir.code.IRCode):426:431 -> a
     326:330:void logResults():458:462 -> a
     331:338:void logResults():459:466 -> a
     339:344:void logResults():463:468 -> a
@@ -33052,29 +32986,29 @@
     2:2:com.android.tools.r8.utils.MethodSignatureEquivalence access$100():45:45 -> a
     3:9:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):98:104 -> a
     10:36:com.android.tools.r8.graph.GraphLense run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):98:124 -> a
-    37:48:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):221:232 -> a
-    37:48:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    49:49:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
-    49:49:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):236 -> a
-    49:49:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    50:62:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):237:249 -> a
-    50:62:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
-    63:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):287:318 -> a
-    95:95:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
-    95:95:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):320 -> a
-    96:98:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):321:323 -> a
-    99:106:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):319:326 -> a
-    107:125:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):333:351 -> a
-    1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):255:272 -> b
-    19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):271:276 -> b
+    37:44:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):221:228 -> a
+    37:44:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    45:45:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod):275:275 -> a
+    45:45:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):229 -> a
+    45:45:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    46:58:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):230:242 -> a
+    46:58:void lambda$runnableForClass$0(com.android.tools.r8.graph.DexProgramClass):217 -> a
+    59:90:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):280:311 -> a
+    91:91:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo$Builder com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentInfo.builder():119:119 -> a
+    91:91:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):313 -> a
+    92:94:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):314:316 -> a
+    95:102:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo collectUnusedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):312:319 -> a
+    103:121:com.android.tools.r8.graph.DexProto createProtoWithRemovedArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription$RemovedArgumentsInfo):326:344 -> a
+    1:18:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):248:265 -> b
+    19:24:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):264:269 -> b
     1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):217:217 -> c
 com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.ir.optimize.j0:
 com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.ir.optimize.k0:
     java.util.BitSet used -> a
-    1:3:void <init>():354:356 -> <init>
-    4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):354:354 -> <init>
-    1:1:java.util.BitSet getUsedArguments():359:359 -> a
-    2:2:boolean register(int):364:364 -> a
+    1:3:void <init>():347:349 -> <init>
+    4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):347:347 -> <init>
+    1:1:java.util.BitSet getUsedArguments():352:352 -> a
+    2:2:boolean register(int):357:357 -> a
 com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.ir.optimize.l0:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> b
     com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool methodPool -> a
@@ -33119,7 +33053,7 @@
     51:53:void logIneligibleUser(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionOrPhi):77:79 -> a
     51:53: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):218 -> a
     54:63: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):223:232 -> a
-    64:64:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1093:1093 -> a
+    64:64:void com.android.tools.r8.ir.code.IRCode.removeAllTrivialPhis(java.util.Set):1089:1089 -> a
     64:64: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):233 -> a
     65:66: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.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):234:235 -> a
     67:67:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
@@ -33185,10 +33119,10 @@
     12:43:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):86:117 -> a
     1:13:com.android.tools.r8.ir.code.Value getOrCreateOutValue(com.android.tools.r8.ir.code.BasicBlock):69:81 -> b
     14:43:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):123:152 -> b
-    44:44:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> b
+    44:44:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> b
     44:44:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151 -> b
     45:49:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):151:155 -> b
-    50:50:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> b
+    50:50:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> b
     50:50:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):155 -> b
     51:54:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):157:160 -> b
 com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.ir.optimize.p0.d:
@@ -33229,7 +33163,7 @@
     132:132:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):370:370 -> a
     133:139:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):409:415 -> a
     133:139:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
-    140:140:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):27:27 -> a
+    140:140:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):28:28 -> a
     140:140:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):415 -> a
     140:140:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):371 -> a
     141:146:void replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):416:421 -> a
@@ -33324,16 +33258,15 @@
     1:1:com.android.tools.r8.ir.optimize.info.DefaultCallSiteOptimizationInfo getInstance():16:16 -> d
 com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.ir.optimize.info.c:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
-    1:1:void <clinit>():12:12 -> <clinit>
-    1:1:void <init>():14:14 -> <init>
+    1:1:void <clinit>():11:11 -> <clinit>
+    1:1:void <init>():13:13 -> <init>
     boolean cannotBeKept() -> b
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType() -> c
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType() -> d
-    int getReadBits() -> e
-    boolean isDefaultFieldOptimizationInfo() -> f
-    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():22:22 -> h
-    boolean valueHasBeenPropagated() -> i
-    1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():17:17 -> j
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType() -> c
+    int getReadBits() -> d
+    boolean isDefaultFieldOptimizationInfo() -> e
+    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():21:21 -> g
+    boolean valueHasBeenPropagated() -> h
+    1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():16:16 -> i
 com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.ir.optimize.info.d:
     boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT -> m
     boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS -> p
@@ -33399,16 +33332,15 @@
     1:1:boolean mayHaveSideEffects():201:201 -> y
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():77:77 -> z
 com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.ir.optimize.info.e:
-    1:1:void <init>():10:10 -> <init>
+    1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
     boolean cannotBeKept() -> b
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType() -> c
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType() -> d
-    int getReadBits() -> e
-    boolean isDefaultFieldOptimizationInfo() -> f
-    boolean isMutableFieldOptimizationInfo() -> g
-    com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> h
-    boolean valueHasBeenPropagated() -> i
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType() -> c
+    int getReadBits() -> d
+    boolean isDefaultFieldOptimizationInfo() -> e
+    boolean isMutableFieldOptimizationInfo() -> f
+    com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> g
+    boolean valueHasBeenPropagated() -> h
 com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.ir.optimize.info.f:
     long getReturnedConstantNumber() -> A
     com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility() -> B
@@ -33454,115 +33386,85 @@
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():63:63 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView):68:71 -> <init>
-    1:1: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):79:79 -> a
-    2:6:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):194:198 -> a
-    2: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):80 -> a
-    7:13:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage collectParameterUsages(int,com.android.tools.r8.ir.code.Value):214:220 -> a
-    7:13:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):201 -> a
-    7:13: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):80 -> a
-    14:21:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):203:210 -> a
-    14:21: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):80 -> a
-    22:22:void identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):206:206 -> a
-    22:22: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):80 -> a
-    23:63:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):225:265 -> a
-    23:63: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):81 -> a
-    64:66: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):82:84 -> a
-    67:70:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):476:479 -> a
-    67:70: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):84 -> a
-    71:77:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):478:484 -> a
-    71: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):84 -> a
-    78:78:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):483:483 -> 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):84 -> a
-    79:97: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):732:750 -> a
-    79:97: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):86 -> a
-    98:104:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):757:763 -> a
-    98:104: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):87 -> a
-    105:105: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):88:88 -> a
-    106:112:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):838:844 -> a
-    106: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):89 -> a
-    113:135:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):851:873 -> a
-    113:135: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):90 -> a
-    136:167:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):878:909 -> a
-    136:167: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):91 -> a
-    168:213: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):931:976 -> a
-    168:213:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):910 -> a
-    168:213: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):91 -> a
-    214:219:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):916:921 -> a
-    214:219: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):91 -> a
-    220:233:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):109:122 -> a
-    234:234:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    234:234:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):122 -> a
-    235:276:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):129:170 -> a
-    277:277:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):169:169 -> a
-    278:322:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):144:188 -> a
-    323:323:boolean lambda$identifyClassInlinerEligibility$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):170:170 -> a
-    324:324:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):496:496 -> a
-    325:341: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):499:515 -> a
-    342:400:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):527:585 -> a
-    401:440:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):546:585 -> a
-    441:453:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):573:585 -> a
-    454:454:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):596:596 -> a
-    455:459: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):599:603 -> a
-    460:475:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):679:694 -> a
-    460:475: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):605 -> a
-    476:495: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):606:625 -> a
-    496:501: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):624:629 -> a
-    502:509:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):713:720 -> a
-    502:509: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):629 -> a
-    510:530: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):630:650 -> a
-    531:533:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):702:704 -> a
-    534:545:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):771:782 -> a
-    546:561: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
-    546:561:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    562:562: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):539:539 -> a
-    562:562: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
-    562:562:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    563:571: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
-    563:571:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    572:598: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
-    572:598:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    599:654: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
-    599:654:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):783 -> a
-    655:655:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():32:32 -> a
-    655:655:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):784 -> a
-    656:657:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):785:786 -> a
-    658:658:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():28:28 -> a
-    658:658:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):787 -> a
-    659:659:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):788:788 -> a
-    660:660:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():32:32 -> a
-    660:660:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):784 -> a
-    661:664:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):793:796 -> a
-    665:665:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):815:815 -> a
-    665:665:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):796 -> a
-    666:666:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    666:666:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):815 -> a
-    666:666:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):796 -> a
-    667:673:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):817:823 -> a
-    667:673:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):796 -> a
-    674:678:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):804:808 -> a
-    679:679:boolean lambda$computeMayHaveSideEffects$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):805:805 -> a
-    1:24:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):271:294 -> b
-    25:25:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):394:394 -> b
-    25:25:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):294 -> b
-    26:26:boolean com.android.tools.r8.graph.DexClass.definesFinalizer(com.android.tools.r8.graph.DexItemFactory):801:801 -> b
-    26:26:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):394 -> b
-    26:26:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):294 -> b
-    27:100:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):398:471 -> b
-    27:100:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):294 -> b
-    101:161:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):307:367 -> b
-    101:161:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):295 -> b
-    162:223:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):313:374 -> b
-    162:223:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):295 -> b
-    224:224:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):291:291 -> b
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):67:70 -> <init>
+    1:14:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):109:122 -> a
+    15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    15:15:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):122 -> a
+    16:52:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):129:165 -> a
+    53:96:void identifyClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):140:183 -> a
+    97:100:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):445:448 -> a
+    101:107:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):447:453 -> a
+    108:108:void identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):452:452 -> a
+    109:109:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):465:465 -> a
+    110:126:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$0(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):468:484 -> a
+    127:185:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):496:554 -> a
+    186:225:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):515:554 -> a
+    226:238:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):542:554 -> a
+    239:239:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):565:565 -> a
+    240:244:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):568:572 -> a
+    245:260:boolean isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):648:663 -> a
+    245:260:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):574 -> a
+    261:280:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):575:594 -> a
+    281:286:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):593:598 -> a
+    287:294:boolean isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):682:689 -> a
+    287:294:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):598 -> a
+    295:315:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$1(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):599:619 -> a
+    316:318:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):671:673 -> a
+    319:337: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):701:719 -> a
+    338:344:void computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):726:732 -> a
+    345:345:boolean lambda$computeMayHaveSideEffects$2(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction):774:774 -> a
+    346:377:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):847:878 -> a
+    378:423: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):900:945 -> a
+    378:423:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):879 -> a
+    424:429:void computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):885:890 -> a
+    1:40:void identifyReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):216:255 -> b
+    41:52:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):740:751 -> b
+    53:66: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):41:54 -> b
+    53:66:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    67:67: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):539:539 -> b
+    67:67: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):55 -> b
+    67:67:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    68:76: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):55:63 -> b
+    68:76:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    77:103: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):56:82 -> b
+    77:103:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    104:159: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):75:130 -> b
+    104:159:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):752 -> b
+    160:160:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> b
+    160:160:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):753 -> b
+    161:162:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):754:755 -> b
+    163:163:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():27:27 -> b
+    163:163:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):756 -> b
+    164:164:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):757:757 -> b
+    165:165:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():31:31 -> b
+    165:165:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):753 -> b
+    166:169:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):762:765 -> b
+    170:170:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):784:784 -> b
+    170:170:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):765 -> b
+    171:171:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
+    171:171:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):784 -> b
+    171:171:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):765 -> b
+    172:178:boolean hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexType):786:792 -> b
+    172:178:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):765 -> b
+    179:183:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):773:777 -> b
+    1:17:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):261:277 -> c
+    18:87:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeInstanceInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass,java.util.function.Function):371:440 -> c
+    18:87:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):277 -> c
+    88:144:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):290:346 -> c
+    88:144:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):278 -> c
+    145:202:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer computeClassInitializerInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexClass):296:353 -> c
+    145:202:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):278 -> c
+    203:203:void identifyTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):274:274 -> c
+    204:226:void computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):820:842 -> c
+    1:7:void computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):807:813 -> d
 com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.ir.optimize.info.g:
     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>():669:672 -> <clinit>
-    1:1:void <init>(java.lang.String,int):668:668 -> <init>
+    1:4:void <clinit>():638:641 -> <clinit>
+    1:1:void <init>(java.lang.String,int):637:637 -> <init>
 com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo -> com.android.tools.r8.ir.optimize.info.l:
     java.util.Map callSiteInfos -> b
     com.android.tools.r8.ir.optimize.info.MutableCallSiteOptimizationInfo$ArgumentCollection cachedRepresentative -> c
@@ -33615,32 +33517,29 @@
     1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType(int):38:38 -> a
     1:1:int hashCode():43:43 -> hashCode
 com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.ir.optimize.info.m:
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicUpperBoundType -> e
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement dynamicLowerBoundType -> d
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement dynamicType -> d
     boolean cannotBeKept -> b
     boolean valueHasBeenPropagated -> c
     int readBits -> a
-    1:7:void <init>():21:27 -> <init>
+    1:6:void <init>():20:25 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
-    1:5:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):31:35 -> a
-    6:6:void joinReadBits(int):53:53 -> a
-    7:7:void setDynamicLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):71:71 -> a
-    8:8:void setDynamicUpperBoundType(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):80:80 -> a
-    1:1:boolean cannotBeKept():58:58 -> b
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():67:67 -> c
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicUpperBoundType():76:76 -> d
-    1:1:int getReadBits():49:49 -> e
-    boolean isMutableFieldOptimizationInfo() -> g
-    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():41:41 -> h
-    2:2:boolean cannotBeKept():58:58 -> h
-    2:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():42 -> h
-    3:3:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():42:42 -> h
-    4:4:boolean valueHasBeenPropagated():85:85 -> h
-    4:4:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():43 -> h
-    5:5:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():43:43 -> h
-    1:1:boolean valueHasBeenPropagated():85:85 -> i
-    1:1:void markAsPropagated():89:89 -> j
-    1:1:void markCannotBeKept():62:62 -> k
+    1:2:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):29:30 -> a
+    3:3:void joinReadBits(int):48:48 -> a
+    4:4:void setDynamicType(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):66:66 -> a
+    1:1:boolean cannotBeKept():53:53 -> b
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicType():62:62 -> c
+    1:1:int getReadBits():44:44 -> d
+    boolean isMutableFieldOptimizationInfo() -> f
+    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():36:36 -> g
+    2:2:boolean cannotBeKept():53:53 -> g
+    2:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():37 -> g
+    3:3:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():37:37 -> g
+    4:4:boolean valueHasBeenPropagated():71:71 -> g
+    4:4:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():38 -> g
+    5:5:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():38:38 -> g
+    1:1:boolean valueHasBeenPropagated():71:71 -> h
+    1:1:void markAsPropagated():75:75 -> i
+    1:1:void markCannotBeKept():57:57 -> j
 com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.ir.optimize.info.n:
     1:1:void <init>():20:20 -> <init>
     1:4:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):33:36 -> a
@@ -33653,53 +33552,50 @@
     java.util.Map fieldOptimizationInfos -> a
     java.util.Map methodOptimizationInfos -> b
     java.util.Map processed -> c
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:8:void <init>():26:33 -> <init>
-    1:2:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):61:62 -> a
-    3:3:boolean lambda$updateVisibleOptimizationInfo$0(java.util.Map$Entry):70:70 -> a
-    4:9:boolean noUpdatesLeft():87:92 -> a
-    10:10:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):105:105 -> a
-    11:11:void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):111:111 -> a
-    12:12:void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):116:116 -> a
-    13:14:void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):144:145 -> a
-    15:15:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):150:150 -> a
-    16:16:void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long):155:155 -> a
-    17:17:void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):160:160 -> a
-    18:18:void methodReturnsObjectOfType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):166:166 -> a
-    19:19:void methodReturnsObjectWithLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):172:172 -> a
-    20:20:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):182:182 -> a
-    21:21:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):202:202 -> a
-    22:22:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):219:219 -> a
-    23:23:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):225:225 -> a
-    24:24:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):230:230 -> a
-    25:25:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):241:241 -> a
-    26:26:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):246:246 -> a
-    1:2:void updateVisibleOptimizationInfo():69:70 -> b
-    3:17:void updateVisibleOptimizationInfo():69:83 -> b
-    18:18:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):71:71 -> b
-    19:19:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):100:100 -> b
-    20:20:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):213:213 -> b
-    21:21:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):235:235 -> b
-    22:22:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):251:251 -> b
-    1:6:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getFieldOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedField):37:42 -> c
-    7:7:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):187:187 -> c
-    1:1:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):133:133 -> d
-    1:1:void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod):192:192 -> e
-    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):207:207 -> f
-    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):177:177 -> g
-    1:1:void markForceInline(com.android.tools.r8.graph.DexEncodedMethod):128:128 -> h
-    1:1:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):256:256 -> i
-    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):138:138 -> j
-    1:6:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):48:53 -> k
-    1:1:void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int):121:121 -> markFieldBitsRead
+    1:8:void <init>():25:32 -> <init>
+    1:2:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):60:61 -> a
+    3:4:void updateVisibleOptimizationInfo():68:69 -> a
+    5:19:void updateVisibleOptimizationInfo():68:82 -> a
+    20:20:boolean lambda$updateVisibleOptimizationInfo$0(java.util.Map$Entry):69:69 -> a
+    21:21:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):94:94 -> a
+    22:22:void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):99:99 -> a
+    23:24:void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):127:128 -> a
+    25:25:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):133:133 -> a
+    26:26:void methodReturnsConstantNumber(com.android.tools.r8.graph.DexEncodedMethod,long):138:138 -> a
+    27:27:void methodReturnsConstantString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexString):143:143 -> a
+    28:28:void methodReturnsObjectOfType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):149:149 -> a
+    29:29:void methodReturnsObjectWithLowerBoundType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):155:155 -> a
+    30:30:void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod):165:165 -> a
+    31:31:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):185:185 -> a
+    32:32:void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):202:202 -> a
+    33:33:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):208:208 -> a
+    34:34:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):213:213 -> a
+    35:35:void setParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):224:224 -> a
+    36:36:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):229:229 -> a
+    1:1:boolean lambda$updateVisibleOptimizationInfo$1(java.util.Map$Entry):70:70 -> b
+    2:2:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):89:89 -> b
+    3:3:void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean):196:196 -> b
+    4:4:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):218:218 -> b
+    5:5:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):234:234 -> b
+    1:6:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getFieldOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedField):36:41 -> c
+    7:7:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):170:170 -> c
+    1:1:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):116:116 -> d
+    2:2:void com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo.markInlinedIntoSingleCallSite():0:0 -> d
+    2:2:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):116 -> d
+    1:1:void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> e
+    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):190:190 -> f
+    1:1:void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod):160:160 -> g
+    1:1:void markForceInline(com.android.tools.r8.graph.DexEncodedMethod):111:111 -> h
+    1:1:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):239:239 -> i
+    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):121:121 -> j
+    1:6:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMethodOptimizationInfoForUpdating(com.android.tools.r8.graph.DexEncodedMethod):47:52 -> k
+    1:1:void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int):104:104 -> markFieldBitsRead
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore -> com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():24:24 -> <init>
     void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField) -> a
-    void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement) -> a
-    void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
+    void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
@@ -33732,8 +33628,7 @@
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():24:24 -> <init>
-    void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement) -> a
-    void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
+    void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeLatticeElement) -> a
     void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
     void methodNeverReturnsNormally(com.android.tools.r8.graph.DexEncodedMethod) -> a
@@ -33748,46 +33643,39 @@
     void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer) -> a
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple getInstance():27:27 -> a
     2:2:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):39:39 -> a
-    3:3:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):136:136 -> a
+    3:3:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):130:130 -> a
     void markCheckNullReceiverBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> b
     void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet) -> b
     1:1:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):34:34 -> b
-    2:2:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):167:167 -> b
+    2:2:void setInitializerEnablingJavaAssertions(com.android.tools.r8.graph.DexEncodedMethod):161:161 -> b
     void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod) -> c
-    1:1:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):67:67 -> d
+    1:1:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):61:61 -> d
+    2:2:void com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo.markInlinedIntoSingleCallSite():0:0 -> d
+    2:2:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):61 -> d
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> e
-    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):141:141 -> f
+    1:1:void markUseIdentifierNameString(com.android.tools.r8.graph.DexEncodedMethod):135:135 -> f
     void methodNeverReturnsNull(com.android.tools.r8.graph.DexEncodedMethod) -> g
     void markForceInline(com.android.tools.r8.graph.DexEncodedMethod) -> h
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> i
-    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):72:72 -> j
+    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):66:66 -> j
 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>():28:28 -> <clinit>
-    1:5:void <init>(java.util.List):32:36 -> <init>
-    6:6:void <init>(java.util.List):35:35 -> <init>
-    1:1:java.lang.Integer lambda$new$0(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage):36:36 -> a
-    2:3:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsage(int):40:41 -> a
-    1:2:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):49:50 -> b
-    3:3:java.lang.Object com.android.tools.r8.utils.ListUtils.last(java.util.List):20:20 -> b
-    3:3:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):50 -> b
-    4:8:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):50:54 -> b
-    9:10:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage.copyAndShift(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,int):109:110 -> b
-    9:10:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):55 -> b
-    11:24:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):55:68 -> b
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:5:void <init>(java.util.List):31:35 -> <init>
+    6:6:void <init>(java.util.List):34:34 -> <init>
+    1:1:java.lang.Integer lambda$new$0(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage):35:35 -> a
+    2:3:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsage(int):39:40 -> a
 com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.ir.optimize.info.q$a:
     java.util.List callsReceiver -> c
     boolean hasFieldRead -> e
     boolean isAssignedToField -> f
     boolean isReturned -> g
-    boolean $assertionsDisabled -> h
     java.util.Set ifZeroTest -> b
     int index -> a
     boolean hasFieldAssignment -> d
-    1:1:void <clinit>():71:71 -> <clinit>
-    1:10:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean):96:105 -> <init>
-    1:1:boolean notUsed():121:121 -> a
+    1:10:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean):72:81 -> <init>
+    1:1:boolean notUsed():85:85 -> a
 com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.ir.optimize.info.r:
     boolean $assertionsDisabled -> i
     java.util.Set ifZeroTestTypes -> c
@@ -33798,134 +33686,131 @@
     boolean isAssignedToField -> g
     boolean isReturned -> h
     int index -> a
-    1:1:void <clinit>():130:130 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,int):142:142 -> <init>
-    2:12:void <init>(com.android.tools.r8.ir.code.Value,int):134:144 -> <init>
-    1:6:boolean note(com.android.tools.r8.ir.code.Instruction):149:154 -> a
-    7:9:boolean note(com.android.tools.r8.ir.code.If):183:185 -> a
-    7:9:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    10:12:boolean note(com.android.tools.r8.ir.code.If):184:186 -> a
-    10:12:boolean note(com.android.tools.r8.ir.code.Instruction):154 -> a
-    13:14:boolean note(com.android.tools.r8.ir.code.Instruction):156:157 -> a
-    15:17:boolean note(com.android.tools.r8.ir.code.InstanceGet):193:195 -> a
-    15:17:boolean note(com.android.tools.r8.ir.code.Instruction):157 -> a
-    18:19:boolean note(com.android.tools.r8.ir.code.Instruction):159:160 -> a
-    20:27:boolean note(com.android.tools.r8.ir.code.InstancePut):202:209 -> a
-    20:27:boolean note(com.android.tools.r8.ir.code.Instruction):160 -> a
-    28:32:boolean note(com.android.tools.r8.ir.code.Instruction):162:166 -> a
-    33:34:boolean note(com.android.tools.r8.ir.code.Return):228:229 -> a
-    33:34:boolean note(com.android.tools.r8.ir.code.Instruction):166 -> a
-    35:37:boolean note(com.android.tools.r8.ir.code.Return):228:230 -> a
-    35:37:boolean note(com.android.tools.r8.ir.code.Instruction):166 -> a
-    38:38:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage build():172:172 -> a
-    39:39:boolean lambda$note$0(com.android.tools.r8.ir.code.Value):217:217 -> a
-    40:40:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):217:217 -> a
-    41:46:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):216:221 -> a
-    47:47:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):218:218 -> a
+    1:1:void <clinit>():94:94 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,int):106:106 -> <init>
+    2:12:void <init>(com.android.tools.r8.ir.code.Value,int):98:108 -> <init>
+    1:2:boolean note(com.android.tools.r8.ir.code.Instruction):113:114 -> a
+    3:5:boolean note(com.android.tools.r8.ir.code.If):143:145 -> a
+    3:5:boolean note(com.android.tools.r8.ir.code.Instruction):114 -> a
+    6:7:boolean note(com.android.tools.r8.ir.code.Instruction):116:117 -> a
+    8:10:boolean note(com.android.tools.r8.ir.code.InstanceGet):152:154 -> a
+    8:10:boolean note(com.android.tools.r8.ir.code.Instruction):117 -> a
+    11:12:boolean note(com.android.tools.r8.ir.code.Instruction):119:120 -> a
+    13:20:boolean note(com.android.tools.r8.ir.code.InstancePut):161:168 -> a
+    13:20:boolean note(com.android.tools.r8.ir.code.Instruction):120 -> a
+    21:22:boolean note(com.android.tools.r8.ir.code.Instruction):122:123 -> a
+    23:27:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):175:179 -> a
+    23:27:boolean note(com.android.tools.r8.ir.code.Instruction):123 -> a
+    28:28:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):176:176 -> a
+    28:28:boolean note(com.android.tools.r8.ir.code.Instruction):123 -> a
+    29:30:boolean note(com.android.tools.r8.ir.code.Instruction):125:126 -> a
+    31:32:boolean note(com.android.tools.r8.ir.code.Return):186:187 -> a
+    31:32:boolean note(com.android.tools.r8.ir.code.Instruction):126 -> a
+    33:33:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage build():132:132 -> a
 com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.ir.optimize.info.s:
-    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer trivialInitializerInfo -> u
-    long returnedConstantNumber -> k
-    boolean neverReturnsNormally -> i
-    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference inlining -> p
-    boolean useIdentifierNameString -> q
-    boolean triggersClassInitBeforeAnySideEffect -> s
-    java.util.BitSet nonNullParamOnNormalExits -> y
-    boolean mayHaveSideEffects -> f
-    boolean neverReturnsNull -> h
-    boolean returnValueHasBeenPropagated -> A
+    boolean returnsConstantNumber -> i
+    boolean returnsConstantString -> k
+    boolean initializerEnablingJavaAssertions -> u
+    int returnedArgument -> d
+    boolean checksNullReceiverBeforeAnySideEffect -> q
+    java.util.BitSet nonNullParamOrThrow -> w
+    java.util.Set initializedClassesOnNormalExit -> c
+    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility classInlinerEligibility -> s
+    boolean reachabilitySensitive -> y
+    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement returnsObjectWithLowerBoundType -> n
+    boolean returnValueOnlyDependsOnArguments -> f
+    com.android.tools.r8.ir.analysis.type.TypeLatticeElement returnsObjectOfType -> m
+    boolean neverReturnsNormally -> h
+    boolean $assertionsDisabled -> A
+    com.android.tools.r8.graph.DexString returnedConstantString -> l
     boolean classInitializerMayBePostponed -> b
-    boolean returnsConstantNumber -> j
-    boolean returnsConstantString -> l
-    boolean initializerEnablingJavaAssertions -> v
-    int returnedArgument -> e
-    boolean checksNullReceiverBeforeAnySideEffect -> r
-    com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement returnsObjectWithLowerBoundType -> o
-    com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo parametersUsages -> w
-    java.util.BitSet nonNullParamOrThrow -> x
-    java.util.Set initializedClassesOnNormalExit -> d
-    boolean reachabilitySensitive -> z
-    com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility classInlinerEligibility -> t
-    com.android.tools.r8.ir.analysis.type.TypeLatticeElement returnsObjectOfType -> n
-    boolean returnValueOnlyDependsOnArguments -> g
+    com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo parametersUsages -> v
+    long returnedConstantNumber -> j
+    boolean useIdentifierNameString -> p
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference inlining -> o
+    boolean triggersClassInitBeforeAnySideEffect -> r
+    com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer trivialInitializerInfo -> t
+    java.util.BitSet nonNullParamOnNormalExits -> x
+    boolean returnValueHasBeenPropagated -> z
+    boolean mayHaveSideEffects -> e
+    boolean neverReturnsNull -> g
     boolean cannotBeKept -> a
-    boolean $assertionsDisabled -> B
-    com.android.tools.r8.graph.DexString returnedConstantString -> m
-    boolean hasBeenInlinedIntoSingleCallSite -> c
-    1:1:void <clinit>():20:20 -> <clinit>
-    1:1:void <init>():81:81 -> <init>
-    2:59:void <init>():22:79 -> <init>
-    60:60:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):87:87 -> <init>
-    61:153:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):22:114 -> <init>
-    1:2:long getReturnedConstantNumber():255:256 -> A
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():250:250 -> B
-    1:1:java.util.Set getInitializedClassesOnNormalExit():174:174 -> C
-    1:1:boolean isInitializerEnablingJavaAssertions():267:267 -> D
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():179:179 -> E
-    1:1:java.util.BitSet getNonNullParamOrThrow():189:189 -> F
-    1:54:void adjustOptimizationInfoAfterRemovingThisParameter():455:508 -> G
-    1:1:void markAsPropagated():438:438 -> H
-    1:1:void markCannotBeKept():150:150 -> I
-    1:1:void markClassInitializerMayBePostponed():159:159 -> J
-    1:2:void markForceInline():405:406 -> K
-    1:1:void markInlinedIntoSingleCallSite():203:203 -> L
-    1:1:void markMayNotHaveSideEffects():344:344 -> M
-    1:2:void markNeverInline():419:420 -> N
-    1:1:void markNeverReturnsNormally():356:356 -> O
-    1:1:void markNeverReturnsNull():352:352 -> P
-    1:1:void markReturnValueOnlyDependsOnArguments():348:348 -> Q
-    1:1:void markUseIdentifierNameString():425:425 -> R
-    1:1:void setInitializerEnablingJavaAssertions():330:330 -> S
-    1:2:void unsetForceInline():412:413 -> T
-    1:6:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):119:124 -> a
-    7:7:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):184:184 -> a
-    8:8:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):306:306 -> a
-    9:9:void setNonNullParamOnNormalExits(java.util.BitSet):314:314 -> a
-    10:10:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):322:322 -> a
-    11:11:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):326:326 -> a
-    12:12:void markInitializesClassesOnNormalExit(java.util.Set):334:334 -> a
-    13:17:void markReturnsConstantNumber(long):360:364 -> a
-    18:22:void markReturnsConstantString(com.android.tools.r8.graph.DexString):368:372 -> a
-    23:32:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):376:385 -> a
-    33:36:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):384:387 -> a
-    37:43:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):391:397 -> a
-    44:49:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):394:399 -> a
-    50:50:void markCheckNullReceiverBeforeAnySideEffect(boolean):429:429 -> a
-    51:52:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():448:449 -> a
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():194:194 -> b
-    2:2:void setNonNullParamOrThrow(java.util.BitSet):310:310 -> b
-    3:5:void markReturnsArgument(int):338:340 -> b
-    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):433:433 -> b
-    1:1:boolean cannotBeKept():145:145 -> c
-    2:2:void setReachabilitySensitive(boolean):318:318 -> c
-    1:1:boolean checksNullReceiverBeforeAnySideEffect():287:287 -> d
-    1:1:boolean returnValueHasBeenPropagated():443:443 -> e
-    1:1:boolean classInitializerMayBePostponed():155:155 -> f
-    1:2:int getReturnedArgument():218:219 -> g
-    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():261:262 -> h
-    1:1:boolean returnValueOnlyDependsOnArguments():302:302 -> i
-    1:1:boolean neverInline():282:282 -> j
-    1:1:boolean neverReturnsNormally():229:229 -> k
-    1:2:boolean returnsConstant():234:235 -> l
-    1:1:boolean returnsConstantString():245:245 -> m
-    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicReturnType():164:164 -> n
-    1:1:boolean useIdentifierNameString():272:272 -> o
-    1:1:boolean triggersClassInitBeforeAnySideEffect():292:292 -> p
-    1:1:boolean returnsConstantNumber():240:240 -> q
-    1:1:boolean returnsArgument():213:213 -> r
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:1:void <init>():83:83 -> <init>
+    2:58:void <init>():25:81 -> <init>
+    59:59:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):87:87 -> <init>
+    60:143:void <init>(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):25:108 -> <init>
+    1:2:long getReturnedConstantNumber():249:250 -> A
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility getClassInlinerEligibility():244:244 -> B
+    1:1:java.util.Set getInitializedClassesOnNormalExit():168:168 -> C
+    1:1:boolean isInitializerEnablingJavaAssertions():261:261 -> D
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer getTrivialInitializerInfo():173:173 -> E
+    1:1:java.util.BitSet getNonNullParamOrThrow():183:183 -> F
+    1:41:void adjustOptimizationInfoAfterRemovingThisParameter():444:484 -> G
+    1:1:void markAsPropagated():427:427 -> H
+    1:1:void markCannotBeKept():144:144 -> I
+    1:1:void markClassInitializerMayBePostponed():153:153 -> J
+    1:2:void markForceInline():394:395 -> K
+    1:1:void markMayNotHaveSideEffects():338:338 -> L
+    1:2:void markNeverInline():408:409 -> M
+    1:1:void markNeverReturnsNormally():350:350 -> N
+    1:1:void markNeverReturnsNull():346:346 -> O
+    1:1:void markReturnValueOnlyDependsOnArguments():342:342 -> P
+    1:1:void markUseIdentifierNameString():414:414 -> Q
+    1:1:void setInitializerEnablingJavaAssertions():324:324 -> R
+    1:2:void unsetForceInline():401:402 -> S
+    1:6:void fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):113:118 -> a
+    7:7:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage getParameterUsages(int):178:178 -> a
+    8:8:void setParameterUsages(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo):300:300 -> a
+    9:9:void setNonNullParamOnNormalExits(java.util.BitSet):308:308 -> a
+    10:10:void setClassInlinerEligibility(com.android.tools.r8.graph.DexEncodedMethod$ClassInlinerEligibility):316:316 -> a
+    11:11:void setTrivialInitializer(com.android.tools.r8.graph.DexEncodedMethod$TrivialInitializer):320:320 -> a
+    12:12:void markInitializesClassesOnNormalExit(java.util.Set):328:328 -> a
+    13:17:void markReturnsConstantNumber(long):354:358 -> a
+    18:22:void markReturnsConstantString(com.android.tools.r8.graph.DexString):362:366 -> a
+    23:29:void markReturnsObjectOfType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeLatticeElement):370:376 -> a
+    30:36:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):380:386 -> a
+    37:42:void markReturnsObjectWithLowerBoundType(com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):383:388 -> a
+    43:43:void markCheckNullReceiverBeforeAnySideEffect(boolean):418:418 -> a
+    44:45:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo mutableCopy():437:438 -> a
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():188:188 -> b
+    2:2:void setNonNullParamOrThrow(java.util.BitSet):304:304 -> b
+    3:5:void markReturnsArgument(int):332:334 -> b
+    6:6:void markTriggerClassInitBeforeAnySideEffect(boolean):422:422 -> b
+    1:1:boolean cannotBeKept():139:139 -> c
+    2:2:void setReachabilitySensitive(boolean):312:312 -> c
+    1:1:boolean checksNullReceiverBeforeAnySideEffect():281:281 -> d
+    1:1:boolean returnValueHasBeenPropagated():432:432 -> e
+    1:1:boolean classInitializerMayBePostponed():149:149 -> f
+    1:2:int getReturnedArgument():212:213 -> g
+    1:2:com.android.tools.r8.graph.DexString getReturnedConstantString():255:256 -> h
+    1:1:boolean returnValueOnlyDependsOnArguments():296:296 -> i
+    1:1:boolean neverInline():276:276 -> j
+    1:1:boolean neverReturnsNormally():223:223 -> k
+    1:2:boolean returnsConstant():228:229 -> l
+    1:1:boolean returnsConstantString():239:239 -> m
+    1:1:com.android.tools.r8.ir.analysis.type.TypeLatticeElement getDynamicReturnType():158:158 -> n
+    1:1:boolean useIdentifierNameString():266:266 -> o
+    1:1:boolean triggersClassInitBeforeAnySideEffect():286:286 -> p
+    1:1:boolean returnsConstantNumber():234:234 -> q
+    1:1:boolean returnsArgument():207:207 -> r
     boolean isUpdatableMethodOptimizationInfo() -> s
-    1:1:boolean neverReturnsNull():224:224 -> t
-    1:1:boolean isReachabilitySensitive():208:208 -> u
+    1:1:boolean neverReturnsNull():218:218 -> t
+    1:1:boolean isReachabilitySensitive():202:202 -> u
     com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> v
-    1:1:boolean forceInline():277:277 -> w
+    1:1:boolean forceInline():271:271 -> w
     boolean isDefaultMethodOptimizationInfo() -> x
-    1:1:boolean mayHaveSideEffects():297:297 -> y
-    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():169:169 -> z
+    1:1:boolean mayHaveSideEffects():291:291 -> y
+    1:1:com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement getDynamicLowerBoundType():163:163 -> z
 com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.ir.optimize.q0.a:
     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
+    5:5:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:32 -> a
+    6:6:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():243:243 -> a
+    6:6:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32 -> a
+    7:11:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:36 -> a
+    12:12: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.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.q0.b:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -33942,9 +33827,8 @@
     void reportCallerNotSameNest() -> c
     void reportWillExceedInstructionBudget(int,int) -> c
     void reportCallerNotSamePackage() -> d
-    void reportWillExceedMaxInliningDepth(int,int) -> d
+    void reportWillExceedMonitorEnterValuesBudget(int,int) -> d
     void reportCallerNotSubtype() -> e
-    void reportWillExceedMonitorEnterValuesBudget(int,int) -> e
     void reportClasspathMethod() -> f
     void reportInaccessible() -> g
     void reportInlineeDoesNotHaveCode() -> h
@@ -33965,7 +33849,7 @@
     void reportReceiverMaybeNull() -> w
     void reportRecursiveMethod() -> x
     void reportUnknownTarget() -> y
-    boolean unsetReasonHasBeenReportedFlag() -> z
+    boolean verifyReasonHasBeenReported() -> z
 com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.ir.optimize.q0.c:
     1:1:void <init>():18:18 -> <init>
     void reportBlacklisted() -> a
@@ -33981,9 +33865,8 @@
     void reportCallerNotSameNest() -> c
     void reportWillExceedInstructionBudget(int,int) -> c
     void reportCallerNotSamePackage() -> d
-    void reportWillExceedMaxInliningDepth(int,int) -> d
+    void reportWillExceedMonitorEnterValuesBudget(int,int) -> d
     void reportCallerNotSubtype() -> e
-    void reportWillExceedMonitorEnterValuesBudget(int,int) -> e
     void reportClasspathMethod() -> f
     void reportInaccessible() -> g
     void reportInlineeDoesNotHaveCode() -> h
@@ -34004,7 +33887,7 @@
     void reportReceiverMaybeNull() -> w
     void reportRecursiveMethod() -> x
     void reportUnknownTarget() -> y
-    boolean unsetReasonHasBeenReportedFlag() -> z
+    boolean verifyReasonHasBeenReported() -> z
 com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.ir.optimize.q0.d:
     com.android.tools.r8.graph.DexEncodedMethod callee -> a
     boolean $assertionsDisabled -> e
@@ -34030,9 +33913,8 @@
     1:1:void reportCallerNotSameNest():62:62 -> c
     2:2:void reportWillExceedInstructionBudget(int,int):242:242 -> c
     1:1:void reportCallerNotSamePackage():67:67 -> d
-    2:2:void reportWillExceedMaxInliningDepth(int,int):251:251 -> d
+    2:2:void reportWillExceedMonitorEnterValuesBudget(int,int):252:252 -> d
     1:1:void reportCallerNotSubtype():74:74 -> e
-    2:2:void reportWillExceedMonitorEnterValuesBudget(int,int):261:261 -> e
     1:1:void reportClasspathMethod():82:82 -> f
     1:1:void reportInaccessible():87:87 -> g
     1:1:void reportInlineeDoesNotHaveCode():102:102 -> h
@@ -34053,7 +33935,7 @@
     1:1:void reportReceiverMaybeNull():204:204 -> w
     1:1:void reportRecursiveMethod():209:209 -> x
     1:1:void reportUnknownTarget():214:214 -> y
-    1:2:boolean unsetReasonHasBeenReportedFlag():270:271 -> z
+    1:1:boolean verifyReasonHasBeenReported():261:261 -> z
 com.android.tools.r8.ir.optimize.lambda.CaptureSignature -> com.android.tools.r8.ir.optimize.r0.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
@@ -34078,84 +33960,56 @@
 com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.ir.optimize.r0.d:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.graph.DexEncodedMethod context -> j
+    com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy NoOp -> j
+    boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.IRCode code -> g
     com.android.tools.r8.ir.code.InstructionListIterator instructions -> i
-    com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy NoOp -> k
-    boolean $assertionsDisabled -> l
     java.util.function.Function strategyProvider -> d
     com.android.tools.r8.kotlin.Kotlin kotlin -> c
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaChecker -> e
     java.util.ListIterator blocks -> h
     com.android.tools.r8.graph.DexEncodedMethod method -> f
-    1:29:void <clinit>():47:75 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):160:160 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):169:178 -> <init>
+    1:29:void <clinit>():46:74 -> <clinit>
+    1:9:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):155:163 -> <init>
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet) -> a
     void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut) -> a
-    1:2:com.android.tools.r8.ir.code.InstructionListIterator instructions():182:183 -> a
-    3:3:boolean shouldRewrite(com.android.tools.r8.graph.DexType):206:206 -> a
-    4:23:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):211:230 -> a
-    4:23:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):47 -> a
-    24:24:boolean shouldRewrite(com.android.tools.r8.graph.DexMethod):201:201 -> a
-    24:24:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):230 -> a
-    24:24:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):47 -> a
-    25:34:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):231:240 -> a
-    25:34:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):47 -> a
-    35:39:java.lang.Void visit(com.android.tools.r8.ir.code.NewInstance):246:250 -> a
-    35:39:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):47 -> a
-    40:40:java.lang.Void visit(com.android.tools.r8.ir.code.CheckCast):258:258 -> a
-    40:40:java.lang.Object visit(com.android.tools.r8.ir.code.CheckCast):47 -> a
-    41:41:java.lang.Void visit(com.android.tools.r8.ir.code.NewArrayEmpty):264:264 -> a
-    41:41:java.lang.Object visit(com.android.tools.r8.ir.code.NewArrayEmpty):47 -> a
-    42:42:java.lang.Void visit(com.android.tools.r8.ir.code.ConstClass):270:270 -> a
-    42:42:java.lang.Object visit(com.android.tools.r8.ir.code.ConstClass):47 -> a
-    43:43:java.lang.Void visit(com.android.tools.r8.ir.code.ConstMethodType):276:276 -> a
-    43:43:java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodType):47 -> a
-    44:44:java.lang.Void visit(com.android.tools.r8.ir.code.ConstMethodHandle):282:282 -> a
-    44:44:java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodHandle):47 -> a
-    45:47:java.lang.Void visit(com.android.tools.r8.ir.code.InstanceGet):288:290 -> a
-    45:47:java.lang.Object visit(com.android.tools.r8.ir.code.InstanceGet):47 -> a
-    48:48:boolean shouldRewrite(com.android.tools.r8.graph.DexField):197:197 -> a
-    48:48:java.lang.Void visit(com.android.tools.r8.ir.code.InstanceGet):291 -> a
-    48:48:java.lang.Object visit(com.android.tools.r8.ir.code.InstanceGet):47 -> a
-    49:57:java.lang.Void visit(com.android.tools.r8.ir.code.InstanceGet):293:301 -> a
-    49:57:java.lang.Object visit(com.android.tools.r8.ir.code.InstanceGet):47 -> a
-    58:60:java.lang.Void visit(com.android.tools.r8.ir.code.InstancePut):307:309 -> a
-    58:60:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):47 -> a
-    61:61:boolean shouldRewrite(com.android.tools.r8.graph.DexField):197:197 -> a
-    61:61:java.lang.Void visit(com.android.tools.r8.ir.code.InstancePut):310 -> a
-    61:61:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):47 -> a
-    62:70:java.lang.Void visit(com.android.tools.r8.ir.code.InstancePut):312:320 -> a
-    62:70:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):47 -> a
-    71:73:java.lang.Void visit(com.android.tools.r8.ir.code.StaticGet):326:328 -> a
-    71:73:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):47 -> a
-    74:74:boolean shouldRewrite(com.android.tools.r8.graph.DexField):197:197 -> a
-    74:74:java.lang.Void visit(com.android.tools.r8.ir.code.StaticGet):329 -> a
-    74:74:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):47 -> a
-    75:79:java.lang.Void visit(com.android.tools.r8.ir.code.StaticGet):331:335 -> a
-    75:79:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):47 -> a
-    80:82:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):342:344 -> a
-    80:82:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):47 -> a
-    83:83:boolean shouldRewrite(com.android.tools.r8.graph.DexField):197:197 -> a
-    83:83:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):345 -> a
-    83:83:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):47 -> a
-    84:88:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):347:351 -> a
-    84:88:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):47 -> a
-    1:5:void processCode():187:191 -> b
+    1:2:com.android.tools.r8.ir.code.InstructionListIterator instructions():167:168 -> a
+    3:32:java.lang.Void handleInvoke(com.android.tools.r8.ir.code.Invoke):183:212 -> a
+    3:32:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):46 -> a
+    33:37:java.lang.Void visit(com.android.tools.r8.ir.code.NewInstance):218:222 -> a
+    33:37:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):46 -> a
+    38:38:java.lang.Void visit(com.android.tools.r8.ir.code.CheckCast):230:230 -> a
+    38:38:java.lang.Object visit(com.android.tools.r8.ir.code.CheckCast):46 -> a
+    39:39:java.lang.Void visit(com.android.tools.r8.ir.code.NewArrayEmpty):236:236 -> a
+    39:39:java.lang.Object visit(com.android.tools.r8.ir.code.NewArrayEmpty):46 -> a
+    40:40:java.lang.Void visit(com.android.tools.r8.ir.code.ConstClass):242:242 -> a
+    40:40:java.lang.Object visit(com.android.tools.r8.ir.code.ConstClass):46 -> a
+    41:41:java.lang.Void visit(com.android.tools.r8.ir.code.ConstMethodType):248:248 -> a
+    41:41:java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodType):46 -> a
+    42:42:java.lang.Void visit(com.android.tools.r8.ir.code.ConstMethodHandle):254:254 -> a
+    42:42:java.lang.Object visit(com.android.tools.r8.ir.code.ConstMethodHandle):46 -> a
+    43:56:java.lang.Void visit(com.android.tools.r8.ir.code.InstanceGet):260:273 -> a
+    43:56:java.lang.Object visit(com.android.tools.r8.ir.code.InstanceGet):46 -> a
+    57:70:java.lang.Void visit(com.android.tools.r8.ir.code.InstancePut):279:292 -> a
+    57:70:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):46 -> a
+    71:80:java.lang.Void visit(com.android.tools.r8.ir.code.StaticGet):298:307 -> a
+    71:80:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):46 -> a
+    81:90:java.lang.Void visit(com.android.tools.r8.ir.code.StaticPut):314:323 -> a
+    81:90:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):46 -> a
+    1:5:void processCode():172:176 -> b
 com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.ir.optimize.r0.b:
-    1:1:void <init>():76:76 -> <init>
+    1:1:void <init>():75:75 -> <init>
     boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
     boolean isValidNewInstance(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.NewInstance) -> a
     boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
-    1:1:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):114:114 -> a
-    2:2:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):119:119 -> a
-    3:3:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InstanceGet):124:124 -> a
-    4:4:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):129:129 -> a
+    1:1:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):113:113 -> a
+    2:2:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):118:118 -> a
+    3:3:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InstanceGet):123:123 -> a
+    4:4:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):128:128 -> a
     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
@@ -34231,7 +34085,7 @@
     1:21:com.android.tools.r8.graph.DexProgramClass synthesizeClass():35:55 -> k
 com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.ir.optimize.r0.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.r0.q:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.ir.optimize.r0.n:
     java.util.Map lambdas -> a
     java.util.Map groups -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> g
@@ -34240,136 +34094,119 @@
     java.util.Set methodsToReprocess -> d
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.AppView appView -> e
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode mode -> i
     com.android.tools.r8.DiagnosticsHandler reporter -> h
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaInvalidator -> j
     com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor lambdaChecker -> k
-    1:1:void <clinit>():85:85 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):159:159 -> <init>
-    2:44:void <init>(com.android.tools.r8.graph.AppView):125:167 -> <init>
+    java.util.function.BiFunction strategyFactory -> i
+    1:1:void <clinit>():86:86 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):123:123 -> <init>
+    2:44:void <init>(com.android.tools.r8.graph.AppView):89:131 -> <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):85 -> a
-    2:2:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):182:182 -> a
-    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):475 -> 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):85 -> a
-    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):476:476 -> 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):85 -> a
-    4:4:com.android.tools.r8.graph.AppView access$400(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):85:85 -> a
-    5:5:void invalidateLambda(com.android.tools.r8.graph.DexType):174:174 -> a
-    6:6:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):186:186 -> a
-    6:6:void access$600(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):85 -> a
-    7:40:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication):194:227 -> a
-    41:41:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):202:202 -> a
-    42:43:void analyzeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):241:242 -> a
-    44:45:void rewriteCodeForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):268:269 -> a
-    46:55:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):280:289 -> a
-    56:76:java.util.Map finalizeLambdaGroups():380:400 -> a
-    56:76:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):293 -> a
-    77:112:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):296:331 -> a
-    113:127:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):330:344 -> a
-    128:128:void lambda$applyLambdaClassMapping$5(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):297:297 -> a
-    129:129:void lambda$applyLambdaClassMapping$7(com.android.tools.r8.graph.DexEncodedMethod):325:325 -> a
-    130:130:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):333:333 -> a
-    131:133:boolean lambda$applyLambdaClassMapping$8(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):335:337 -> a
-    134:138:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):349:353 -> a
-    139:158:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):357:376 -> a
-    159:159:void lambda$analyzeLambdaClassesStructure$12(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):362:362 -> a
-    160:165:void lambda$analyzeLambdaClassesStructure$11(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):364:369 -> a
-    166:171:void lambda$analyzeLambdaClassesStructure$11(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):367:372 -> a
-    172:172:void invalidateLambda(com.android.tools.r8.graph.DexType):174:174 -> a
-    172:172:void lambda$analyzeLambdaClassesStructure$11(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):372 -> a
-    173:179:void removeTrivialLambdaGroups():406:412 -> a
-    180:190:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):420:430 -> a
-    191:204:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):429:442 -> a
-    205:209:java.lang.Object lambda$rewriteLambdaReferences$15(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):432:436 -> a
-    210:216:java.lang.Object lambda$rewriteLambdaReferences$15(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):432:438 -> a
-    217:218:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):446:447 -> a
-    217:218:void lambda$analyzeReferencesInProgramClasses$10(com.android.tools.r8.graph.DexProgramClass):351 -> a
-    219:220:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:109 -> a
-    219:220:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):447 -> a
-    219:220:void lambda$analyzeReferencesInProgramClasses$10(com.android.tools.r8.graph.DexProgramClass):351 -> a
-    221:243:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):448:470 -> a
-    221:243:void lambda$analyzeReferencesInProgramClasses$10(com.android.tools.r8.graph.DexProgramClass):351 -> a
-    244:244:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:108 -> a
-    244:244:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):447 -> a
-    244:244:void lambda$analyzeReferencesInProgramClasses$10(com.android.tools.r8.graph.DexProgramClass):351 -> a
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):85:85 -> b
-    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):178:178 -> b
-    3:4:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):257:258 -> b
-    5:5:com.android.tools.r8.graph.DexType lambda$applyLambdaClassMapping$6(com.android.tools.r8.graph.DexProgramClass):308:308 -> b
-    6:6:void lambda$removeTrivialLambdaGroups$13(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):412:412 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteLambdaReferences$14(com.android.tools.r8.graph.DexEncodedMethod):425:425 -> b
-    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$800(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):85:85 -> c
-    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):169:169 -> c
-    3:3:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.DexProgramClass):195:195 -> c
-    1:1:java.util.Map access$900(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):85:85 -> d
-    2:4:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):198:200 -> d
-    5:5:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> d
-    5:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):200 -> d
-    6:7:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):200:201 -> d
-    1:13:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):206:218 -> e
-    14:14:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):213:213 -> e
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.LambdaGroup getLambdaGroup(com.android.tools.r8.graph.DexType):146:146 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):408 -> a
+    2:2:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategyProvider(com.android.tools.r8.graph.DexType):409:409 -> a
+    3:3:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy access$300(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):86 -> a
+    4:4:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> a
+    5:5:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    6:6:void queueForProcessing(com.android.tools.r8.graph.DexEncodedMethod):150:150 -> a
+    6:6:void access$200(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod):86 -> a
+    7:40:void collectGroupCandidates(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):159:192 -> a
+    41:41:boolean lambda$collectGroupCandidates$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
+    42:42:int lambda$collectGroupCandidates$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):167:167 -> a
+    43:44:void processMethodCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):203:204 -> a
+    45:54:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):215:224 -> a
+    55:75:java.util.Map finalizeLambdaGroups():313:333 -> a
+    55:75:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):228 -> a
+    76:109:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):231:264 -> a
+    110:124:void applyLambdaClassMapping(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):263:277 -> a
+    125:125:void lambda$applyLambdaClassMapping$6(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):232:232 -> a
+    126:126:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$applyLambdaClassMapping$7(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242:242 -> a
+    127:127:void lambda$applyLambdaClassMapping$8(com.android.tools.r8.graph.DexEncodedMethod):258:258 -> a
+    128:128:boolean lambda$applyLambdaClassMapping$10(com.android.tools.r8.ir.optimize.lambda.LambdaGroup):266:266 -> a
+    129:131:boolean lambda$applyLambdaClassMapping$9(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):268:270 -> a
+    132:136:void analyzeReferencesInProgramClasses(com.android.tools.r8.graph.DexApplication,java.util.concurrent.ExecutorService):282:286 -> a
+    137:156:void analyzeLambdaClassesStructure(java.util.concurrent.ExecutorService):290:309 -> a
+    157:157:void lambda$analyzeLambdaClassesStructure$13(java.util.List,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):295:295 -> a
+    158:163:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):297:302 -> a
+    164:169:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):300:305 -> a
+    170:170:void invalidateLambda(com.android.tools.r8.graph.DexType):138:138 -> a
+    170:170:void lambda$analyzeLambdaClassesStructure$12(com.android.tools.r8.utils.ThrowingConsumer,com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):305 -> a
+    171:177:void removeTrivialLambdaGroups():339:345 -> a
+    178:188:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):353:363 -> a
+    189:202:void rewriteLambdaReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):362:375 -> a
+    203:207:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:369 -> a
+    208:214:java.lang.Object lambda$rewriteLambdaReferences$16(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.Set):365:371 -> a
+    215:216:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):379:380 -> a
+    215:216:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    217:218:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:109 -> a
+    217:218:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    217:218:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    219:241:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):381:403 -> a
+    219:241:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    242:242:void com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor.accept(com.android.tools.r8.graph.DexTypeList):108:108 -> a
+    242:242:void analyzeClass(com.android.tools.r8.graph.DexProgramClass):380 -> a
+    242:242:void lambda$analyzeReferencesInProgramClasses$11(com.android.tools.r8.graph.DexProgramClass):284 -> a
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$100(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> b
+    2:2:boolean isMergeableLambda(com.android.tools.r8.graph.DexType):142:142 -> b
+    3:5:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):163:165 -> b
+    6:6:boolean com.android.tools.r8.kotlin.KotlinSyntheticClass.isLambda():48:48 -> b
+    6:6:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165 -> b
+    7:8:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):165:166 -> b
+    9:21:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):171:183 -> b
+    22:22:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):178:178 -> b
+    23:23:com.android.tools.r8.ir.optimize.lambda.CodeProcessor lambda$collectGroupCandidates$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):192:192 -> b
+    24:24:void lambda$removeTrivialLambdaGroups$14(com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo):345:345 -> b
+    25:25:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteLambdaReferences$15(com.android.tools.r8.graph.DexEncodedMethod):358:358 -> b
+    1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$400(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> c
+    2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):133:133 -> c
+    1:1:java.util.Map access$500(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):86:86 -> d
 com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.ir.optimize.r0.j:
 com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.ir.optimize.r0.k:
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> m
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):479:479 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):480:484 -> <init>
-    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):481:481 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):483:483 -> a
-    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):491:491 -> a
-    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):496:496 -> a
-    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):501:501 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):506:506 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):511:511 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):516:516 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.ir.optimize.r0.l:
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> a
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):94:94 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):94:94 -> <init>
-    1:1:void analyzeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):98:98 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.ir.optimize.r0.m:
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> c
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> b
-    java.util.Set lambdaGroupsClasses -> a
-    1:3:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Set,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):108:110 -> <init>
-    1:5:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod):115:119 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.ir.optimize.r0.n:
-    boolean $assertionsDisabled -> o
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> m
-    java.util.Set typeAffectedValues -> n
-    1:1:void <clinit>():520:520 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):520:520 -> <init>
-    2:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):532:534 -> <init>
-    5:5:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):531:531 -> <init>
-    6:20:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):524:538 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):533:533 -> a
-    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):542:544 -> a
-    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):602:602 -> a
-    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):607:607 -> a
-    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):614:614 -> a
-    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):619:619 -> a
-    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):626:626 -> a
-    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):631:631 -> a
-    1:28:void processCode():551:578 -> b
-    29:45:void processCode():577:593 -> b
-    46:46:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):597:597 -> b
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.ir.optimize.r0.o:
+    com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> l
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):412:412 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413:417 -> <init>
+    7:7:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):414:414 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):416:416 -> a
+    2:2:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):424:424 -> a
+    3:3:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):429:429 -> a
+    4:4:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):434:434 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):439:439 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):444:444 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):449:449 -> a
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.ir.optimize.r0.l:
+    boolean $assertionsDisabled -> n
+    com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> l
+    java.util.Set typeAffectedValues -> m
+    1:1:void <clinit>():453:453 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):453:453 -> <init>
+    2:4:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):464:466 -> <init>
+    5:5:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):463:463 -> <init>
+    6:18:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):457:469 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy lambda$new$0(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.DexType):465:465 -> a
+    2:4:void recordTypeHasChanged(com.android.tools.r8.ir.code.Value):473:475 -> a
+    5:5:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InvokeMethod):533:533 -> a
+    6:6:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.NewInstance):538:538 -> a
+    7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstancePut):545:545 -> a
+    8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InstanceGet):550:550 -> a
+    9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticPut):557:557 -> a
+    10:10:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):562:562 -> a
+    1:28:void processCode():482:509 -> b
+    29:45:void processCode():508:524 -> b
+    46:46:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):528:528 -> b
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.ir.optimize.r0.m:
     java.util.Map lambdaGroupsClasses -> a
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():635:635 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):640:641 -> <init>
-    1:5:void fixup(com.android.tools.r8.graph.DexEncodedField):658:662 -> a
-    6:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod):668:674 -> a
-    1:1:java.lang.Object apply(java.lang.Object):635:635 -> apply
-    2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):646:650 -> apply
-    2:6:java.lang.Object apply(java.lang.Object):635 -> apply
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.ir.optimize.r0.p:
-    1:1:void <init>():87:87 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):87:87 -> <init>
-    void analyzeCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode) -> a
-    void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.ir.optimize.r0.r:
+    1:1:void <clinit>():566:566 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map):571:572 -> <init>
+    1:5:void fixup(com.android.tools.r8.graph.DexEncodedField):589:593 -> a
+    6:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod):599:605 -> a
+    1:1:java.lang.Object apply(java.lang.Object):566:566 -> apply
+    2:6:com.android.tools.r8.graph.DexType apply(com.android.tools.r8.graph.DexType):577:581 -> apply
+    2:6:java.lang.Object apply(java.lang.Object):566 -> apply
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.ir.optimize.r0.o:
     java.util.function.Consumer onLambdaType -> c
     java.util.function.Predicate isLambdaType -> b
     boolean $assertionsDisabled -> d
@@ -34407,7 +34244,7 @@
     63:63:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> a
     63:63:void accept(com.android.tools.r8.graph.DexMethodHandle):83 -> a
     64:65:void accept(com.android.tools.r8.graph.DexMethodHandle):83:84 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.ir.optimize.r0.s.a:
+com.android.tools.r8.ir.optimize.lambda.kotlin.ClassInitializerSourceCode -> com.android.tools.r8.ir.optimize.r0.p.a:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> m
     com.android.tools.r8.graph.DexItemFactory factory -> l
@@ -34420,35 +34257,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.r0.s.g:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup -> com.android.tools.r8.ir.optimize.r0.p.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):104:104 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId):106:106 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):111:111 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):117:117 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.r0.s.b:
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.r0.s.c:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.r0.p.b:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.r0.p.c:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):180:180 -> <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):191:194 -> a
     5:5:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):195:195 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():185:185 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.r0.s.d:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.r0.p.d:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):152:152 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):157:157 -> a
     2:9:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):164:171 -> a
     10:10:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):167:167 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.r0.s.e:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.r0.p.e:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):130:130 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():145:145 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):135:135 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.r0.s.f:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.r0.p.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):213:214 -> <init>
     1:6:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:226 -> b
     7:7:void lambda$prepareSuperConstructorCall$0(int,com.android.tools.r8.ir.conversion.IRBuilder):221:221 -> b
     1:1:void prepareSuperConstructorCall(int):219:219 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.r0.s.h:
+com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.r0.p.h:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.JStyleLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -34482,29 +34319,29 @@
     39:39:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     40:40:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     40:40:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.ir.optimize.r0.s.n:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup -> com.android.tools.r8.ir.optimize.r0.p.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):110:110 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId):112:112 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder getBuilder(com.android.tools.r8.graph.DexItemFactory):117:117 -> a
     2:2:com.android.tools.r8.utils.ThrowingConsumer lambdaClassValidator(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):123:123 -> a
     java.lang.String getGroupSuffix() -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.r0.s.i:
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.r0.s.j:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$1 -> com.android.tools.r8.ir.optimize.r0.p.i:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassBuilder -> com.android.tools.r8.ir.optimize.r0.p.j:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.graph.DexItemFactory,java.lang.String):191:191 -> <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):202:208 -> a
     8:8:com.android.tools.r8.graph.DexField lambda$createInstanceInitializerSourceCode$0(int):206:206 -> a
     1:1:com.android.tools.r8.graph.DexType getSuperClassType():196:196 -> j
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.r0.s.k:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$ClassValidator -> com.android.tools.r8.ir.optimize.r0.p.k:
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppInfoWithSubtyping):158:158 -> <init>
     1:1:int getInstanceInitializerSize(java.util.List):163:163 -> a
     2:14:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):170:182 -> a
     15:15:int validateInstanceInitializerEpilogue(com.android.tools.r8.code.Instruction[],int):178:178 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.r0.s.l:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$GroupId -> com.android.tools.r8.ir.optimize.r0.p.l:
     1:1:void <init>(java.lang.String,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):136:136 -> <init>
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup():151:151 -> a
     java.lang.String getLambdaKindDescriptor() -> b
     1:1:boolean equals(java.lang.Object):141:141 -> equals
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.r0.s.m:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroup$InstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.r0.p.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):227:230 -> <init>
@@ -34513,7 +34350,7 @@
     2:7:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:244 -> b
     8:8:void lambda$prepareSuperConstructorCall$1(int,int,com.android.tools.r8.ir.conversion.IRBuilder):239:239 -> b
     1:3:void prepareSuperConstructorCall(int):235:237 -> i
-com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.r0.s.o:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KStyleLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.r0.p.o:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory INSTANCE -> m
     1:2:void <clinit>():16:17 -> <clinit>
@@ -34554,7 +34391,7 @@
     39:39:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
     40:40:void validateSuperclass(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):49:49 -> a
     40:40:com.android.tools.r8.ir.optimize.lambda.LambdaGroupId validateAndCreate(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):31 -> a
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.r0.s.p:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinInstanceInitializerSourceCode -> com.android.tools.r8.ir.optimize.r0.p.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>
@@ -34563,7 +34400,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.r0.s.q:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaClassValidator -> com.android.tools.r8.ir.optimize.r0.p.q:
     com.android.tools.r8.graph.AppInfoWithSubtyping appInfo -> c
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> a
@@ -34649,7 +34486,7 @@
     229:236:void accept(java.lang.Object):47 -> accept
     237:237:void accept(com.android.tools.r8.graph.DexClass):73:73 -> accept
     237:237:void accept(java.lang.Object):47 -> accept
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.ir.optimize.r0.s.r:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaConstants -> com.android.tools.r8.ir.optimize.r0.p.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
@@ -34662,7 +34499,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.r0.s.s:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup -> com.android.tools.r8.ir.optimize.r0.p.s:
     com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy strategy -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():19:19 -> <clinit>
@@ -34697,7 +34534,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.r0.s.t:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupClassBuilder -> com.android.tools.r8.ir.optimize.r0.p.t:
     boolean $assertionsDisabled -> p
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId id -> o
     1:1:void <clinit>():36:36 -> <clinit>
@@ -34727,7 +34564,7 @@
     1:25:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():90:114 -> i
     26:44:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():109:127 -> i
     1:3:java.util.Map collectVirtualMethods():135:137 -> l
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.ir.optimize.r0.s.u:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupCodeStrategy -> com.android.tools.r8.ir.optimize.r0.p.u:
     com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup group -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -34737,13 +34574,13 @@
     9:9:boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):92:92 -> a
     10:12:boolean isValidVirtualCall(com.android.tools.r8.ir.code.InvokeMethod):109:111 -> a
     13:20:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):116:123 -> a
-    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     21:21:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122 -> a
     22:27:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):122:127 -> a
     28:30:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):132:134 -> a
     31:35:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):212:216 -> a
     31:35:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
-    36:36:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    36:36:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     36:36:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):216 -> a
     36:36:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     37:46:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):217:226 -> a
@@ -34768,7 +34605,7 @@
     55:63:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     64:64:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):228:228 -> a
     64:64:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
-    65:65:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    65:65: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):40:40 -> a
     65:65:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):228 -> a
     65:65:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):134 -> a
     66:66:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):228:228 -> a
@@ -34785,11 +34622,11 @@
     113:113:com.android.tools.r8.graph.DexField mapSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexField):275:275 -> a
     113:113:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):192 -> a
     114:117:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):194:197 -> a
-    118:118:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    118:118:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     118:118:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196 -> a
     119:125:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):196:202 -> a
     126:129:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):234:237 -> a
-    130:130:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    130:130:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     130:130:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):236 -> a
     1:5:boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):70:74 -> b
     6:15:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):96:105 -> b
@@ -34798,7 +34635,7 @@
     17:17:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):105:105 -> b
     1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):61:64 -> c
     1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):79:79 -> d
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.ir.optimize.r0.s.v:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.ir.optimize.r0.p.v:
     com.android.tools.r8.graph.DexProto mainMethodProto -> g
     com.android.tools.r8.graph.ParameterAnnotationsList mainMethodParamAnnotations -> i
     int innerClassAccess -> k
@@ -34818,7 +34655,7 @@
     1:10:int computeHashCode():80:89 -> c
     1:1:int hashCode():76:76 -> hashCode
     1:21:java.lang.String toString():113:133 -> toString
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.r0.s.w:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupIdFactory -> com.android.tools.r8.ir.optimize.r0.p.w:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -34899,7 +34736,7 @@
     11:11:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):61 -> c
     12:18:com.android.tools.r8.graph.DexEncodedMethod validateVirtualMethods(com.android.tools.r8.graph.DexClass):63:69 -> c
     19:24:boolean hasValidAnnotations(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass):90:95 -> c
-com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.ir.optimize.r0.s.x:
+com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaVirtualMethodSourceCode -> com.android.tools.r8.ir.optimize.r0.p.x:
     com.android.tools.r8.graph.DexItemFactory factory -> l
     java.util.List implMethods -> n
     com.android.tools.r8.graph.DexField idField -> m
@@ -35256,7 +35093,7 @@
     367:372:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):454:459 -> a
     373:390:void fixupStaticizedFieldReadUsers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):458:475 -> a
     391:400:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):479:488 -> a
-    401:401:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1012:1012 -> a
+    401:401:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):1008:1008 -> a
     401:401:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):488 -> a
     402:409:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):489:496 -> a
     410:410:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
@@ -35278,7 +35115,7 @@
     428:428: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):677:677 -> a
     1:1:void removeReferencesToThis(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):304:304 -> b
     1:21:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):310:330 -> c
-    22:22:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> c
+    22:22:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> c
     22:22:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):502 -> c
     22:22:void rewriteReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> c
     23:36:void remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):503:516 -> c
@@ -35426,7 +35263,7 @@
     209:225:void logHistogramOfChains(java.util.List,boolean):548:564 -> a
     226:226:void logHistogramOfChains(java.util.List,boolean):559:559 -> a
     227:228:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):575:576 -> a
-    229:229:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    229:229:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     229:229:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     230:266:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):577:613 -> a
     267:272:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):611:616 -> a
@@ -35437,25 +35274,25 @@
     317:317:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
     317:317:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622 -> a
     318:318:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):622:622 -> a
-    319:319:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    319:319:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     319:319:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):576 -> a
     320:346:boolean isToStringOfInterest(java.util.Set,com.android.tools.r8.ir.code.Instruction):628:654 -> a
     320:346:boolean lambda$applyConcatenationResults$1(java.util.Set,com.android.tools.r8.ir.code.Instruction):578 -> a
     347:353:void removeTrivialBuilders():728:734 -> a
-    354:354:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    354:354:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     354:354:void removeTrivialBuilders():734 -> a
     355:367:void removeTrivialBuilders():735:747 -> a
-    368:368:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    368:368:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     368:368:void removeTrivialBuilders():747 -> a
     369:398:void removeTrivialBuilders():748:777 -> a
-    399:399:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    399:399:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     399:399:void removeTrivialBuilders():777 -> a
     400:409:void removeTrivialBuilders():778:787 -> a
-    410:410:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    410:410:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     410:410:void removeTrivialBuilders():777 -> a
-    411:411:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    411:411:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     411:411:void removeTrivialBuilders():747 -> a
-    412:412:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    412:412:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     412:412:void removeTrivialBuilders():734 -> 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):469:507 -> b
@@ -35487,19 +35324,19 @@
     38:39:void lambda$logResult$2(java.lang.Integer,java.lang.Integer):100:101 -> a
     40: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
-    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    45:45:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     45:45:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):137 -> a
     46:95:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):138:187 -> a
     96:101:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):185:190 -> a
     102:118:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):189:205 -> a
     119:183:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):203:267 -> a
-    184:184:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
+    184:184:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
     184:184:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):268 -> a
     185:192:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):270:277 -> a
-    193:193:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
+    193:193:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
     193:193:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):278 -> a
     194:202:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):280:288 -> a
-    203:203:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1026:1026 -> a
+    203:203:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1022:1022 -> a
     203:203:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):289 -> a
     204:209:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):292:297 -> a
     210:210:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):46:46 -> a
@@ -35509,7 +35346,7 @@
     216:216:java.lang.Integer lambda$computeTrivialOperationsOnConstString$10(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):235:235 -> a
     217:217:java.lang.Integer lambda$computeTrivialOperationsOnConstString$13(com.android.tools.r8.graph.DexString,java.lang.Integer):241:241 -> a
     218:221:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):304:307 -> a
-    222:222:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> a
+    222:222:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> a
     222:222:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):309 -> a
     223:264:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):310:351 -> a
     265:265:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
@@ -35536,7 +35373,7 @@
     9:9:java.lang.Integer lambda$computeTrivialOperationsOnConstString$15(com.android.tools.r8.graph.DexString,java.lang.Integer):245:245 -> b
     10:15:void logNameComputation(com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping):470:475 -> b
     16:16:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):517:517 -> b
-    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> b
+    17:17:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> b
     17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):518 -> b
     18:38:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):519:539 -> b
     39:82:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):537:580 -> b
@@ -35575,482 +35412,482 @@
     int[] unusedRegisters -> o
     java.util.List moveExceptionIntervals -> m
     java.util.List active -> k
-    1:1:void <clinit>():87:87 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):189:189 -> <init>
-    2:57:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):143:198 -> <init>
+    1:1:void <clinit>():85:85 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):187:187 -> <init>
+    2:57:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):141:196 -> <init>
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
     boolean longHalfOverlappingLong(int,int) -> a
-    1:19:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):249:267 -> a
-    20:91:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):265:336 -> a
-    92:92:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
-    92:92:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):336 -> a
-    93:95:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):337:339 -> a
-    96:104:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):461:469 -> a
-    96:104:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    105:105:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
-    105:105:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):469 -> a
-    105:105:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    106:126:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):471:491 -> a
-    106:126:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    127:127:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
-    127:127:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):494 -> a
-    127:127:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    128:130:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):494:496 -> a
-    128:130:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    131:133:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):462:464 -> a
-    131:133:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    134:134: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
-    134:134:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):464 -> a
-    134:134:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    135:135:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):464:464 -> a
-    135:135:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    136:207:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):347:418 -> a
-    208:208:int lambda$computeDebugInfo$0(com.android.tools.r8.ir.regalloc.LiveRange):261:261 -> a
-    209:210:boolean lambda$computeDebugInfo$2(java.util.Set,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):319:320 -> a
-    211:211:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):425:425 -> a
-    212:213:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):430:431 -> a
-    212:213:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):425 -> a
-    214:215:boolean usesValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):436:437 -> a
-    214:215:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):432 -> a
-    214:215:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):425 -> a
-    216:222:boolean valuesContain(com.android.tools.r8.ir.code.Value,java.util.Collection):441:447 -> a
-    223:246:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):504:527 -> a
-    247:266:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):510:529 -> a
-    267:271:void addRegisterIfUsed(java.util.Set,com.android.tools.r8.ir.regalloc.LiveIntervals):576:580 -> a
-    272:273:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):619:620 -> a
-    274:275:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):797:798 -> a
-    274:275:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):620 -> a
-    276:276:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):622:622 -> a
-    277:277:com.android.tools.r8.utils.InternalOptions options():627:627 -> a
-    278:278:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):645:645 -> a
-    279:290:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):778:789 -> a
-    279:290:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):648 -> a
-    291:291:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):649:649 -> a
-    292:300:void pinArgumentRegisters():2946:2954 -> a
-    292:300:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):652 -> a
-    301:301:void pinArgumentRegisters():2951:2951 -> a
-    301:301:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):652 -> a
-    302:363:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):826:887 -> a
-    302:363:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    364:364:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    364:364:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):888 -> a
-    364:364:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    365:386:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):893:914 -> a
-    365:386:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    387:393:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1054:1060 -> a
-    387:393:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> a
-    387:393:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    394:394:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    394:394:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1060 -> a
-    394:394:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> a
-    394:394:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    395:396:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1061:1062 -> a
-    395:396:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):916 -> a
-    395:396:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    397:403:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1073:1079 -> a
-    397:403:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
-    397:403:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    404:404:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    404:404:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1079 -> a
-    404:404:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
-    404:404:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    405:410:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1080:1085 -> a
-    405:410:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
-    405:410:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    411:411:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    411:411:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1085 -> a
-    411:411:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
-    411:411:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    412:412:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1086:1086 -> a
-    412:412:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):917 -> a
-    412:412:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    413:478:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1101:1166 -> a
-    413:478:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):922 -> a
-    413:478:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    479:528:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):923:972 -> a
-    479:528:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    529:541:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1608:1620 -> a
-    529:541:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    529:541:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    542:544:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    542:544:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1621 -> a
-    542:544:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    542:544:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    545:601:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1626:1682 -> a
-    545:601:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    545:601:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    602:602:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    602:602:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1683 -> a
-    602:602:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    602:602:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    603:607:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1684:1688 -> a
-    603:607:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    603:607:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    608:608:int toInstructionPosition(int):1390:1390 -> a
-    608:608:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1688 -> a
-    608:608:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    608:608:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    609:620:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1693:1704 -> a
-    609:620:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    609:620:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    621:629:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1027:1035 -> a
-    621:629:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1704 -> a
-    621:629:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    621:629:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    630:660:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1783:1813 -> a
-    630:660:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1707 -> a
-    630:660:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    630:660:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    661:689:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1713:1741 -> a
-    661:689:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    661:689:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    690:692:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    690:692:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
-    690:692:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    690:692:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    693:693:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1743:1743 -> a
-    693:693:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    693:693:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    694:712:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1982:2000 -> a
-    694:712:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    694:712:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    694:712:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    713:722:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1999:2008 -> a
-    713:722:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    713:722:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    713:722:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    723:723:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    723:723:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2009 -> a
-    723:723:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    723:723:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    723:723:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    724:796:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2010:2082 -> a
-    724:796:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    724:796:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    724:796:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    797:804:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1255:1262 -> a
-    797:804:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2084 -> a
-    797:804:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    797:804:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    797:804:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    805:805:void increaseCapacity(int):2960:2960 -> a
-    805:805:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1262 -> a
-    805:805:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2084 -> a
-    805:805:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    805:805:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    805:805:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    806:808:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    806:808:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2085 -> a
-    806:808:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    806:808:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    806:808:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    809:815:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2086:2092 -> a
-    809:815:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    809:815:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    809:815:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    816:816:void increaseCapacity(int):2960:2960 -> a
-    816:816:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2093 -> a
-    816:816:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    816:816:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    816:816:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    817:817:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2096:2096 -> a
-    817:817:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    817:817:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    817:817:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    818:825:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2120:2127 -> a
-    818:825:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2098 -> a
-    818:825:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    818:825:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    818:825:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    826:827:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2101:2102 -> a
-    826:827:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    826:827:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    826:827:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    828:835:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2120:2127 -> a
-    828:835:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2103 -> a
-    828:835:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1745 -> a
-    828:835:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    828:835:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    836:837:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1750:1751 -> a
-    836:837:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    836:837:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    838:838:void increaseCapacity(int):2960:2960 -> a
-    838:838:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1752 -> a
-    838:838:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    838:838:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    839:839:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1755:1755 -> a
-    839:839:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    839:839:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    840:842:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    840:842:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1757 -> a
-    840:842:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    840:842:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    843:851:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1759:1767 -> a
-    843:851:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    843:851:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    852:854:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    852:854:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1768 -> a
-    852:854:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    852:854:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    855:855:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1769:1769 -> a
-    855:855:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):974 -> a
-    855:855:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):654 -> a
-    856:901:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):656:701 -> a
-    902:916:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):674:688 -> a
-    917:924:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):662:669 -> a
-    925:965:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):666:706 -> a
-    966:969:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):705:708 -> a
-    970:970:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):707:707 -> a
-    971:978:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):764:771 -> a
-    979:983:int realRegisterNumberFromAllocated(int):816:820 -> a
-    984:1022:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):983:1021 -> a
-    1023:1024:void lambda$invariantsHold$3(java.util.TreeSet,int):991:992 -> a
-    1025:1031:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1175:1181 -> a
-    1032:1032:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1032:1032:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1182 -> a
-    1033:1033:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1183:1183 -> a
-    1034:1044:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1180:1190 -> a
-    1045:1048:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1238:1241 -> a
-    1045:1048:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
-    1049:1049:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1049:1049:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1245 -> a
-    1049:1049:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
-    1050:1050:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1244:1244 -> a
-    1050:1050:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1193 -> a
-    1051:1051:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1194:1194 -> a
-    1052:1065:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1192:1205 -> a
-    1066:1066:int getFreeConsecutiveRegisters(int):2973:2973 -> a
-    1066:1066:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
-    1067:1068:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1208:1209 -> a
-    1069:1074:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1043:1048 -> a
-    1069:1074:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    1075:1075:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1047:1047 -> a
-    1075:1075:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    1076:1076:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1046:1046 -> a
-    1076:1076:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1209 -> a
-    1077:1090:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1211:1224 -> a
-    1091:1115:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1207:1231 -> a
-    1116:1135:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1267:1286 -> a
-    1136:1143:boolean registersAreFreeAndConsecutive(int,boolean):3029:3036 -> a
-    1136:1143:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1286 -> a
-    1144:1169:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1287:1312 -> a
-    1170:1200:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1328:1358 -> a
-    1201:1201:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1201:1201:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1359 -> a
-    1202:1218:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1366:1382 -> a
-    1219:1225:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1833:1839 -> a
-    1226:1238:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1538:1550 -> a
-    1226:1238:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1840 -> a
-    1239:1239:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1844:1844 -> a
-    1240:1244:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1432:1436 -> a
-    1240:1244:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1845 -> a
-    1245:1247:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1898:1900 -> a
-    1245:1247:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1848 -> a
-    1248:1249:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1856:1857 -> a
-    1250:1279:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1862:1891 -> a
-    1250:1279:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1858 -> a
-    1280:1292:int getLargestCandidate(int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1912:1924 -> a
-    1293:1298: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):1942:1947 -> a
-    1299:1311: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):1962:1974 -> a
-    1312:1314:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2110:2112 -> a
-    1315:1316:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2169:2170 -> a
-    1317:1317:boolean atLeastOneOfRegistersAreTaken(int,boolean):3126:3126 -> a
-    1317:1317:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2170 -> a
-    1318:1364:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2170:2216 -> a
-    1365:1387:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2284:2306 -> a
-    1365:1387:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2219 -> a
-    1388:1388:int toGapPosition(int):1394:1394 -> a
-    1388:1388:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2306 -> a
-    1388:1388:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2219 -> a
-    1389:1402:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2306:2319 -> a
-    1389:1402:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2219 -> a
-    1403:1403:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2220:2220 -> a
-    1404:1411:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2233:2240 -> a
-    1404:1411:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2221 -> a
-    1412:1439:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2247:2274 -> a
-    1412:1439:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2223 -> a
-    1440:1441:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2228:2229 -> a
-    1442:1444: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):2328:2330 -> a
-    1445:1445:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
-    1445:1445: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 -> a
-    1446:1453: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):2332:2339 -> a
-    1454:1489: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):2447:2482 -> a
-    1490:1490:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    1490:1490:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2654 -> a
-    1490:1490: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):2482 -> a
-    1491:1497: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):2482:2488 -> a
-    1498:1549:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2521:2572 -> a
-    1550:1556:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2569:2575 -> a
-    1557:1557:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    1557:1557:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2575 -> a
-    1558:1565:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2575:2582 -> a
-    1566:1566:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
-    1566:1566:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2654 -> a
-    1566:1566:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2582 -> a
-    1567:1604:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2582:2619 -> a
-    1605:1606:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2646:2647 -> a
-    1605:1606:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2623 -> a
-    1607:1624:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2620:2637 -> a
-    1625:1647:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2723:2745 -> a
-    1648:1648:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2767:2767 -> a
-    1649:1653:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2872:2876 -> a
-    1649:1653:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2767 -> a
-    1654:1687:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2768:2801 -> a
-    1688:1689:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():744:745 -> a
-    1688:1689:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2803 -> a
-    1690:1690:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2804:2804 -> a
-    1691:1692:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2752:2753 -> a
-    1691:1692:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2804 -> a
-    1693:1694:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2805:2806 -> a
-    1695:1698:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2758:2761 -> a
-    1695:1698:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2807 -> a
-    1699:1723:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2809:2833 -> a
-    1724:1750:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2841:2867 -> a
-    1724:1750:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2834 -> a
-    1751:1751:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2775:2775 -> a
-    1752:1796:int getFreeConsecutiveRegisters(int,boolean):2977:3021 -> a
-    1797:1808:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):2983:2994 -> a
-    1809:1812:int getNextFreeRegister(java.util.Iterator):3045:3048 -> a
-    1813:1825:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3052:3064 -> a
-    1826:1837:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3070:3081 -> a
-    1838:1838:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3176:3176 -> a
+    1:19:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):247:265 -> a
+    20:90:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):263:333 -> a
+    91:91:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
+    91:91:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):333 -> a
+    92:94:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):334:336 -> a
+    95:103:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):458:466 -> a
+    95:103:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    104:104:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
+    104:104:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):466 -> a
+    104:104:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    105:125:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):468:488 -> a
+    105:125:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    126:126:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1514:1514 -> a
+    126:126:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491 -> a
+    126:126:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    127:129:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):491:493 -> a
+    127:129:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    130:132:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):459:461 -> a
+    130:132:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    133:133: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
+    133:133:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):461 -> a
+    133:133:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    134:134:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):461:461 -> a
+    134:134:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):341 -> a
+    135:206:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344:415 -> a
+    207:207:int lambda$computeDebugInfo$0(com.android.tools.r8.ir.regalloc.LiveRange):259:259 -> a
+    208:209:boolean lambda$computeDebugInfo$2(java.util.Set,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):316:317 -> a
+    210:210:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):422:422 -> a
+    211:212:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):427:428 -> a
+    211:212:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):422 -> a
+    213:214:boolean usesValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):433:434 -> a
+    213:214:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,int,int,com.android.tools.r8.ir.code.Value):429 -> a
+    213:214:boolean isLocalLiveAtInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):422 -> a
+    215:221:boolean valuesContain(com.android.tools.r8.ir.code.Value,java.util.Collection):438:444 -> a
+    222:245:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):501:524 -> a
+    246:265:com.android.tools.r8.ir.code.DebugLocalsChange createLocalsChange(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.code.Position):507:526 -> a
+    266:270:void addRegisterIfUsed(java.util.Set,com.android.tools.r8.ir.regalloc.LiveIntervals):573:577 -> a
+    271:272:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):616:617 -> a
+    273:274:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):794:795 -> a
+    273:274:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):617 -> a
+    275:275:int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int):619:619 -> a
+    276:276:com.android.tools.r8.utils.InternalOptions options():624:624 -> a
+    277:277:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):642:642 -> a
+    278:289:void clearRegisterAssignments(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):775:786 -> a
+    278:289:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):645 -> a
+    290:290:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):646:646 -> a
+    291:299:void pinArgumentRegisters():2943:2951 -> a
+    291:299:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):649 -> a
+    300:300:void pinArgumentRegisters():2948:2948 -> a
+    300:300:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):649 -> a
+    301:362:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):823:884 -> a
+    301:362:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    363:363:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    363:363:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):885 -> a
+    363:363:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    364:385:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):890:911 -> a
+    364:385:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    386:392:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1051:1057 -> a
+    386:392:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):913 -> a
+    386:392:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    393:393:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    393:393:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1057 -> a
+    393:393:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):913 -> a
+    393:393:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    394:395:void setHintForDestRegOfCheckCast(com.android.tools.r8.ir.regalloc.LiveIntervals):1058:1059 -> a
+    394:395:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):913 -> a
+    394:395:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    396:402:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1070:1076 -> a
+    396:402:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    396:402:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    403:403:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    403:403:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1076 -> a
+    403:403:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    403:403:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    404:409:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1077:1082 -> a
+    404:409:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    404:409:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    410:410:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    410:410:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1082 -> a
+    410:410:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    410:410:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    411:411:void setHintToPromote2AddrInstruction(com.android.tools.r8.ir.regalloc.LiveIntervals):1083:1083 -> a
+    411:411:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):914 -> a
+    411:411:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    412:477:void allocateArgumentIntervalsWithSrc(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1098:1163 -> a
+    412:477:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):919 -> a
+    412:477:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    478:527:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):920:969 -> a
+    478:527:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    528:540:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1605:1617 -> a
+    528:540:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    528:540:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    541:543:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    541:543:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1618 -> a
+    541:543:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    541:543:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    544:600:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1623:1679 -> a
+    544:600:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    544:600:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    601:601:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    601:601:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1680 -> a
+    601:601:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    601:601:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    602:606:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1681:1685 -> a
+    602:606:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    602:606:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    607:607:int toInstructionPosition(int):1387:1387 -> a
+    607:607:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1685 -> a
+    607:607:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    607:607:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    608:619:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1690:1701 -> a
+    608:619:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    608:619:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    620:628:boolean freePositionsAreConsistentWithFreeRegisters(com.android.tools.r8.ir.regalloc.RegisterPositions,int):1024:1032 -> a
+    620:628:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1701 -> a
+    620:628:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    620:628:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    629:659:boolean useRegisterHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean):1780:1810 -> a
+    629:659:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1704 -> a
+    629:659:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    629:659:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    660:688:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1710:1738 -> a
+    660:688:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    660:688:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    689:691:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    689:691:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1739 -> a
+    689:691:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    689:691:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    692:692:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1740:1740 -> a
+    692:692:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    692:692:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    693:711:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1979:1997 -> a
+    693:711:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    693:711:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    693:711:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    712:721:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1996:2005 -> a
+    712:721:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    712:721:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    712:721:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    722:722:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    722:722:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2006 -> a
+    722:722:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    722:722:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    722:722:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    723:795:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2007:2079 -> a
+    723:795:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    723:795:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    723:795:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    796:803:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1252:1259 -> a
+    796:803:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2081 -> a
+    796:803:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    796:803:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    796:803:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    804:804:void increaseCapacity(int):2957:2957 -> a
+    804:804:int getNewSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):1259 -> a
+    804:804:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2081 -> a
+    804:804:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    804:804:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    804:804:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    805:807:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    805:807:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2082 -> a
+    805:807:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    805:807:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    805:807:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    808:814:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2083:2089 -> a
+    808:814:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    808:814:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    808:814:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    815:815:void increaseCapacity(int):2957:2957 -> a
+    815:815:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2090 -> a
+    815:815:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    815:815:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    815:815:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    816:816:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2093:2093 -> a
+    816:816:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    816:816:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    816:816:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    817:824:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2117:2124 -> a
+    817:824:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2095 -> a
+    817:824:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    817:824:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    817:824:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    825:826:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2098:2099 -> a
+    825:826:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    825:826:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    825:826:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    827:834:void assignRegisterAndSpill(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2117:2124 -> a
+    827:834:void allocateBlockedRegister(com.android.tools.r8.ir.regalloc.LiveIntervals):2100 -> a
+    827:834:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1742 -> a
+    827:834:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    827:834:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    835:836:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1747:1748 -> a
+    835:836:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    835:836:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    837:837:void increaseCapacity(int):2957:2957 -> a
+    837:837:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1749 -> a
+    837:837:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    837:837:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    838:838:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1752:1752 -> a
+    838:838:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    838:838:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    839:841:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    839:841:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1754 -> a
+    839:841:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    839:841:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    842:850:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1756:1764 -> a
+    842:850:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    842:850:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    851:853:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    851:853:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1765 -> a
+    851:853:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    851:853:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    854:854:boolean allocateSingleInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):1766:1766 -> a
+    854:854:boolean performLinearScan(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):971 -> a
+    854:854:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):651 -> a
+    855:900:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):653:698 -> a
+    901:915:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):671:685 -> a
+    916:923:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):659:666 -> a
+    924:964:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):663:703 -> a
+    965:968:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):702:705 -> a
+    969:969:com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode performAllocation(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode,boolean):704:704 -> a
+    970:977:boolean isSpillInstruction(com.android.tools.r8.ir.code.Instruction):761:768 -> a
+    978:982:int realRegisterNumberFromAllocated(int):813:817 -> a
+    983:1021:boolean invariantsHold(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode):980:1018 -> a
+    1022:1023:void lambda$invariantsHold$3(java.util.TreeSet,int):988:989 -> a
+    1024:1030:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1172:1178 -> a
+    1031:1031:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1031:1031:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1179 -> a
+    1032:1032:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1180:1180 -> a
+    1033:1043:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1177:1187 -> a
+    1044:1047:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1235:1238 -> a
+    1044:1047:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1190 -> a
+    1048:1048:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1048:1048:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1242 -> a
+    1048:1048:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1190 -> a
+    1049:1049:boolean liveIntervalsHasUnhandledSplitOverlappingAnyOf(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):1241:1241 -> a
+    1049:1049:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1190 -> a
+    1050:1050:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1191:1191 -> a
+    1051:1064:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1189:1202 -> a
+    1065:1065:int getFreeConsecutiveRegisters(int):2970:2970 -> a
+    1065:1065:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1203 -> a
+    1066:1067:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1205:1206 -> a
+    1068:1073:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1040:1045 -> a
+    1068:1073:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
+    1074:1074:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1044:1044 -> a
+    1074:1074:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
+    1075:1075:boolean registerAssignmentNotConflictingWithArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):1043:1043 -> a
+    1075:1075:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1206 -> a
+    1076:1089:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1208:1221 -> a
+    1090:1114:void allocateLinkedIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,boolean):1204:1228 -> a
+    1115:1134:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1264:1283 -> a
+    1135:1142:boolean registersAreFreeAndConsecutive(int,boolean):3026:3033 -> a
+    1135:1142:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1283 -> a
+    1143:1168:int getSpillRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):1284:1309 -> a
+    1169:1199:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1325:1355 -> a
+    1200:1200:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1200:1200:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1356 -> a
+    1201:1217:boolean maySpillLiveIntervalsToRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int,int):1363:1379 -> a
+    1218:1224:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1830:1836 -> a
+    1225:1237:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1535:1547 -> a
+    1225:1237:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1837 -> a
+    1238:1238:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1841:1841 -> a
+    1239:1243:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1429:1433 -> a
+    1239:1243:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1842 -> a
+    1244:1246:void assignFreeRegisterToUnhandledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1895:1897 -> a
+    1244:1246:boolean tryHint(com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,int):1845 -> a
+    1247:1248:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1853:1854 -> a
+    1249:1278:void updateRegisterHints(com.android.tools.r8.ir.regalloc.LiveIntervals):1859:1888 -> a
+    1249:1278:void assignRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1855 -> a
+    1279:1291:int getLargestCandidate(int,com.android.tools.r8.ir.regalloc.RegisterPositions,boolean,com.android.tools.r8.ir.regalloc.RegisterPositions$Type):1909:1921 -> a
+    1292:1297: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):1939:1944 -> a
+    1298:1310: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):1959:1971 -> a
+    1311:1313:int getLargestPosition(com.android.tools.r8.ir.regalloc.RegisterPositions,int,boolean):2107:2109 -> a
+    1314:1315:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2166:2167 -> a
+    1316:1316:boolean atLeastOneOfRegistersAreTaken(int,boolean):3123:3123 -> a
+    1316:1316:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2167 -> a
+    1317:1363:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2167:2213 -> a
+    1364:1386:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2281:2303 -> a
+    1364:1386:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2216 -> a
+    1387:1387:int toGapPosition(int):1391:1391 -> a
+    1387:1387:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2303 -> a
+    1387:1387:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2216 -> a
+    1388:1401:void splitRangesForSpilledConstant(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2303:2316 -> a
+    1388:1401:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2216 -> a
+    1402:1402:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2217:2217 -> a
+    1403:1410:void splitRangesForSpilledArgument(com.android.tools.r8.ir.regalloc.LiveIntervals):2230:2237 -> a
+    1403:1410:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2218 -> a
+    1411:1438:void splitRangesForSpilledInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,int):2244:2271 -> a
+    1411:1438:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2220 -> a
+    1439:1440:void spillOverlappingActiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2225:2226 -> a
+    1441:1443: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):2325:2327 -> a
+    1444:1444:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> a
+    1444:1444: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):2328 -> a
+    1445:1452: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):2329:2336 -> a
+    1453:1488: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):2444:2479 -> a
+    1489:1489:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    1489:1489:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
+    1489:1489: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):2479 -> a
+    1490:1496: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):2479:2485 -> a
+    1497:1548:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2518:2569 -> a
+    1549:1555:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2566:2572 -> a
+    1556:1556:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    1556:1556:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572 -> a
+    1557:1564:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2572:2579 -> a
+    1565:1565:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
+    1565:1565:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2651 -> a
+    1565:1565:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579 -> a
+    1566:1603:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2579:2616 -> a
+    1604:1605:int getLiveRangeEndOnExceptionalFlow(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):2643:2644 -> a
+    1604:1605:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2620 -> a
+    1606:1623:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2617:2634 -> a
+    1624:1646:boolean implementationIsBridge(com.android.tools.r8.ir.code.IRCode):2720:2742 -> a
+    1647:1647:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2764:2764 -> a
+    1648:1652:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2869:2873 -> a
+    1648:1652:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2764 -> a
+    1653:1686:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2765:2798 -> a
+    1687:1688:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():750:751 -> a
+    1687:1688:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2800 -> a
+    1689:1689:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2801:2801 -> a
+    1690:1691:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeLatticeElement):2749:2750 -> a
+    1690:1691:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2801 -> a
+    1692:1693:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2802:2803 -> a
+    1694:1697:void replaceArgument(com.android.tools.r8.ir.code.Invoke,int,com.android.tools.r8.ir.code.Value):2755:2758 -> a
+    1694:1697:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2804 -> a
+    1698:1722:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2806:2830 -> a
+    1723:1749:void generateArgumentMovesAtDefinitions(com.android.tools.r8.ir.code.Invoke,java.util.PriorityQueue,com.android.tools.r8.ir.code.InstructionListIterator):2838:2864 -> a
+    1723:1749:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2831 -> a
+    1750:1750:int lambda$generateArgumentMoves$5(com.android.tools.r8.ir.code.Move,com.android.tools.r8.ir.code.Move):2772:2772 -> a
+    1751:1795:int getFreeConsecutiveRegisters(int,boolean):2974:3018 -> a
+    1796:1807:int lambda$getFreeConsecutiveRegisters$6(java.lang.Integer,java.lang.Integer):2980:2991 -> a
+    1808:1811:int getNextFreeRegister(java.util.Iterator):3042:3045 -> a
+    1812:1824:void excludeRegistersForInterval(com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):3049:3061 -> a
+    1825:1836:void freeOccupiedRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3067:3078 -> a
+    1837:1837:boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3173:3173 -> 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():3130:3139 -> b
-    2:11:void allocateRegisters():207 -> b
-    12:12:boolean noLinkedValues():3138:3138 -> b
-    12:12:void allocateRegisters():207 -> b
-    13:14:void allocateRegisters():208:209 -> b
-    15:63:void transformBridgeMethod():2667:2715 -> b
-    15:63:void allocateRegisters():210 -> b
-    64:67:void computeNeedsRegister():2935:2938 -> b
-    64:67:void allocateRegisters():212 -> b
-    68:68:void constrainArgumentIntervals():2912:2912 -> b
-    68:68:void allocateRegisters():213 -> b
-    69:75:void createArgumentLiveIntervals(java.util.List):2886:2892 -> b
-    69:75:void constrainArgumentIntervals():2913 -> b
-    69:75:void allocateRegisters():213 -> b
-    76:84:void linkArgumentValuesAndIntervals(java.util.List):2898:2906 -> b
-    76:84:void constrainArgumentIntervals():2914 -> b
-    76:84:void allocateRegisters():213 -> b
-    85:95:void insertRangeInvokeMoves():2918:2928 -> b
-    85:95:void allocateRegisters():214 -> b
-    96:97:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():631:632 -> b
-    96:97:void allocateRegisters():215 -> b
-    98:103:void computeLiveRanges():2493:2498 -> 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():1163:1163 -> b
-    104:104:void computeLiveRanges():2498 -> 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():2498:2498 -> 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():1172:1172 -> b
-    106:106:void computeLiveRanges():2498 -> b
-    106:106:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
-    106:106:void allocateRegisters():215 -> b
-    107:116:void computeLiveRanges():2498:2507 -> b
-    107:116:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():633 -> b
-    107:116:void allocateRegisters():215 -> b
-    117:117:void performAllocation():640:640 -> b
-    117:117:void allocateRegisters():216 -> b
-    118:130:void allocateRegisters():217:229 -> b
-    131:131:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> b
-    131:131:void allocateRegisters():229 -> b
-    132:136:void allocateRegisters():230:234 -> b
-    137:137:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():932:932 -> b
-    137:137:void allocateRegisters():229 -> b
-    138:138:void allocateRegisters():238:238 -> b
-    139:144:void clearState():534:539 -> b
-    139:144:void allocateRegisters():239 -> b
-    145:145:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):309:309 -> b
-    146:151:int unadjustedRealRegisterFromAllocated(int):802:807 -> b
-    152:153:void lambda$invariantsHold$4(java.util.TreeSet,int):1008:1009 -> b
-    154:171:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1409:1426 -> b
-    172:176:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1432:1436 -> b
-    177:181:void increaseCapacity(int,boolean):2965:2969 -> b
-    1:3:int registersUsed():591:593 -> c
-    4:4:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502:1502 -> c
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1178:1178 -> c
-    5:5:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502 -> c
-    6:26:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1505:1525 -> c
-    27:39:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1538:1550 -> c
-    40:41:boolean registerIsFree(int):3106:3107 -> c
-    42:42:boolean registersAreFree(int,boolean):3113:3113 -> c
-    1:1:int highestUsedRegister():586:586 -> d
-    2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1211:1211 -> d
-    3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1385:1385 -> d
-    5:5:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    6:24:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
+    1:1:void allocateRegisters():205:205 -> b
+    2:11:boolean noLinkedValues():3127:3136 -> b
+    2:11:void allocateRegisters():205 -> b
+    12:12:boolean noLinkedValues():3135:3135 -> b
+    12:12:void allocateRegisters():205 -> b
+    13:14:void allocateRegisters():206:207 -> b
+    15:63:void transformBridgeMethod():2664:2712 -> b
+    15:63:void allocateRegisters():208 -> b
+    64:67:void computeNeedsRegister():2932:2935 -> b
+    64:67:void allocateRegisters():210 -> b
+    68:68:void constrainArgumentIntervals():2909:2909 -> b
+    68:68:void allocateRegisters():211 -> b
+    69:75:void createArgumentLiveIntervals(java.util.List):2883:2889 -> b
+    69:75:void constrainArgumentIntervals():2910 -> b
+    69:75:void allocateRegisters():211 -> b
+    76:84:void linkArgumentValuesAndIntervals(java.util.List):2895:2903 -> b
+    76:84:void constrainArgumentIntervals():2911 -> b
+    76:84:void allocateRegisters():211 -> b
+    85:95:void insertRangeInvokeMoves():2915:2925 -> b
+    85:95:void allocateRegisters():212 -> b
+    96:97:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():628:629 -> b
+    96:97:void allocateRegisters():213 -> b
+    98:103:void computeLiveRanges():2490:2495 -> b
+    98:103:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> b
+    98:103:void allocateRegisters():213 -> b
+    104:104:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1158:1158 -> b
+    104:104:void computeLiveRanges():2495 -> b
+    104:104:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> b
+    104:104:void allocateRegisters():213 -> b
+    105:105:void computeLiveRanges():2495:2495 -> b
+    105:105:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> b
+    105:105:void allocateRegisters():213 -> b
+    106:106:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1167:1167 -> b
+    106:106:void computeLiveRanges():2495 -> b
+    106:106:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> b
+    106:106:void allocateRegisters():213 -> b
+    107:116:void computeLiveRanges():2495:2504 -> b
+    107:116:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():630 -> b
+    107:116:void allocateRegisters():213 -> b
+    117:117:void performAllocation():637:637 -> b
+    117:117:void allocateRegisters():214 -> b
+    118:130:void allocateRegisters():215:227 -> b
+    131:131:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> b
+    131:131:void allocateRegisters():227 -> b
+    132:136:void allocateRegisters():228:232 -> b
+    137:137:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():928:928 -> b
+    137:137:void allocateRegisters():227 -> b
+    138:138:void allocateRegisters():236:236 -> b
+    139:144:void clearState():531:536 -> b
+    139:144:void allocateRegisters():237 -> b
+    145:145:boolean lambda$computeDebugInfo$1(com.android.tools.r8.ir.code.Instruction):306:306 -> b
+    146:151:int unadjustedRealRegisterFromAllocated(int):799:804 -> b
+    152:153:void lambda$invariantsHold$4(java.util.TreeSet,int):1005:1006 -> b
+    154:171:boolean needsArrayGetWideWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1406:1423 -> b
+    172:176:boolean isArrayGetArrayRegister(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1429:1433 -> b
+    177:181:void increaseCapacity(int,boolean):2962:2966 -> b
+    1:3:int registersUsed():588:590 -> c
+    4:4:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1499:1499 -> c
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1173:1173 -> c
+    5:5:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1499 -> c
+    6:26:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1502:1522 -> c
+    27:39:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1535:1547 -> c
+    40:41:boolean registerIsFree(int):3103:3104 -> c
+    42:42:boolean registersAreFree(int,boolean):3110:3110 -> c
+    1:1:int highestUsedRegister():583:583 -> d
+    2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438:1438 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> d
+    3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438:1438 -> d
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1380:1380 -> d
+    5:5:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    6:24:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1459 -> d
     25:25:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
-    25:25:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1462 -> d
-    26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472:1472 -> d
-    27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1211:1211 -> d
-    28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1441 -> d
-    29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1385:1385 -> d
-    30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441 -> d
-    30:30:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    31:49:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1444:1462 -> d
-    31:49:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
+    25:25:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1459 -> d
+    26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469:1469 -> d
+    27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438:1438 -> d
+    27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1206:1206 -> d
+    28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438:1438 -> d
+    29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1380:1380 -> d
+    30:30:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1438 -> d
+    30:30:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    31:49:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1441:1459 -> d
+    31:49:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
     50:50:boolean com.android.tools.r8.ir.code.NumberConversion.isLongToIntConversion():52:52 -> d
-    50:50:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1462 -> d
-    50:50:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472 -> d
-    51:66:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1472:1487 -> d
-    1:11:boolean overlapsMoveExceptionInterval(com.android.tools.r8.ir.regalloc.LiveIntervals):1590:1600 -> e
-    12:12:void clearUserInfo():2658:2658 -> e
-    1:26:boolean computeUnusedRegisters():546:571 -> f
-    27:28:boolean registersForIntervalsAreTaken(com.android.tools.r8.ir.regalloc.LiveIntervals):3121:3122 -> f
-    29:29:boolean registersAreTaken(int,boolean):3117:3117 -> f
-    29:29:boolean registersForIntervalsAreTaken(com.android.tools.r8.ir.regalloc.LiveIntervals):3122 -> f
-    1:2:int getMoveExceptionRegister():185:186 -> g
-    3:3:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3095:3095 -> g
-    4:7:void takeFreeRegisters(int,boolean):3087:3090 -> g
-    4:7:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3095 -> g
-    8:11:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3097:3100 -> g
-    1:13:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):600:612 -> getRegisterForValue
-    14:15:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):797:798 -> getRegisterForValue
-    14:15:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):614 -> getRegisterForValue
-    16:18:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):605:607 -> getRegisterForValue
+    50:50:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1459 -> d
+    50:50:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469 -> d
+    51:66:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1469:1484 -> d
+    1:11:boolean overlapsMoveExceptionInterval(com.android.tools.r8.ir.regalloc.LiveIntervals):1587:1597 -> e
+    12:12:void clearUserInfo():2655:2655 -> e
+    1:26:boolean computeUnusedRegisters():543:568 -> f
+    27:28:boolean registersForIntervalsAreTaken(com.android.tools.r8.ir.regalloc.LiveIntervals):3118:3119 -> f
+    29:29:boolean registersAreTaken(int,boolean):3114:3114 -> f
+    29:29:boolean registersForIntervalsAreTaken(com.android.tools.r8.ir.regalloc.LiveIntervals):3119 -> f
+    1:2:int getMoveExceptionRegister():183:184 -> g
+    3:3:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3092:3092 -> g
+    4:7:void takeFreeRegisters(int,boolean):3084:3087 -> g
+    4:7:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3092 -> g
+    8:11:void takeFreeRegistersForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):3094:3097 -> g
+    1:13:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):597:609 -> getRegisterForValue
+    14:15:int getRegisterForIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):794:795 -> getRegisterForValue
+    14:15:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):611 -> getRegisterForValue
+    16:18:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):602:604 -> getRegisterForValue
     19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):34:34 -> getRegisterForValue
     19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> getRegisterForValue
-    19:19:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):607 -> getRegisterForValue
-    20:20:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):607:607 -> getRegisterForValue
-    1:1:boolean hasDedicatedMoveExceptionRegister():177:177 -> h
-    1:2:void computeRematerializableBits():2373:2374 -> i
-    1:2:void insertMoves():2349 -> i
-    3:12:void insertMoves():2351:2360 -> i
-    13:13:int toGapPosition(int):1394:1394 -> i
-    13:13:void insertMoves():2361 -> i
-    14:14:void insertMoves():2361:2361 -> i
-    15:15:void insertMoves():2359:2359 -> i
-    16:58:void resolveControlFlow(com.android.tools.r8.ir.regalloc.SpillMoveSet):2392:2434 -> i
-    16:58:void insertMoves():2367 -> i
-    59:60:void insertMoves():2368:2369 -> i
-    1:6:void removeSpillAndPhiMoves():752:757 -> j
-    1:28:boolean unsplitArguments():719:746 -> k
-    1:5:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2132:2136 -> splitOverlappingInactiveIntervals
+    19:19:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):604 -> getRegisterForValue
+    20:20:int getRegisterForValue(com.android.tools.r8.ir.code.Value,int):604:604 -> getRegisterForValue
+    1:1:boolean hasDedicatedMoveExceptionRegister():175:175 -> h
+    1:2:void computeRematerializableBits():2370:2371 -> i
+    1:2:void insertMoves():2346 -> i
+    3:12:void insertMoves():2348:2357 -> i
+    13:13:int toGapPosition(int):1391:1391 -> i
+    13:13:void insertMoves():2358 -> i
+    14:14:void insertMoves():2358:2358 -> i
+    15:15:void insertMoves():2356:2356 -> i
+    16:58:void resolveControlFlow(com.android.tools.r8.ir.regalloc.SpillMoveSet):2389:2431 -> i
+    16:58:void insertMoves():2364 -> i
+    59:60:void insertMoves():2365:2366 -> i
+    1:6:void removeSpillAndPhiMoves():749:754 -> j
+    1:28:boolean unsplitArguments():716:743 -> k
+    1:5:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2129:2133 -> splitOverlappingInactiveIntervals
     6:6:boolean com.android.tools.r8.ir.regalloc.LiveIntervals.overlaps(com.android.tools.r8.ir.regalloc.LiveIntervals):340:340 -> splitOverlappingInactiveIntervals
-    6:6:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2137 -> splitOverlappingInactiveIntervals
-    7:33:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2138:2164 -> splitOverlappingInactiveIntervals
-    1:20:java.lang.String toString():3147:3166 -> toString
+    6:6:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2134 -> splitOverlappingInactiveIntervals
+    7:33:void splitOverlappingInactiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals,int,boolean):2135:2161 -> splitOverlappingInactiveIntervals
+    1:20:java.lang.String toString():3144:3163 -> toString
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$ArgumentReuseMode -> com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$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>
+    1:3:void <clinit>():92:94 -> <clinit>
+    4:4:void <clinit>():91:91 -> <clinit>
+    1:1:void <init>(java.lang.String,int):91:91 -> <init>
 com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange -> com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$b:
     com.android.tools.r8.graph.DebugLocalInfo local -> b
     boolean $assertionsDisabled -> f
@@ -36058,13 +35895,13 @@
     com.android.tools.r8.ir.code.Value value -> a
     int end -> e
     int register -> c
-    1:1:void <clinit>():99:99 -> <clinit>
-    1:7:void <init>(com.android.tools.r8.ir.code.Value,int,int,int):106:112 -> <init>
-    1:3:int compareTo(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):117:119 -> a
-    1:1:int compareTo(java.lang.Object):99:99 -> compareTo
-    2:4:int compareTo(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):117:119 -> compareTo
-    2:4:int compareTo(java.lang.Object):99 -> compareTo
-    1:1:java.lang.String toString():124:124 -> toString
+    1:1:void <clinit>():97:97 -> <clinit>
+    1:7:void <init>(com.android.tools.r8.ir.code.Value,int,int,int):104:110 -> <init>
+    1:3:int compareTo(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):115:117 -> a
+    1:1:int compareTo(java.lang.Object):97:97 -> compareTo
+    2:4:int compareTo(com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator$LocalRange):115:117 -> compareTo
+    2:4:int compareTo(java.lang.Object):97 -> compareTo
+    1:1:java.lang.String toString():122:122 -> toString
 com.android.tools.r8.ir.regalloc.LiveIntervals -> com.android.tools.r8.ir.regalloc.a:
     boolean spilled -> m
     boolean usedInMonitorOperations -> n
@@ -36424,7 +36261,7 @@
     91:95:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):316:320 -> a
     96:104:void removeArgumentRestores(java.util.Set):332:340 -> a
     105:129:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):347:371 -> a
-    130:130:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1147:1147 -> a
+    130:130:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1142:1142 -> a
     130:130:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371 -> a
     131:136:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371:376 -> a
     137:141:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):375:379 -> a
@@ -36445,7 +36282,7 @@
     1:3:void addOutMove(int,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):152:154 -> f
     4:4:void addOutMove(int,com.android.tools.r8.ir.regalloc.LiveIntervals,com.android.tools.r8.ir.regalloc.LiveIntervals):153:153 -> f
     5:5:java.util.Set lambda$scheduleMovesBeforeInstruction$5(java.lang.Integer):310:310 -> f
-com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r8.w.d.a:
+com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r8.w.e.a:
     1:1:void <init>():21:21 -> <init>
     1:8:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):38:45 -> buildIR
     1:8:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueNumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin):56:63 -> buildInliningIR
@@ -36453,27 +36290,27 @@
     1:1:int computeHashCode():78:78 -> computeHashCode
     1:1:void registerCodeReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.UseRegistry):73:73 -> registerCodeReferences
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.w.d.a$a:
+com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.w.e.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.w.d.g:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.w.e.g:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):41:41 -> <init>
     1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):46:46 -> a
     2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType):30:30 -> a
     2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):46 -> a
     3:9:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexString):49:55 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.w.d.b:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.w.e.b:
     com.android.tools.r8.graph.DexField wrapperField -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):293:294 -> <init>
     1:9:com.android.tools.r8.graph.CfCode generateCfCode():299:307 -> a
     10:10:com.android.tools.r8.graph.CfCode generateCfCode():305:305 -> a
     11:23:com.android.tools.r8.graph.CfCode generateCfCode():302:314 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.w.d.c:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.w.e.c:
     com.android.tools.r8.graph.DexString message -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):324:325 -> <init>
     1:11:com.android.tools.r8.graph.CfCode generateCfCode():330:340 -> a
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():338:338 -> a
     13:22:com.android.tools.r8.graph.CfCode generateCfCode():335:344 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.w.d.d:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.w.e.d:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -36494,7 +36331,7 @@
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():140 -> a
     45:45:com.android.tools.r8.graph.CfCode generateCfCode():139:139 -> a
     46:58:com.android.tools.r8.graph.CfCode generateCfCode():136:148 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.w.d.e:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.w.e.e:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -36512,7 +36349,7 @@
     44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):66:66 -> a
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():218 -> a
     45:50:com.android.tools.r8.graph.CfCode generateCfCode():220:225 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.w.d.f:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.w.e.f:
     com.android.tools.r8.graph.DexField wrapperField -> e
     com.android.tools.r8.graph.DexType argType -> c
     com.android.tools.r8.graph.DexField reverseWrapperField -> d
@@ -36520,7 +36357,7 @@
     1:36:com.android.tools.r8.graph.CfCode generateCfCode():245:280 -> a
     37:37:com.android.tools.r8.graph.CfCode generateCfCode():278:278 -> a
     38:47:com.android.tools.r8.graph.CfCode generateCfCode():275:284 -> a
-com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.w.d.h:
+com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.w.e.h:
     java.util.List extraDispatchCases -> f
     com.android.tools.r8.graph.DexType interfaceType -> c
     com.android.tools.r8.graph.DexMethod libraryMethod -> e
@@ -36529,7 +36366,7 @@
     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.FieldAccessorSourceCode -> com.android.tools.r8.w.d.i:
+com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.w.e.i:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess fieldWithAccess -> l
     1:1:void <clinit>():15:15 -> <clinit>
@@ -36550,7 +36387,7 @@
     21:21:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():474:474 -> h
     21:21:void prepareInstructions():49 -> h
     22:25:void prepareInstructions():49:52 -> h
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.w.d.j:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.w.e.j:
     com.android.tools.r8.graph.DexType targetReceiver -> l
     com.android.tools.r8.graph.DexMethod target -> m
     boolean castResult -> o
@@ -36567,7 +36404,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.w.d.j$a:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.w.e.j$a:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> f
     boolean extraNullParameter -> i
     com.android.tools.r8.graph.DexType targetReceiver -> d
@@ -36587,7 +36424,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.w.d.k:
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.w.e.k:
     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>
@@ -36595,7 +36432,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.w.d.l:
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.w.e.l:
     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>
@@ -36603,7 +36440,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.w.d.m:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.w.e.m:
     java.util.function.Predicate endsBlock -> j
     com.android.tools.r8.ir.code.Position position -> h
     java.util.List constructors -> f
@@ -36683,7 +36520,27 @@
     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.x.a.a.a.e.c:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanListIterator -> com.android.tools.r8.x.a.a.a.e.c:
+    1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.<init>():34:34 -> <init>
+    1:1:void <init>():35 -> <init>
+    1:1:void add(java.lang.Object):34:34 -> add
+    2:2:void add(java.lang.Boolean):83:83 -> add
+    2:2:void add(java.lang.Object):34 -> add
+    3:3:void add(boolean):57:57 -> add
+    3:3:void add(java.lang.Boolean):83 -> add
+    3:3:void add(java.lang.Object):34 -> add
+    1:1:boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator.previousBoolean():62:62 -> previous
+    1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():56 -> previous
+    1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():0 -> previous
+    1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():33 -> previous
+    1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanBidirectionalIterator.previous():0 -> previous
+    1:1:void set(java.lang.Object):34:34 -> set
+    2:2:void set(java.lang.Boolean):70:70 -> set
+    2:2:void set(java.lang.Object):34 -> set
+    3:3:void set(boolean):46:46 -> set
+    3:3:void set(java.lang.Boolean):70 -> set
+    3:3:void set(java.lang.Object):34 -> set
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanSet -> com.android.tools.r8.x.a.a.a.e.d:
     1:1:void <init>():32:32 -> <init>
     1:1:boolean rem(boolean):87:87 -> c
     boolean remove(boolean) -> d
@@ -36692,7 +36549,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.x.a.a.a.e.e:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.x.a.a.a.e.f:
     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
@@ -36712,7 +36569,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():119:119 -> iterator
     2:2:java.util.Iterator iterator():29 -> iterator
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.x.a.a.a.e.d:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.x.a.a.a.e.e:
     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>
@@ -36720,13 +36577,14 @@
     1:2:boolean nextBoolean():129:130 -> nextBoolean
     3:3:boolean nextBoolean():129:129 -> nextBoolean
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.x.a.a.a.e.f:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.x.a.a.a.e.g:
     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.x.a.a.a.e.g:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.x.a.a.a.e.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanBidirectionalIterator -> com.android.tools.r8.x.a.a.a.e.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.x.a.a.a.e.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.x.a.a.a.e.k:
     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.x.a.a.a.e.h:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.x.a.a.a.e.j:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):369:371 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection):370:370 -> <init>
@@ -36741,13 +36599,8 @@
     1:1:int hashCode():517:517 -> hashCode
     1:1:boolean isEmpty():391:391 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400:400 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):747:747 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400:400 -> iterator
-    3:3:java.util.Iterator iterator():365 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):747:747 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400 -> iterator
-    4:4:java.util.Iterator iterator():365 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():400:400 -> iterator
+    2:2:java.util.Iterator iterator():365 -> iterator
     1:1:boolean remove(java.lang.Object):465:465 -> remove
     1:1:boolean removeAll(java.util.Collection):442:442 -> removeAll
     1:1:boolean retainAll(java.util.Collection):447:447 -> retainAll
@@ -36755,12 +36608,21 @@
     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.x.a.a.a.e.j:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.x.a.a.a.e.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.x.a.a.a.e.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.x.a.a.a.e.o:
+    com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator EMPTY_ITERATOR -> a
+    1:1:void <clinit>():103:103 -> <clinit>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):747:747 -> a
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator -> com.android.tools.r8.x.a.a.a.e.m:
+    1:1:void <init>():42:42 -> <init>
+    1:1:java.lang.Object clone():87:87 -> clone
+    1:1:boolean nextBoolean():57:57 -> nextBoolean
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.x.a.a.a.e.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):724:725 -> <init>
     1:1:boolean hasNext():730:730 -> hasNext
     1:1:boolean nextBoolean():735:735 -> nextBoolean
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSet -> com.android.tools.r8.x.a.a.a.e.p:
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap -> com.android.tools.r8.x.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>
@@ -36961,18 +36823,7 @@
     1:1:boolean add(int):68:68 -> a
     2:2:boolean add(java.lang.Integer):114:114 -> a
     3:4:int[] toArray(int[]):148:149 -> a
-    5:5:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312:312 -> a
-    5:5:int[] toArray(int[]):149 -> a
-    6:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:292 -> a
-    6:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    6:9:int[] toArray(int[]):149 -> a
-    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:289 -> a
-    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    10:10:int[] toArray(int[]):149 -> a
-    11:11:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
-    11:11:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    11:11:int[] toArray(int[]):149 -> a
-    12:13:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
+    5:6:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
     1:1:boolean add(java.lang.Object):36:36 -> add
     1:4:boolean rem(int):94:97 -> b
     1:1:boolean contains(java.lang.Object):129:129 -> contains
@@ -39013,8 +38864,6 @@
     1:1:boolean isEmpty():391:391 -> isEmpty
     1:1:java.util.Iterator iterator():365:365 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():400:400 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):830:830 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():400 -> iterator
     1:1:boolean remove(java.lang.Object):465:465 -> remove
     1:1:boolean removeAll(java.util.Collection):442:442 -> removeAll
     1:1:boolean retainAll(java.util.Collection):447:447 -> retainAll
@@ -39027,6 +38876,15 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.x.a.a.a.f.O0:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator singleton(int):159:159 -> a
+    2:2:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312:312 -> a
+    3:6:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:292 -> a
+    3:6:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    7:7:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:289 -> a
+    7:7:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    8:8:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
+    8:8:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):830:830 -> a
 com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.x.a.a.a.f.L0:
     1:1:void <init>():42:42 -> <init>
     1:1:int previousInt():62:62 -> c
@@ -39121,18 +38979,22 @@
     1:2:int[] toIntArray():364:365 -> f
     1:1:int removeInt(int):353:353 -> g
     1:2:int getInt(int):342:343 -> getInt
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376:376 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> iterator
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376 -> iterator
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():332 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376:376 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376:376 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376 -> iterator
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> iterator
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator iterator():376 -> iterator
     3:3:java.util.Iterator iterator():332 -> iterator
-    1:1:java.util.ListIterator listIterator():332:332 -> listIterator
-    2:2:java.util.ListIterator listIterator(int):332:332 -> listIterator
+    1:1:java.util.ListIterator listIterator(int):332:332 -> 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 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
-    5:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):382:383 -> listIterator
-    7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):381:381 -> listIterator
+    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):382 -> listIterator
+    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):383:383 -> listIterator
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator(int):381:381 -> listIterator
+    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator listIterator():371:371 -> listIterator
+    6:6:java.util.ListIterator listIterator():332 -> 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
@@ -39476,10 +39338,11 @@
     2:4:boolean rem(long):87 -> c
     1:4:boolean equals(java.lang.Object):41:44 -> equals
     1:7:int hashCode():57:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap -> com.android.tools.r8.x.a.a.a.g.k:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.x.a.a.a.g.i:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.x.a.a.a.g.j:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.x.a.a.a.g.m:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceFunction -> com.android.tools.r8.x.a.a.a.g.i:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap -> com.android.tools.r8.x.a.a.a.g.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.x.a.a.a.g.j:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.x.a.a.a.g.k:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.x.a.a.a.g.n:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
     java.lang.Object[] value -> b
     float f -> h
@@ -39549,7 +39412,7 @@
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():794:815 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.x.a.a.a.g.l:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.x.a.a.a.g.m:
     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
@@ -39557,7 +39420,7 @@
     1:1:java.util.Iterator iterator():794:794 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.x.a.a.a.g.m$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.x.a.a.a.g.n$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>
@@ -39565,13 +39428,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.x.a.a.a.g.m$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.x.a.a.a.g.n$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):721:722 -> <init>
     1:1:java.lang.Long next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
     1:1:long nextLong():727:727 -> nextLong
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.x.a.a.a.g.m$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.x.a.a.a.g.n$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>
@@ -39580,7 +39443,7 @@
     1:1:java.util.Iterator iterator():737:737 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():740:740 -> iterator
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.x.a.a.a.g.m$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.x.a.a.a.g.n$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>
@@ -39591,7 +39454,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.x.a.a.a.g.m$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.x.a.a.a.g.n$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>
@@ -39601,7 +39464,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.x.a.a.a.g.m$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.x.a.a.a.g.n$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
@@ -39622,11 +39485,11 @@
     25:25:void remove():580 -> remove
     26:27:void remove():583:584 -> remove
     28:28:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.x.a.a.a.g.m$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.x.a.a.a.g.n$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.x.a.a.a.g.o:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.x.a.a.a.g.p:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -39655,7 +39518,7 @@
     3:4:java.util.ListIterator listIterator(int):48 -> listIterator
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.x.a.a.a.g.n:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.x.a.a.a.g.o:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -39674,15 +39537,17 @@
     1:1:int previousIndex():520:520 -> previousIndex
     1:9:void remove():534:542 -> remove
     10:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.x.a.a.a.g.p:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.x.a.a.a.g.q:
     long previousLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.x.a.a.a.g.q:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.x.a.a.a.g.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.x.a.a.a.g.r:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.x.a.a.a.g.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.x.a.a.a.g.t:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long set(int,long) -> b
     long removeLong(int) -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.x.a.a.a.g.s:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.x.a.a.a.g.u:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongStack -> com.android.tools.r8.x.a.a.a.g.v:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.x.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>
@@ -39703,10 +39568,7 @@
     1:1:int hashCode():310:310 -> hashCode
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> hashCode
     2:2:int hashCode():311 -> hashCode
-    3:3:int hashCode():311:311 -> hashCode
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet.iterator():136:136 -> hashCode
-    4:4:int hashCode():311 -> hashCode
-    5:5:int hashCode():313:313 -> hashCode
+    3:5:int hashCode():311:313 -> hashCode
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Boolean):123:125 -> put
@@ -39727,13 +39589,10 @@
     1:1:java.lang.String toString():328:328 -> toString
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> toString
     2:2:java.lang.String toString():329 -> toString
-    3:3:java.lang.String toString():329:329 -> toString
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet.iterator():136:136 -> toString
-    4:4:java.lang.String toString():329 -> toString
-    5:16:java.lang.String toString():330:341 -> toString
-    17:17:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> toString
-    17:17:java.lang.String toString():341 -> toString
-    18:21:java.lang.String toString():341:344 -> toString
+    3:15:java.lang.String toString():329:341 -> toString
+    16:16:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry.getBooleanValue():145:145 -> toString
+    16:16:java.lang.String toString():341 -> toString
+    17:20:java.lang.String toString():341:344 -> toString
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap$BasicEntry -> com.android.tools.r8.x.a.a.a.h.a:
     java.lang.Object key -> a
     boolean value -> b
@@ -40124,9 +39983,11 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.x.a.a.a.h.z:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.x.a.a.a.h.z$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.x.a.a.a.h.C:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanFunction -> com.android.tools.r8.x.a.a.a.h.z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.x.a.a.a.h.A:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.x.a.a.a.h.A$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet -> com.android.tools.r8.x.a.a.a.h.B:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.x.a.a.a.h.E:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -40157,8 +40018,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.x.a.a.a.h.A:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.x.a.a.a.h.C$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.x.a.a.a.h.C:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.x.a.a.a.h.E$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>
@@ -40168,7 +40029,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.x.a.a.a.h.B:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.x.a.a.a.h.D:
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> c
     int curr -> a
@@ -40180,10 +40041,10 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.x.a.a.a.h.D:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.x.a.a.a.h.F:
     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.x.a.a.a.h.F:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.x.a.a.a.h.H:
     float f -> l
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
@@ -40261,7 +40122,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.x.a.a.a.h.E:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.x.a.a.a.h.G:
     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:void clear():1614:1614 -> clear
@@ -40269,7 +40130,7 @@
     1:1:java.util.Iterator iterator():1596:1596 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.x.a.a.a.h.F$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.x.a.a.a.h.H$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>
@@ -40284,14 +40145,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.x.a.a.a.h.F$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.x.a.a.a.h.H$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.x.a.a.a.h.F$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.x.a.a.a.h.H$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>
@@ -40313,7 +40174,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.x.a.a.a.h.F$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.x.a.a.a.h.H$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>
@@ -40332,7 +40193,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.x.a.a.a.h.F$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.x.a.a.a.h.H$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>
@@ -40360,7 +40221,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.x.a.a.a.h.F$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.x.a.a.a.h.H$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -40381,7 +40242,7 @@
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1185:1185 -> remove
     49:49:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.x.a.a.a.h.F$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.x.a.a.a.h.H$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
@@ -40396,12 +40257,15 @@
     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.x.a.a.a.h.H:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.x.a.a.a.h.K:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.x.a.a.a.h.G:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.x.a.a.a.h.I:
     int getIntValue() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.x.a.a.a.h.I:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.x.a.a.a.h.K:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.x.a.a.a.h.J:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap -> com.android.tools.r8.x.a.a.a.h.M:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.x.a.a.a.h.L:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectFunction -> com.android.tools.r8.x.a.a.a.h.N:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.x.a.a.a.h.P:
     float f -> l
     java.lang.Object[] value -> b
     int maxFill -> j
@@ -40477,7 +40341,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1529:1550 -> values
     1:22:java.util.Collection values():85 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.x.a.a.a.h.J:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.x.a.a.a.h.O:
     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
@@ -40485,7 +40349,7 @@
     1:1:java.util.Iterator iterator():1529:1529 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1532:1532 -> iterator
     1:1:int size():1537:1537 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.x.a.a.a.h.K$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.x.a.a.a.h.P$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>
@@ -40500,14 +40364,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.x.a.a.a.h.K$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.x.a.a.a.h.P$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.x.a.a.a.h.K$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.x.a.a.a.h.P$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>
@@ -40529,7 +40393,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.x.a.a.a.h.K$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.x.a.a.a.h.P$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>
@@ -40539,7 +40403,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.x.a.a.a.h.K$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.x.a.a.a.h.P$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>
@@ -40567,7 +40431,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.x.a.a.a.h.K$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.x.a.a.a.h.P$f:
     int index -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> e
     int next -> b
@@ -40588,17 +40452,18 @@
     1:49:void remove():1102:1150 -> remove
     50:50:void remove():1144:1144 -> remove
     51:51:void remove():1103:1103 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.x.a.a.a.h.K$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.x.a.a.a.h.P$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.x.a.a.a.h.M:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.x.a.a.a.h.L:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.x.a.a.a.h.N:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.x.a.a.a.h.P:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.x.a.a.a.h.S:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.x.a.a.a.h.Q:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap -> com.android.tools.r8.x.a.a.a.h.U:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.x.a.a.a.h.T:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.x.a.a.a.h.W:
     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
@@ -40618,7 +40483,7 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.x.a.a.a.h.O:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.x.a.a.a.h.V:
     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>
@@ -40626,15 +40491,15 @@
     1:2:java.lang.Object next():129:130 -> next
     3:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.x.a.a.a.h.Q:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.x.a.a.a.h.X:
     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.x.a.a.a.h.S:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.x.a.a.a.h.T:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections -> com.android.tools.r8.x.a.a.a.h.W:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.x.a.a.a.h.Y:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.x.a.a.a.h.Z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections -> com.android.tools.r8.x.a.a.a.h.c0:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):383:383 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):383:383 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.x.a.a.a.h.U:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.x.a.a.a.h.a0:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():55:55 -> iterator
@@ -40645,7 +40510,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.x.a.a.a.h.V:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.x.a.a.a.h.b0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):276:278 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):277:277 -> <init>
@@ -40658,13 +40523,8 @@
     1:1:int hashCode():364:364 -> hashCode
     1:1:boolean isEmpty():298:298 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307:307 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):762:762 -> iterator
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307:307 -> iterator
-    3:3:java.util.Iterator iterator():272 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):762:762 -> iterator
-    4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307 -> iterator
-    4:4:java.util.Iterator iterator():272 -> iterator
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307:307 -> iterator
+    2:2:java.util.Iterator iterator():272 -> iterator
     1:1:boolean remove(java.lang.Object):288:288 -> remove
     1:1:boolean removeAll(java.util.Collection):349:349 -> removeAll
     1:1:boolean retainAll(java.util.Collection):354:354 -> retainAll
@@ -40672,35 +40532,37 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):329:329 -> toArray
     2:2:java.lang.Object[] toArray():334:334 -> toArray
     1:1:java.lang.String toString():359:359 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.x.a.a.a.h.X:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.x.a.a.a.h.a0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterable -> com.android.tools.r8.x.a.a.a.h.d0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.x.a.a.a.h.e0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.x.a.a.a.h.h0:
     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.x.a.a.a.h.Y:
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):762:762 -> a
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.x.a.a.a.h.f0:
     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.x.a.a.a.h.Z:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.x.a.a.a.h.g0:
     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.ObjectListIterator -> com.android.tools.r8.x.a.a.a.h.b0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.x.a.a.a.h.c0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.x.a.a.a.h.e0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.x.a.a.a.h.i0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.x.a.a.a.h.j0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.x.a.a.a.h.l0:
     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.x.a.a.a.h.d0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.x.a.a.a.h.k0:
     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.x.a.a.a.h.f0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.x.a.a.a.h.h0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.x.a.a.a.h.m0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.x.a.a.a.h.o0:
     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.x.a.a.a.h.g0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.x.a.a.a.h.n0:
     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
@@ -40711,10 +40573,11 @@
     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.x.a.a.a.h.k0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.x.a.a.a.h.i0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.x.a.a.a.h.j0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.x.a.a.a.h.m0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunction -> com.android.tools.r8.x.a.a.a.h.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.x.a.a.a.h.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.x.a.a.a.h.q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.x.a.a.a.h.r0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.x.a.a.a.h.u0:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> k
     float f -> h
     java.lang.Object[] key -> a
@@ -40785,7 +40648,7 @@
     1:1:int size():384:384 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values():803:824 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.x.a.a.a.h.l0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.x.a.a.a.h.t0:
     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
@@ -40793,7 +40656,7 @@
     1:1:java.util.Iterator iterator():803:803 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():806:806 -> iterator
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.x.a.a.a.h.m0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.x.a.a.a.h.u0$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>
@@ -40801,11 +40664,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry next():614:614 -> next
     1:1:java.lang.Object next():609 -> next
     1:2:void remove():619:620 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.x.a.a.a.h.m0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.x.a.a.a.h.u0$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.x.a.a.a.h.m0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.x.a.a.a.h.u0$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>
@@ -40815,7 +40678,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():743:743 -> iterator
     1:3:boolean remove(java.lang.Object):758:760 -> remove
     1:1:int size():748:748 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.x.a.a.a.h.m0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.x.a.a.a.h.u0$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>
@@ -40833,7 +40696,7 @@
     5:5:java.lang.Boolean setValue(java.lang.Boolean):473:473 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):423 -> setValue
     1:1:java.lang.String toString():491:491 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.x.a.a.a.h.m0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.x.a.a.a.h.u0$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>
@@ -40843,7 +40706,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():636:636 -> iterator
     1:29:boolean remove(java.lang.Object):668:696 -> remove
     1:1:int size():705:705 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.x.a.a.a.h.m0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.x.a.a.a.h.u0$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
@@ -40864,13 +40727,13 @@
     24:24:void remove():589 -> remove
     25:26:void remove():592:593 -> remove
     27:27:void remove():585:585 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.x.a.a.a.h.m0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.x.a.a.a.h.u0$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):785:786 -> <init>
     1:1:java.lang.Boolean next():797:797 -> next
     1:1:java.lang.Object next():784 -> next
     1:1:boolean nextBoolean():791:791 -> nextBoolean
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.x.a.a.a.h.p0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.x.a.a.a.h.x0:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -40899,8 +40762,8 @@
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.x.a.a.a.h.n0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.x.a.a.a.h.p0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.x.a.a.a.h.v0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.x.a.a.a.h.x0$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>
@@ -40910,7 +40773,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.x.a.a.a.h.o0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.x.a.a.a.h.w0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -40922,10 +40785,10 @@
     3:3:java.lang.Object next():136 -> next
     1:6:void remove():153:158 -> remove
     7:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.x.a.a.a.h.q0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.x.a.a.a.h.y0:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.x.a.a.a.h.s0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.x.a.a.a.h.A0:
     float f -> l
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
@@ -41002,7 +40865,7 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.x.a.a.a.h.r0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.x.a.a.a.h.z0:
     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:void clear():1614:1614 -> clear
@@ -41010,7 +40873,7 @@
     1:1:java.util.Iterator iterator():1596:1596 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.x.a.a.a.h.s0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.x.a.a.a.h.A0$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>
@@ -41025,14 +40888,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.x.a.a.a.h.s0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.x.a.a.a.h.A0$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.x.a.a.a.h.s0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.x.a.a.a.h.A0$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>
@@ -41054,7 +40917,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.x.a.a.a.h.s0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.x.a.a.a.h.A0$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>
@@ -41073,7 +40936,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.x.a.a.a.h.s0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.x.a.a.a.h.A0$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>
@@ -41101,7 +40964,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.x.a.a.a.h.s0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.x.a.a.a.h.A0$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -41122,7 +40985,7 @@
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1185:1185 -> remove
     49:49:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.x.a.a.a.h.s0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.x.a.a.a.h.A0$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
@@ -41137,12 +41000,12 @@
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void set(java.lang.Integer):1559:1559 -> set
     2:2:void set(java.lang.Object):1544 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.x.a.a.a.h.t0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.x.a.a.a.h.B0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.x.a.a.a.h.t0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.x.a.a.a.h.B0$a:
     int getIntValue() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.x.a.a.a.h.u0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.x.a.a.a.h.w0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.x.a.a.a.h.C0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.x.a.a.a.h.E0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     java.lang.Object[] key -> b
@@ -41206,7 +41069,7 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.x.a.a.a.h.v0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.x.a.a.a.h.D0:
     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:void clear():866:866 -> clear
@@ -41214,7 +41077,7 @@
     1:1:java.util.Iterator iterator():848:848 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.x.a.a.a.h.w0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.x.a.a.a.h.E0$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>
@@ -41222,11 +41085,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.x.a.a.a.h.w0$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.x.a.a.a.h.E0$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.x.a.a.a.h.w0$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.x.a.a.a.h.E0$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>
@@ -41236,7 +41099,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.x.a.a.a.h.w0$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.x.a.a.a.h.E0$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>
@@ -41255,7 +41118,7 @@
     5:5:java.lang.Integer setValue(java.lang.Integer):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.x.a.a.a.h.w0$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.x.a.a.a.h.E0$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>
@@ -41265,7 +41128,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.x.a.a.a.h.w0$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.x.a.a.a.h.E0$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
@@ -41286,14 +41149,15 @@
     24:24:void remove():634 -> remove
     25:26:void remove():637:638 -> remove
     27:27:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.x.a.a.a.h.w0$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.x.a.a.a.h.E0$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):830:831 -> <init>
     1:1:java.lang.Integer next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
     1:1:int nextInt():836:836 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.x.a.a.a.h.x0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.x.a.a.a.h.z0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap -> com.android.tools.r8.x.a.a.a.h.G0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.x.a.a.a.h.F0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.x.a.a.a.h.I0:
     java.lang.Object[] a -> b
     boolean wrapped -> a
     int size -> c
@@ -41329,7 +41193,7 @@
     1:3:java.lang.Object set(int,java.lang.Object):357:359 -> set
     4:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.x.a.a.a.h.y0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.x.a.a.a.h.H0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -41348,7 +41212,7 @@
     10:10:void remove():538:538 -> remove
     1:2:void set(java.lang.Object):533:534 -> set
     3:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.x.a.a.a.h.B0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.x.a.a.a.h.K0:
     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
@@ -41368,7 +41232,7 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.x.a.a.a.h.A0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.x.a.a.a.h.J0:
     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>
@@ -41376,8 +41240,8 @@
     1:2:java.lang.Object next():129:130 -> next
     3:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.x.a.a.a.h.C0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.x.a.a.a.h.D0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.x.a.a.a.h.L0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.x.a.a.a.h.M0:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():55:55 -> iterator
@@ -41387,7 +41251,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.x.a.a.a.h.E0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.x.a.a.a.h.N0:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):276:278 -> <init>
     4:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):277:277 -> <init>
@@ -41401,8 +41265,6 @@
     1:1:boolean isEmpty():298:298 -> isEmpty
     1:1:java.util.Iterator iterator():272:272 -> iterator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307:307 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):762:762 -> iterator
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():307 -> iterator
     1:1:boolean remove(java.lang.Object):288:288 -> remove
     1:1:boolean removeAll(java.util.Collection):349:349 -> removeAll
     1:1:boolean retainAll(java.util.Collection):354:354 -> retainAll
@@ -41410,9 +41272,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.x.a.a.a.h.F0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.x.a.a.a.h.O0:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.x.a.a.a.h.H0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.x.a.a.a.h.Q0:
     java.lang.Object[] key -> a
     float f -> g
     int size -> f
@@ -41462,8 +41324,8 @@
     2:5:boolean remove(java.lang.Object):332 -> remove
     6:13:boolean remove(java.lang.Object):336:343 -> remove
     1:1:int size():380:380 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.x.a.a.a.h.G0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.x.a.a.a.h.H0$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.x.a.a.a.h.P0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.x.a.a.a.h.Q0$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
@@ -41484,16 +41346,16 @@
     23:23:void remove():500 -> remove
     24:25:void remove():503:504 -> remove
     26:26:void remove():496:496 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.x.a.a.a.h.I0:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.x.a.a.a.h.K0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.x.a.a.a.h.R0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.x.a.a.a.h.T0:
     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.x.a.a.a.h.J0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.x.a.a.a.h.S0:
     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.x.a.a.a.h.L0:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.x.a.a.a.h.U0:
 com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.y.b:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
@@ -41505,10 +41367,10 @@
     com.android.tools.r8.dex.Marker marker -> f
     1:1:void <clinit>():62:62 -> <clinit>
     1:9:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.Marker,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):86:94 -> <init>
-    1:1:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():66:66 -> a
+    1:1:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():64:64 -> a
     1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):349 -> a
     2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):348:348 -> a
-    3:3:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():66:66 -> a
+    3:3:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():64:64 -> a
     3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):351 -> a
     4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):350:357 -> a
     12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):355:355 -> a
@@ -41527,7 +41389,7 @@
     99:103:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,java.lang.String):195 -> a
     104:104:void lambda$writeClass$0(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:196 -> a
     105:108:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):200:203 -> a
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    109:109:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     109:109:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):204 -> a
     110:114:int getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):203:207 -> a
     115:122:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):222:229 -> a
@@ -41559,7 +41421,7 @@
     256:256:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):416:416 -> a
     257:257:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):414:414 -> a
     1:9:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):108:116 -> b
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> b
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> b
     10:10:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):116 -> b
     11:11:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):119:119 -> b
     12:23:void writeApplication(com.android.tools.r8.ClassFileConsumer,java.util.concurrent.ExecutorService):117:128 -> b
@@ -41794,11 +41656,13 @@
     14005:14005:int com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.mapCapacity(int):134:134 -> a
     14005:14005:int com.android.tools.r8.jetbrains.kotlin.collections.MapsKt.mapCapacity(int):0 -> a
     14006:14007:java.util.Collection com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toCollection(java.lang.Iterable,java.util.Collection):1153:1154 -> a
-    1:2:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1184:1185 -> b
-    3:1196:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1193 -> b
-    3:1196:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1185 -> b
-    1197:1197:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1186:1186 -> b
-    1198:1199:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.indexOf(int[],int):1317:1318 -> b
+    1:1:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.SetsKt__SetsKt.emptySet():34:34 -> b
+    1:1:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.SetsKt.emptySet():0 -> b
+    2:3:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1184:1185 -> b
+    4:1197:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.util.Collection):0:1193 -> b
+    4:1197:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1185 -> b
+    1198:1198:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toMutableList(java.lang.Iterable):1186:1186 -> b
+    1199:1200:int com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.indexOf(int[],int):1317:1318 -> b
     1:1207:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):0:1206 -> c
     1:1207:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.toSet(java.lang.Iterable):0 -> c
     1208:1208:java.util.Set com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.toSet(java.lang.Iterable):1205:1205 -> c
@@ -42093,13 +41957,14 @@
     1:1:java.lang.String toString():54:54 -> toString
 com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.z.a.r.a:
 com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.z.a.r.b:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.z.a.r.e:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.z.a.r.d:
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.z.a.r.c:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.z.a.r.f:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty$Getter -> com.android.tools.r8.z.a.r.c:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.z.a.r.e:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.z.a.r.d:
 com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.z.b.a.a:
     1:1:void <init>(java.lang.String,java.lang.Throwable):8:8 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.z.b.a.b.a.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.z.b.a.b.a.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.z.b.a.b.a.m:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List argument_ -> d
@@ -42160,7 +42025,7 @@
     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.z.b.a.b.a.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.z.b.a.b.a.j:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     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 -> f
@@ -42496,7 +42361,9 @@
     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.z.b.a.b.a.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$ValueOrBuilder -> com.android.tools.r8.z.b.a.b.a.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$ArgumentOrBuilder -> com.android.tools.r8.z.b.a.b.a.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.z.b.a.b.a.l:
     java.util.List argument_ -> d
     int bitField0_ -> b
     int id_ -> c
@@ -42537,7 +42404,8 @@
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4377:4389 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder create():4348:4348 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder access$4200():4334 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.z.b.a.b.a.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$AnnotationOrBuilder -> com.android.tools.r8.z.b.a.b.a.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.z.b.a.b.a.q:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class defaultInstance -> u
     java.util.List versionRequirement_ -> r
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -42686,11 +42554,11 @@
     1:1:boolean hasVersionRequirementTable():9340:9340 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class getDefaultInstance():8511:8511 -> q
     1:16:void initFields():9350:9365 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.z.b.a.b.a.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.z.b.a.b.a.o:
     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.z.b.a.b.a.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.z.b.a.b.a.p:
     java.util.List sealedSubclassFqName_ -> q
     java.util.List enumEntry_ -> p
     java.util.List typeAlias_ -> o
@@ -42840,7 +42708,8 @@
     1:79:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class buildPartial():9754:9832 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder create():9697:9697 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder access$8700():9684 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.z.b.a.b.a.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ClassOrBuilder -> com.android.tools.r8.z.b.a.b.a.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.z.b.a.b.a.u:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List versionRequirement_ -> f
     java.util.List valueParameter_ -> e
@@ -42894,11 +42763,11 @@
     1:1:boolean hasFlags():13501:13501 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor getDefaultInstance():13381:13381 -> i
     1:3:void initFields():13586:13588 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.z.b.a.b.a.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.z.b.a.b.a.s:
     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.z.b.a.b.a.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.z.b.a.b.a.t:
     java.util.List valueParameter_ -> f
     int bitField0_ -> d
     int flags_ -> e
@@ -42941,7 +42810,8 @@
     1:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():13772:13789 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder create():13741:13741 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder access$12500():13728 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.z.b.a.b.a.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ConstructorOrBuilder -> com.android.tools.r8.z.b.a.b.a.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.z.b.a.b.a.y:
     java.util.List effect_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract defaultInstance -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> e
@@ -42988,11 +42858,11 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():23312 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract getDefaultInstance():23325:23325 -> e
     1:1:void initFields():23439:23439 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.z.b.a.b.a.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.z.b.a.b.a.w:
     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.z.b.a.b.a.s:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.z.b.a.b.a.x:
     java.util.List effect_ -> c
     int bitField0_ -> b
     1:91:void <init>():23558:23648 -> <init>
@@ -43027,7 +42897,8 @@
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract buildPartial():23592:23598 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder create():23565:23565 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22300():23551 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.z.b.a.b.a.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ContractOrBuilder -> com.android.tools.r8.z.b.a.b.a.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.z.b.a.b.a.E:
     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
@@ -43093,11 +42964,11 @@
     1:1:boolean hasKind():24216:24216 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect getDefaultInstance():23855:23855 -> k
     1:4:void initFields():24226:24229 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.z.b.a.b.a.u:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.z.b.a.b.a.A:
     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.z.b.a.b.a.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.z.b.a.b.a.B:
     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
@@ -43162,7 +43033,7 @@
     1:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect buildPartial():24415:24435 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder create():24382:24382 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$22800():24368 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.z.b.a.b.a.w:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.z.b.a.b.a.C:
     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 RETURNS_CONSTANT -> b
@@ -43173,7 +43044,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.z.b.a.b.a.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.z.b.a.b.a.D:
     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 AT_LEAST_ONCE -> d
@@ -43184,7 +43055,8 @@
     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.z.b.a.b.a.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EffectOrBuilder -> com.android.tools.r8.z.b.a.b.a.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.z.b.a.b.a.I:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry defaultInstance -> f
@@ -43224,11 +43096,11 @@
     1:1:boolean hasName():20550:20550 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry getDefaultInstance():20471:20471 -> i
     1:1:void initFields():20560:20560 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.z.b.a.b.a.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.z.b.a.b.a.G:
     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.z.b.a.b.a.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.z.b.a.b.a.H:
     int bitField0_ -> d
     int name_ -> e
     1:1:void <init>():20681:20681 -> <init>
@@ -43259,7 +43131,8 @@
     1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry buildPartial():20715:20722 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder create():20688:20688 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder access$19200():20675 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.z.b.a.b.a.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntryOrBuilder -> com.android.tools.r8.z.b.a.b.a.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.z.b.a.b.a.N:
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue constantValue_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -43345,11 +43218,11 @@
     1:1:boolean hasValueParameterReference():25191:25191 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression getDefaultInstance():24960:24960 -> o
     1:7:void initFields():25391:25397 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.z.b.a.b.a.C:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.z.b.a.b.a.K:
     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.z.b.a.b.a.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.z.b.a.b.a.L:
     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
@@ -43429,7 +43302,7 @@
     1:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression buildPartial():25621:25654 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder create():25582:25582 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder access$23700():25568 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.z.b.a.b.a.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.z.b.a.b.a.M:
     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 FALSE -> c
@@ -43440,7 +43313,8 @@
     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.z.b.a.b.a.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ExpressionOrBuilder -> com.android.tools.r8.z.b.a.b.a.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.z.b.a.b.a.S:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> q
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int receiverTypeId_ -> k
@@ -43564,11 +43438,11 @@
     1:1:boolean hasTypeTable():14727:14727 -> x
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function getDefaultInstance():14327:14327 -> y
     1:12:void initFields():14786:14797 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.z.b.a.b.a.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.z.b.a.b.a.P:
     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.z.b.a.b.a.H:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.z.b.a.b.a.Q:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     int returnTypeId_ -> i
@@ -43710,7 +43584,8 @@
     1:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function buildPartial():15096:15150 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder create():15047:15047 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder access$13300():15034 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.z.b.a.b.a.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$FunctionOrBuilder -> com.android.tools.r8.z.b.a.b.a.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.z.b.a.b.a.W:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> h
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -43785,11 +43660,11 @@
     1:1:boolean hasVersionRequirementTable():11825:11825 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package getDefaultInstance():11572:11572 -> k
     1:5:void initFields():11835:11839 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.z.b.a.b.a.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.z.b.a.b.a.U:
     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.z.b.a.b.a.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.z.b.a.b.a.V:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
     java.util.List property_ -> f
     java.util.List function_ -> e
@@ -43873,7 +43748,8 @@
     1:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package buildPartial():12054:12080 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder create():12019:12019 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder access$10800():12006 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.z.b.a.b.a.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$PackageOrBuilder -> com.android.tools.r8.z.b.a.b.a.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.z.b.a.b.a.a0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property defaultInstance -> q
     int setterFlags_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter setterValueParameter_ -> l
@@ -43988,11 +43864,11 @@
     1:1:boolean hasReturnTypeId():16579:16579 -> x
     1:1:boolean hasSetterFlags():16713:16713 -> y
     1:1:boolean hasSetterValueParameter():16659:16659 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.z.b.a.b.a.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.z.b.a.b.a.Y:
     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.z.b.a.b.a.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.z.b.a.b.a.Z:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -44115,7 +43991,8 @@
     1:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property buildPartial():17055:17108 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder create():17006:17006 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder access$15000():16993 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.z.b.a.b.a.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$PropertyOrBuilder -> com.android.tools.r8.z.b.a.b.a.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.z.b.a.b.a.j0:
     int outerTypeId_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int typeAliasName_ -> l
@@ -44245,11 +44122,11 @@
     1:1:boolean hasFlexibleTypeCapabilitiesId():5728:5728 -> x
     1:1:boolean hasFlexibleUpperBound():5748:5748 -> y
     1:1:boolean hasFlexibleUpperBoundId():5763:5763 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.z.b.a.b.a.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.z.b.a.b.a.c0:
     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.z.b.a.b.a.U:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.z.b.a.b.a.g0:
     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$Type$Argument$Projection projection_ -> c
@@ -44306,11 +44183,11 @@
     1:1:boolean hasTypeId():5257:5257 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument getDefaultInstance():5041:5041 -> k
     1:3:void initFields():5267:5269 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.z.b.a.b.a.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.z.b.a.b.a.d0:
     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.z.b.a.b.a.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.z.b.a.b.a.e0:
     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
@@ -44364,7 +44241,7 @@
     1:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5440:5455 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder create():5409:5409 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder access$5000():5395 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.z.b.a.b.a.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.z.b.a.b.a.f0:
     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
@@ -44377,7 +44254,8 @@
     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.z.b.a.b.a.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$ArgumentOrBuilder -> com.android.tools.r8.z.b.a.b.a.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.z.b.a.b.a.i0:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -44506,7 +44384,7 @@
     1:61:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type buildPartial():6259:6319 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder create():6206:6206 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder access$5700():6193 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.z.b.a.b.a.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.z.b.a.b.a.m0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int expandedTypeId_ -> j
     int underlyingTypeId_ -> h
@@ -44605,11 +44483,11 @@
     1:1:boolean hasUnderlyingTypeId():19283:19283 -> r
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias getDefaultInstance():19027:19027 -> s
     1:9:void initFields():19392:19400 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.z.b.a.b.a.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.z.b.a.b.a.k0:
     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.z.b.a.b.a.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.z.b.a.b.a.l0:
     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
@@ -44711,7 +44589,9 @@
     1:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias buildPartial():19660:19702 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder create():19617:19617 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$17800():19604 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.z.b.a.b.a.d0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAliasOrBuilder -> com.android.tools.r8.z.b.a.b.a.n0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeOrBuilder -> com.android.tools.r8.z.b.a.b.a.o0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.z.b.a.b.a.s0:
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter defaultInstance -> k
@@ -44784,11 +44664,11 @@
     1:1:boolean hasVariance():7510:7510 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter getDefaultInstance():7264:7264 -> o
     1:6:void initFields():7578:7583 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.z.b.a.b.a.a0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.z.b.a.b.a.p0:
     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.z.b.a.b.a.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.z.b.a.b.a.q0:
     int name_ -> f
     java.util.List upperBoundId_ -> j
     java.util.List upperBound_ -> i
@@ -44849,7 +44729,7 @@
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7811:7840 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder create():7774:7774 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder access$7600():7761 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.z.b.a.b.a.c0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.z.b.a.b.a.r0:
     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 OUT -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance INV -> d
@@ -44860,7 +44740,8 @@
     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.z.b.a.b.a.g0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameterOrBuilder -> com.android.tools.r8.z.b.a.b.a.t0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.z.b.a.b.a.w0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.util.List type_ -> c
@@ -44916,11 +44797,11 @@
     1:1:boolean hasFirstNullable():12868:12868 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getDefaultInstance():12738:12738 -> g
     1:2:void initFields():12883:12884 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.z.b.a.b.a.e0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.z.b.a.b.a.u0:
     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.z.b.a.b.a.f0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.z.b.a.b.a.v0:
     java.util.List type_ -> c
     int firstNullable_ -> d
     int bitField0_ -> b
@@ -44959,7 +44840,8 @@
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13046:13058 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder create():13017:13017 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder access$11800():13003 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.z.b.a.b.a.j0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTableOrBuilder -> com.android.tools.r8.z.b.a.b.a.x0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.z.b.a.b.a.A0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter defaultInstance -> k
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -45040,11 +44922,11 @@
     1:1:boolean hasVarargElementTypeId():18270:18270 -> r
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter getDefaultInstance():18061:18061 -> s
     1:6:void initFields():18280:18285 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.z.b.a.b.a.h0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.z.b.a.b.a.y0:
     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.z.b.a.b.a.i0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.z.b.a.b.a.z0:
     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
@@ -45124,7 +45006,8 @@
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18501:18528 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder create():18464:18464 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder access$16700():18451 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.z.b.a.b.a.o0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameterOrBuilder -> com.android.tools.r8.z.b.a.b.a.B0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.z.b.a.b.a.G0:
     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
@@ -45187,11 +45070,11 @@
     1:1:boolean hasVersionKind():21311:21311 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement getDefaultInstance():20937:20937 -> q
     1:6:void initFields():21326:21331 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.z.b.a.b.a.k0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.z.b.a.b.a.C0:
     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.z.b.a.b.a.l0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.z.b.a.b.a.D0:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     int errorCode_ -> f
     int message_ -> g
@@ -45246,7 +45129,7 @@
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21523:21550 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder create():21486:21486 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder access$19800():21472 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.z.b.a.b.a.m0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.z.b.a.b.a.E0:
     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
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level WARNING -> b
@@ -45257,7 +45140,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.z.b.a.b.a.n0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.z.b.a.b.a.F0:
     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
@@ -45268,7 +45151,8 @@
     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.z.b.a.b.a.r0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementOrBuilder -> com.android.tools.r8.z.b.a.b.a.H0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.z.b.a.b.a.K0:
     java.util.List requirement_ -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -45310,11 +45194,11 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite$Builder toBuilder():21944 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable getDefaultInstance():21957:21957 -> e
     1:1:void initFields():22071:22071 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.z.b.a.b.a.p0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.z.b.a.b.a.I0:
     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.z.b.a.b.a.q0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.z.b.a.b.a.J0:
     java.util.List requirement_ -> c
     int bitField0_ -> b
     1:85:void <init>():22184:22268 -> <init>
@@ -45345,7 +45229,8 @@
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():22218:22224 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder create():22191:22191 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$20900():22177 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.z.b.a.b.a.s0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTableOrBuilder -> com.android.tools.r8.z.b.a.b.a.L0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.z.b.a.b.a.M0.a:
     java.util.List rest -> d
     int[] numbers -> e
     int minor -> b
@@ -45362,7 +45247,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.jvm.JvmProtoBuf -> com.android.tools.r8.z.b.a.b.a.t0.r:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.z.b.a.b.a.N0.w:
     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
@@ -45377,8 +45262,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.z.b.a.b.a.t0.a:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.z.b.a.b.a.t0.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.z.b.a.b.a.N0.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.z.b.a.b.a.N0.d:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     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 -> f
@@ -45428,11 +45313,11 @@
     1:1:boolean hasName():2691:2691 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature getDefaultInstance():2607:2607 -> i
     1:2:void initFields():2724:2725 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.z.b.a.b.a.t0.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.z.b.a.b.a.N0.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.z.b.a.b.a.t0.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.z.b.a.b.a.N0.c:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -45467,7 +45352,8 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2881:2892 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder create():2852:2852 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder access$2500():2838 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.z.b.a.b.a.t0.g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignatureOrBuilder -> com.android.tools.r8.z.b.a.b.a.N0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.z.b.a.b.a.N0.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature defaultInstance -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
@@ -45517,11 +45403,11 @@
     1:1:boolean hasName():2229:2229 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getDefaultInstance():2145:2145 -> i
     1:2:void initFields():2262:2263 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.z.b.a.b.a.t0.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.z.b.a.b.a.N0.f:
     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.z.b.a.b.a.t0.f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.z.b.a.b.a.N0.g:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -45556,7 +45442,8 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2419:2430 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder create():2390:2390 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder access$1800():2376 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.z.b.a.b.a.t0.j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignatureOrBuilder -> com.android.tools.r8.z.b.a.b.a.N0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.z.b.a.b.a.N0.l:
     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$JvmPropertySignature defaultInstance -> h
@@ -45613,11 +45500,11 @@
     1:1:boolean hasSyntheticMethod():3232:3232 -> l
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature getDefaultInstance():3087:3087 -> m
     1:4:void initFields():3276:3279 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.z.b.a.b.a.t0.h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.z.b.a.b.a.N0.j:
     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.z.b.a.b.a.t0.i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.z.b.a.b.a.N0.k:
     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
@@ -45696,7 +45583,8 @@
     1:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3453:3472 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder create():3420:3420 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder access$3200():3406 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.z.b.a.b.a.t0.q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignatureOrBuilder -> com.android.tools.r8.z.b.a.b.a.N0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.z.b.a.b.a.N0.u:
     java.util.List record_ -> 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
@@ -45742,11 +45630,11 @@
     1:1:java.util.List getRecordList():1568:1568 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getDefaultInstance():83:83 -> g
     1:2:void initFields():1633:1634 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.z.b.a.b.a.t0.k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.z.b.a.b.a.N0.n:
     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.z.b.a.b.a.t0.l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.z.b.a.b.a.N0.o:
     java.util.List localName_ -> d
     java.util.List record_ -> c
     int bitField0_ -> b
@@ -45781,7 +45669,7 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1804:1815 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder create():1775:1775 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder access$1200():1761 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.z.b.a.b.a.t0.p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.z.b.a.b.a.N0.s:
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     java.lang.Object string_ -> e
@@ -45844,11 +45732,11 @@
     1:1:boolean hasString():626:626 -> k
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record getDefaultInstance():341:341 -> l
     1:6:void initFields():773:778 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.z.b.a.b.a.t0.m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.z.b.a.b.a.N0.p:
     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.z.b.a.b.a.t0.n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.z.b.a.b.a.N0.q:
     java.lang.Object string_ -> e
     int predefinedIndex_ -> d
     java.util.List replaceChar_ -> h
@@ -45898,7 +45786,7 @@
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record buildPartial():998:1027 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder create():961:961 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder access$200():947 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.z.b.a.b.a.t0.o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.z.b.a.b.a.N0.r:
     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 DESC_TO_CLASS_ID -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation INTERNAL_TO_CLASS_ID -> c
@@ -45909,9 +45797,12 @@
     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.z.b.a.b.a.t0.s.a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$RecordOrBuilder -> com.android.tools.r8.z.b.a.b.a.N0.t:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypesOrBuilder -> com.android.tools.r8.z.b.a.b.a.N0.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.z.b.a.b.a.N0.x.a:
     boolean $assertionsDisabled -> a
     1:13:void <clinit>():15:27 -> <clinit>
+    void $$$reportNull$$$0(int) -> a
     1:4:byte[] decodeBytes(java.lang.String[]):179:182 -> a
     5:82:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.UtfEncodingKt.stringsToBytes(java.lang.String[]):0:77 -> a
     5:82:byte[] decodeBytes(java.lang.String[]):182 -> a
@@ -45924,12 +45815,14 @@
     105:105:byte[] decodeBytes(java.lang.String[]):191 -> a
     106:122:byte[] decode7to8(byte[]):247:263 -> a
     106:122:byte[] decodeBytes(java.lang.String[]):192 -> a
+    123:123:byte[] combineStringArrayIntoBytes(java.lang.String[]):0:0 -> a
+    123:123:byte[] decodeBytes(java.lang.String[]):189 -> a
     1:2:java.lang.String[] dropMarker(java.lang.String[]):199:200 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.z.b.a.b.a.t0.s.b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.z.b.a.b.a.N0.x.b:
     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.JvmMetadataVersion -> com.android.tools.r8.z.b.a.b.a.t0.s.c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.z.b.a.b.a.N0.x.c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> g
     boolean isStrictSemantics -> f
     1:1:void <clinit>():30:30 -> <clinit>
@@ -45940,7 +45833,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.z.b.a.b.a.t0.s.d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.z.b.a.b.a.N0.x.d:
     java.util.List PREDEFINED_STRINGS -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes types -> a
     1:31:void <clinit>():78:108 -> <clinit>
@@ -45970,7 +45863,7 @@
     110:113:void <clinit>():117:120 -> <clinit>
     114:114:void <clinit>():111:111 -> <clinit>
     1:16:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes,java.lang.String[]):13:28 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.z.b.a.b.a.t0.s.e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.z.b.a.b.a.N0.x.e:
     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>
@@ -46444,7 +46337,7 @@
     3:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet clone():135:145 -> clone
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet newFieldSet():92:92 -> d
 com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.z.b.a.b.b.q:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.z.b.a.b.b.x:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.z.b.a.b.b.y:
     1:1:void <init>():53:53 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):56:56 -> <init>
     1:1:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):73:73 -> a
@@ -46560,7 +46453,8 @@
     2:2:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):246:246 -> a
     1:1:boolean extensionsAreInitialized():233:233 -> e
     1:1:void makeExtensionsImmutable():261:261 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.z.b.a.b.b.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessageOrBuilder -> com.android.tools.r8.z.b.a.b.b.v:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.z.b.a.b.b.w:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap enumTypeMap -> a
     int number -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType type -> c
@@ -46570,25 +46464,24 @@
     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.z.b.a.b.b.w:
-    java.lang.Object defaultValue -> b
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite messageDefaultInstance -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.z.b.a.b.b.x:
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite containingTypeDefaultInstance -> a
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite messageDefaultInstance -> b
     1:22:void <init>(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.GeneratedMessageLite$ExtensionDescriptor,java.lang.Class):786:807 -> <init>
     23:23:void <init>(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.GeneratedMessageLite$ExtensionDescriptor,java.lang.Class):790:790 -> <init>
     1:1:java.lang.Object singularToFieldSetType(java.lang.Object):885:885 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> a
     2:2:java.lang.Object singularToFieldSetType(java.lang.Object):885 -> a
     3:4:java.lang.Object singularToFieldSetType(java.lang.Object):885:886 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.z.b.a.b.b.A:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.z.b.a.b.b.B:
     byte[] EMPTY_BYTE_ARRAY -> a
     1:6:void <clinit>():383:388 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.z.b.a.b.b.y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.z.b.a.b.b.z:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.z.b.a.b.b.z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.z.b.a.b.b.A:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite findValueByNumber(int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.z.b.a.b.b.B:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.z.b.a.b.b.C:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite unfinishedMessage -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
     2:2:void <init>(java.lang.String):43:43 -> <init>
@@ -46597,7 +46490,7 @@
     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.LiteralByteString -> com.android.tools.r8.z.b.a.b.b.E:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.z.b.a.b.b.F:
     int hash -> d
     byte[] bytes -> c
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -46619,8 +46512,8 @@
     1:1:java.util.Iterator iterator():52:52 -> iterator
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator iterator():307:307 -> iterator
     1:1:int size():76:76 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.z.b.a.b.b.C:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.z.b.a.b.b.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.z.b.a.b.b.D:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.z.b.a.b.b.E:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> c
     int limit -> b
     int position -> a
@@ -46631,12 +46524,12 @@
     1:1:java.lang.Object next():310 -> next
     1:3:byte nextByte():330:332 -> nextByte
     1:1:void remove():337:337 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.z.b.a.b.b.F:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.z.b.a.b.b.G:
     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.z.b.a.b.b.G:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.z.b.a.b.b.H:
     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.z.b.a.b.b.L:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.z.b.a.b.b.M:
     int[] minLengthByDepth -> i
     int hash -> h
     int leftLength -> f
@@ -46669,8 +46562,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.z.b.a.b.b.H:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.z.b.a.b.b.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.z.b.a.b.b.I:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.z.b.a.b.b.J:
     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>
@@ -46692,7 +46585,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.z.b.a.b.b.J:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.z.b.a.b.b.K:
     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>
@@ -46713,7 +46606,7 @@
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():765:765 -> next
     15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> next
     1:1:void remove():770:770 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.z.b.a.b.b.K:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.z.b.a.b.b.L:
     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
@@ -46724,7 +46617,7 @@
     1:1:java.lang.Object next():782 -> next
     1:5:byte nextByte():803:807 -> nextByte
     1:1:void remove():811:811 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.z.b.a.b.b.Q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.z.b.a.b.b.S:
     java.util.List entryList -> b
     java.util.Map overflowEntries -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet lazyEntrySet -> e
@@ -46759,7 +46652,7 @@
     1:5:java.util.SortedMap getOverflowEntriesMutable():377:381 -> 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.z.b.a.b.b.M:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.z.b.a.b.b.N:
     1:1:void <init>(int):100:100 -> <init>
     1:5:void makeImmutable():104:108 -> l
     6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> l
@@ -46769,20 +46662,20 @@
     14:14:void makeImmutable():115 -> l
     15:20:void makeImmutable():116:121 -> l
     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.z.b.a.b.b.P:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.z.b.a.b.b.Q:
     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.z.b.a.b.b.N:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.z.b.a.b.b.O:
     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.z.b.a.b.b.O:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.z.b.a.b.b.P:
     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.z.b.a.b.b.Q$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.z.b.a.b.b.S$a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Comparable key -> a
@@ -46806,7 +46699,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.z.b.a.b.b.Q$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.z.b.a.b.b.S$b:
     java.util.Iterator lazyOverflowIterator -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     boolean nextCalledBeforeRemove -> b
@@ -46819,7 +46712,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.z.b.a.b.b.Q$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.z.b.a.b.b.S$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>
@@ -46831,9 +46724,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.z.b.a.b.b.S:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.z.b.a.b.b.T:
     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.z.b.a.b.b.T:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.z.b.a.b.b.U:
     1:6:int incompleteStateFor(byte[],int,int):341:346 -> a
     7:7:int incompleteStateFor(byte[],int,int):344:344 -> a
     1:1:int partialIsValidUtf8(byte[],int,int):252:252 -> b
@@ -46841,10 +46734,10 @@
     2:38:int partialIsValidUtf8NonAscii(byte[],int,int):270:306 -> b
     2:38:int partialIsValidUtf8(byte[],int,int):256 -> b
     2:38:boolean isValidUtf8(byte[],int,int):122 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.z.b.a.b.b.b0:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.z.b.a.b.b.c0:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.z.b.a.b.b.U:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.z.b.a.b.b.Z:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.z.b.a.b.b.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.z.b.a.b.b.a0:
     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
@@ -46873,33 +46766,32 @@
     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.z.b.a.b.b.V:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.z.b.a.b.b.W:
     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.z.b.a.b.b.W:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.z.b.a.b.b.X:
     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.z.b.a.b.b.X:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.z.b.a.b.b.Y:
     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.z.b.a.b.b.Y:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.z.b.a.b.b.Z:
     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.z.b.a.b.b.a0:
-    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
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType[] $VALUES -> k
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType DOUBLE -> e
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType MESSAGE -> j
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BYTE_STRING -> h
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType ENUM -> i
-    java.lang.Object defaultDefault -> a
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType INT -> b
-    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType LONG -> c
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.z.b.a.b.b.b0:
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType STRING -> f
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BYTE_STRING -> g
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType DOUBLE -> d
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BOOLEAN -> e
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType[] $VALUES -> j
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType ENUM -> h
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType MESSAGE -> i
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType LONG -> b
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType FLOAT -> c
+    com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType INT -> a
     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>
+    1:1:void <init>(java.lang.String,int,java.lang.Object):88:88 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.z.b.a.c.a:
     int[] metadataVersion -> b
     java.lang.String[] data2 -> d
@@ -46920,6 +46812,7 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader getHeader():25:25 -> a
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.z.b.a.c.c:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):29:30 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.z.b.a.c.b:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -46936,6 +46829,7 @@
     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.z.b.a.c.f:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):84:85 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.z.b.a.c.e:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -46951,6 +46845,7 @@
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.z.b.a.c.g:
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):217:221 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.z.b.a.c.i:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):260:261 -> <init>
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.z.b.a.c.h:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
@@ -46964,6 +46859,7 @@
     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.z.b.a.c.k:
+    com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):140:141 -> <init>
     1:1:boolean isLambda():159:159 -> b
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.z.b.a.c.j:
@@ -47010,23 +46906,25 @@
     1:1:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106:106 -> a
     2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withValuesConvertedBy(com.android.tools.r8.joptsimple.ValueConverter):126:126 -> a
     2:2:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106 -> a
-    3:3:void addDefaultValue(java.lang.Object):248:248 -> a
-    3:3:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
-    4:4:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):224:224 -> a
-    4:4:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
-    5:5:void addDefaultValue(java.lang.Object):248:248 -> a
-    5:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):225 -> a
+    3:3:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec withValuesConvertedBy(com.android.tools.r8.joptsimple.ValueConverter):124:124 -> a
+    3:3:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec ofType(java.lang.Class):106 -> a
+    4:4:void addDefaultValue(java.lang.Object):248:248 -> a
+    4:4:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
+    5:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):224:224 -> a
     5:5:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
-    6:6:void com.android.tools.r8.joptsimple.internal.Objects.ensureNotNull(java.lang.Object):44:44 -> a
-    6:6:void addDefaultValue(java.lang.Object):247 -> a
+    6:6:void addDefaultValue(java.lang.Object):248:248 -> a
     6:6:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):225 -> a
     6:6:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
     7:7:void com.android.tools.r8.joptsimple.internal.Objects.ensureNotNull(java.lang.Object):44:44 -> a
     7:7:void addDefaultValue(java.lang.Object):247 -> a
-    7:7:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
-    8:11:void handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):255:258 -> a
-    12:17:void addArguments(com.android.tools.r8.joptsimple.OptionSet,java.lang.String):262:267 -> a
-    18:18:java.lang.Object convert(java.lang.String):276:276 -> a
+    7:7:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object[]):225 -> a
+    7:7:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):211 -> a
+    8:8:void com.android.tools.r8.joptsimple.internal.Objects.ensureNotNull(java.lang.Object):44:44 -> a
+    8:8:void addDefaultValue(java.lang.Object):247 -> a
+    8:8:com.android.tools.r8.joptsimple.ArgumentAcceptingOptionSpec defaultsTo(java.lang.Object,java.lang.Object[]):210 -> a
+    9:12:void handleOption(com.android.tools.r8.joptsimple.OptionParser,com.android.tools.r8.joptsimple.ArgumentList,com.android.tools.r8.joptsimple.OptionSet,java.lang.String):255:258 -> a
+    13:18:void addArguments(com.android.tools.r8.joptsimple.OptionSet,java.lang.String):262:267 -> a
+    19:19:java.lang.Object convert(java.lang.String):276:276 -> a
     1:1:java.lang.String argumentDescription():305:305 -> argumentDescription
     1:1:java.lang.String description():58:58 -> b
     2:6:boolean canConvertArgument(java.lang.String):280:284 -> b
@@ -48197,64 +48095,62 @@
     224:227:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):209:212 -> a
     228:229:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):337:338 -> a
     228:229:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    230:231:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):169:170 -> a
+    230:231:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):147:148 -> a
     230:231:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):338 -> a
     230:231:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    232:238:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):339:345 -> a
-    232:238:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    239:248:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):344:353 -> a
-    239:248:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    249:249:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):352:352 -> a
-    249:249:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    250:275:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:242 -> a
-    276:276:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
-    276:276:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
-    277:357:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:325 -> a
-    358:364:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
-    365:365:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):66:66 -> a
-    365:365:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
-    366:369:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:331 -> a
-    370:370:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
-    371:377:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):362:368 -> a
-    378:378:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    378:378:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):368 -> a
-    379:400:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):370:391 -> a
+    232:245:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):339:352 -> a
+    232:245:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    246:246:int getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):351:351 -> a
+    246:246:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
+    247:272:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:242 -> a
+    273:273:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):282:282 -> a
+    273:273:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
+    274:354:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:325 -> a
+    355:361:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):324:330 -> a
+    362:362: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
+    362:362:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):329 -> a
+    363:366:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:331 -> a
+    367:367:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):326:326 -> a
+    368:374:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):361:367 -> a
+    375:375:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    375:375:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):367 -> a
+    376:397:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):369:390 -> a
 com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.naming.o:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
     boolean lambda$evaluateTypeArrayContentFromConstructionToUse$0(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:89:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):67:155 -> a
-    90:96:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):108:114 -> a
-    97:98:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):169:170 -> a
-    99:101:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexItemFactory):174:176 -> a
-    102:105:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):180:183 -> a
-    106:123:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):198:215 -> a
-    124:133:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):307:316 -> a
-    124:133:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):214 -> a
-    134:173:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):221:260 -> a
-    174:212:com.android.tools.r8.graph.DexTypeList retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):519:557 -> a
-    174:212:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):260 -> a
-    213:219: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):556:562 -> a
-    213:219:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):260 -> a
-    220:220:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):264:264 -> a
-    221:224:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):385:388 -> a
-    221:224:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):264 -> a
-    225:227:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):266:268 -> a
-    228:231:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):274:277 -> a
-    232:264:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):324:356 -> a
-    232:264:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
-    265:267:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):374:376 -> a
-    265:267:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):358 -> a
-    265:267:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):288 -> a
-    268:268:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):291:291 -> a
-    269:272:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):364:367 -> a
-    273:316:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):417:460 -> a
-    317:325:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):396:404 -> a
-    317:325:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):460 -> a
-    326:326:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):403:403 -> a
-    326:326:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):460 -> a
-    327:342:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):465:480 -> a
-    1:3:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):298:300 -> b
+    1:79:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):55:133 -> a
+    80:86:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):86:92 -> a
+    87:88:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):147:148 -> a
+    89:91:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexItemFactory):152:154 -> a
+    92:95:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):158:161 -> a
+    96:111:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):176:191 -> a
+    112:121:com.android.tools.r8.graph.DexType inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):283:292 -> a
+    112:121:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
+    122:161:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):197:236 -> a
+    162:200: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):495:533 -> a
+    162:200:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):236 -> a
+    201:207: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):532:538 -> a
+    201:207:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):236 -> a
+    208:208:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):240:240 -> a
+    209:212:com.android.tools.r8.graph.DexReference inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):361:364 -> a
+    209:212:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):240 -> a
+    213:215:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):242:244 -> a
+    216:219:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):250:253 -> a
+    220:252:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):300:332 -> a
+    220:252:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    253:255:com.android.tools.r8.graph.DexReference inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):350:352 -> a
+    253:255:com.android.tools.r8.graph.DexReference inferMemberFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):334 -> a
+    253:255:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):264 -> a
+    256:256:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):267:267 -> a
+    257:260:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):340:343 -> a
+    261:304:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):393:436 -> a
+    305:313:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):372:380 -> a
+    305:313:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):436 -> a
+    314:314:com.android.tools.r8.graph.DexType getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):379:379 -> a
+    314:314:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):436 -> a
+    315:330:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):441:456 -> a
+    1:3:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):274:276 -> b
 com.android.tools.r8.naming.InterfaceMethodNameMinifier -> com.android.tools.r8.naming.r:
     com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> d
     com.android.tools.r8.graph.AppView appView -> a
@@ -48811,7 +48707,7 @@
     30:31:java.lang.String lookupPackageName(java.lang.String):125 -> a
     32:32:java.lang.String lookupPackageName(java.lang.String):126:126 -> a
     33:33:void forAllRenamedTypes(java.util.function.Consumer):142:142 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():314:314 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():311:311 -> a
     34:34:void forAllRenamedTypes(java.util.function.Consumer):142 -> a
     35:37:void forAllRenamedTypes(java.util.function.Consumer):143:145 -> a
     38:51:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):152:165 -> a
@@ -48841,121 +48737,110 @@
     java.util.Map additionalFieldNamings -> k
     java.util.Map memberNames -> g
     java.util.Map syntheticCompanionClasses -> h
-    1:1:void <clinit>():63:63 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):82:82 -> <init>
-    2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):69:86 -> <init>
-    1:1:int lambda$new$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):71:71 -> a
-    2:31:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):91:120 -> a
-    32:40:void computeDefaultInterfaceMethodMethods():319:327 -> a
-    32:40:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
+    1:1:void <clinit>():62:62 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):81:81 -> <init>
+    2:19:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper,java.util.Set):68:85 -> <init>
+    1:1:int lambda$new$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):70:70 -> a
+    2:31:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):90:119 -> a
+    32:40:void computeDefaultInterfaceMethodMethods():318:326 -> a
+    32:40:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     41:41:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    41:41:void computeDefaultInterfaceMethodMethods():327 -> a
-    41:41:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    42:42:void computeDefaultInterfaceMethodMethods():329:329 -> a
-    42:42:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    43:47:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):345:349 -> a
-    43:47:void computeDefaultInterfaceMethodMethods():329 -> a
-    43:47:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
+    41:41:void computeDefaultInterfaceMethodMethods():326 -> a
+    41:41:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    42:42:void computeDefaultInterfaceMethodMethods():328:328 -> a
+    42:42:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    43:47:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):344:348 -> a
+    43:47:void computeDefaultInterfaceMethodMethods():328 -> a
+    43:47:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
     48:48:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    48:48:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):349 -> a
-    48:48:void computeDefaultInterfaceMethodMethods():329 -> a
-    48:48:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    49:64:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):350:365 -> a
-    49:64:void computeDefaultInterfaceMethodMethods():329 -> a
-    49:64:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    65:69:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:368 -> a
-    65:69:void computeDefaultInterfaceMethodMethods():329 -> a
-    65:69:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    70:70:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):367:367 -> a
-    70:70:void computeDefaultInterfaceMethodMethods():329 -> a
-    70:70:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121 -> a
-    71:113:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):122:164 -> a
-    114:114:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):112:112 -> a
+    48:48:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):348 -> a
+    48:48:void computeDefaultInterfaceMethodMethods():328 -> a
+    48:48:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    49:64:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):349:364 -> a
+    49:64:void computeDefaultInterfaceMethodMethods():328 -> a
+    49:64:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    65:69:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):363:367 -> a
+    65:69:void computeDefaultInterfaceMethodMethods():328 -> a
+    65:69:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    70:70:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):366:366 -> a
+    70:70:void computeDefaultInterfaceMethodMethods():328 -> a
+    70:70:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):120 -> a
+    71:113:com.android.tools.r8.naming.NamingLens run(com.android.tools.r8.utils.Timing):121:163 -> a
+    114:114:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):111:111 -> a
     115:115:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    115:115:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):112 -> a
-    116:117:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):113:114 -> a
-    118:119:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):170:171 -> a
+    115:115:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):111 -> a
+    116:117:void lambda$run$2(java.util.ArrayDeque,com.android.tools.r8.graph.DexType):112:113 -> a
+    118:119:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):169:170 -> a
     120:120:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    120:120:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):171 -> a
-    121:140:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):174:193 -> a
-    141:156:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):190:205 -> a
-    157:160:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):204:207 -> a
+    120:120:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):170 -> a
+    121:140:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):173:192 -> a
+    141:156:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):189:204 -> a
+    157:160:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):203:206 -> a
     161:161:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> a
-    161:161:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):207 -> a
-    162:167:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):208:213 -> a
-    168:181:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):208:221 -> a
-    182:195:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):220:233 -> a
+    161:161:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):206 -> a
+    162:167:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):207:212 -> a
+    168:181:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):207:220 -> a
+    182:195:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):219:232 -> a
     196:196:boolean com.android.tools.r8.graph.DexClass.isAbstract():589:589 -> a
-    196:196:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):233 -> a
-    197:210:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):234:247 -> a
-    211:211:void lambda$computeMapping$4(java.util.Deque,com.android.tools.r8.graph.DexType):242:242 -> a
-    212:219:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):253:260 -> a
+    196:196:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):232 -> a
+    197:210:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque):233:246 -> a
+    211:211:void lambda$computeMapping$4(java.util.Deque,com.android.tools.r8.graph.DexType):241:241 -> a
+    212:219:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):252:259 -> a
     220:220:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    220:220:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):260 -> a
-    221:221:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):262:262 -> a
-    222:222:void lambda$addNonPrivateInterfaceMappings$6(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):259:259 -> a
-    223:228:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):272:277 -> a
-    229:231:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):276:278 -> a
+    220:220:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):259 -> a
+    221:221:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):261:261 -> a
+    222:222:void lambda$addNonPrivateInterfaceMappings$6(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):258:258 -> a
+    223:228:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):271:276 -> a
+    229:231:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):275:277 -> a
     232:232:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> a
-    232:232:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):278 -> a
-    233:239:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):279:285 -> a
-    240:242:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):284:286 -> a
+    232:232:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):277 -> a
+    233:239:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):278:284 -> a
+    240:242:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):283:285 -> a
     243:243:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):158:158 -> a
-    243:243:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):286 -> a
-    244:245:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):287:288 -> a
-    246:247:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):295:296 -> a
-    248:253:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):295:300 -> a
-    254:261:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):305:312 -> a
-    262:262:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):311:311 -> a
-    263:267:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):310:314 -> a
-    1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):94:94 -> b
-    2:2:void lambda$computeMapping$3(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):186:186 -> b
-    3:3:void lambda$computeMapping$5(java.util.Deque,com.android.tools.r8.graph.DexType):247:247 -> b
+    243:243:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):285 -> a
+    244:245:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):286:287 -> a
+    246:247:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):294:295 -> a
+    248:253:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):294:299 -> a
+    254:261:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):304:311 -> a
+    262:262:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):310:310 -> a
+    263:267:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):309:313 -> a
+    1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):93:93 -> b
+    2:2:void lambda$computeMapping$3(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):185:185 -> b
+    3:3:void lambda$computeMapping$5(java.util.Deque,com.android.tools.r8.graph.DexType):246:246 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.naming.L:
     boolean $assertionsDisabled -> h
     java.util.Map mappings -> g
-    1:1:void <clinit>():373:373 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):378:379 -> <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):388:390 -> a
-    4:4:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):420:420 -> a
-    1:1:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):398:398 -> b
+    1:1:void <clinit>():372:372 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):377:378 -> <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):387:389 -> a
+    4:4:boolean isRenamedByApplyMapping(com.android.tools.r8.graph.DexType):419:419 -> a
+    1:1:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):397:397 -> b
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
-    2:2:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):398 -> b
-    3:18:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):400:415 -> b
+    2:2:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):397 -> b
+    3:18:com.android.tools.r8.graph.DexString reservedDescriptor(com.android.tools.r8.graph.DexType):399:414 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingMemberNamingStrategy -> com.android.tools.r8.naming.M:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexItemFactory factory -> i
     java.util.Map mappedNames -> h
-    1:1:void <clinit>():424:424 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):432:435 -> <init>
+    1:1:void <clinit>():423:423 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):431:434 -> <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):443:443 -> a
-    2:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> 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):443 -> 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):444:454 -> a
-    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> 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):455 -> 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):455:455 -> 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):454:454 -> 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):464:464 -> a
-    18:18:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):158:158 -> 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):466 -> 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):466:466 -> 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):464:464 -> 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):482:484 -> a
-    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> 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):484 -> 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):485:489 -> a
-    30:36:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):538:544 -> 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):489 -> a
-    37:37:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):541:541 -> 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):489 -> 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):493:495 -> a
-    41:41:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):500:500 -> a
-    42:42:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):505:505 -> 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):509:527 -> 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):452:452 -> 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):471:471 -> 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):442:442 -> a
+    2:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):450:450 -> a
+    3:3:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):460:460 -> a
+    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
+    4:4:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):460 -> a
+    5:8:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):461:464 -> a
+    9:15:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):504:510 -> a
+    9:15:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):465 -> a
+    16:16:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):507:507 -> a
+    16:16:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):465 -> a
+    17:19:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexReference,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):469:471 -> a
+    20:20:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):476:476 -> a
+    21:21:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexClass):481:481 -> a
+    22:27:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):486:491 -> 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):442:442 -> 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):450:450 -> b
 com.android.tools.r8.naming.ProguardMapReader -> com.android.tools.r8.naming.P:
     java.io.BufferedReader reader -> a
     boolean $assertionsDisabled -> f
@@ -49093,7 +48978,6 @@
     1:6:boolean skipLine():130:135 -> j
     1:2:void skipWhitespace():144:145 -> k
 com.android.tools.r8.naming.ProguardMapReader$ParseException -> com.android.tools.r8.naming.O:
-    com.android.tools.r8.naming.ProguardMapReader this$0 -> e
     int lineOffset -> b
     boolean eol -> c
     int lineNo -> a
@@ -49476,7 +49360,7 @@
     60:60:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):139:139 -> a
     61:61:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:169 -> a
     61:61:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
-    62:62:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> a
+    62:62:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> a
     62:62:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169 -> a
     62:62:void computeMethodRebinding(java.util.Map,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):145 -> a
     63:66:boolean needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):169:172 -> a
@@ -51480,49 +51364,46 @@
     1:17:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):56:72 -> processMethods
     18:33:com.android.tools.r8.graph.DexEncodedMethod[] processMethods(java.util.List):62:77 -> processMethods
     1:2:void run():33:34 -> 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>
-    1:1:com.android.tools.r8.graph.DexAnnotationSet lambda$processMethod$0(com.android.tools.r8.graph.DexAnnotationSet):40:40 -> a
-    1:1:void processField(com.android.tools.r8.graph.DexEncodedField):44:44 -> processField
-    1:3:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):37:39 -> processMethod
-    1:1:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):48:48 -> rewriteAnnotation
-    1:3:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexAnnotationElement):59:61 -> rewriteAnnotationElement
-    1:3:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):52:54 -> rewriteEncodedAnnotation
-    1:12:com.android.tools.r8.graph.DexValue rewriteValue(com.android.tools.r8.graph.DexValue):67:78 -> rewriteValue
-    1:4:void run(java.lang.Iterable):29:32 -> run
 com.android.tools.r8.shaking.AnnotationRemover -> com.android.tools.r8.shaking.AnnotationRemover:
     1:1:void <clinit>():29:29 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Set):36:39 -> <init>
-    1:1:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):263:263 -> a
-    2:2:boolean lambda$rewriteAnnotationElement$1(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
-    3:14:boolean lambda$stripAttributes$2(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):331:342 -> a
-    1:7:void clearAnnotations(com.android.tools.r8.graph.AppView):357:363 -> clearAnnotations
-    1:43:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):181:223 -> computeClassesToRetainInnerClassAttributeFor
-    44:44:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):183:183 -> computeClassesToRetainInnerClassAttributeFor
-    1:3:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):287:289 -> enclosingMethodPinned
-    1:1:com.android.tools.r8.shaking.AnnotationRemover ensureValid():138:138 -> ensureValid
+    1:1:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):268:268 -> a
+    2:2:boolean lambda$rewriteAnnotationElement$1(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):286:286 -> a
+    3:14:boolean lambda$stripAttributes$2(boolean,com.android.tools.r8.graph.DexProgramClass,boolean,com.android.tools.r8.graph.InnerClassAttribute):335:346 -> a
+    1:7:void clearAnnotations(com.android.tools.r8.graph.AppView):361:367 -> clearAnnotations
+    1:43:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):186:228 -> computeClassesToRetainInnerClassAttributeFor
+    44:44:java.util.Set computeClassesToRetainInnerClassAttributeFor(com.android.tools.r8.graph.AppView):188:188 -> computeClassesToRetainInnerClassAttributeFor
+    1:3:boolean enclosingMethodPinned(com.android.tools.r8.graph.DexClass):291:293 -> enclosingMethodPinned
+    1:1:com.android.tools.r8.shaking.AnnotationRemover ensureValid():143:143 -> ensureValid
     1:1:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):47:47 -> filterAnnotations
     2:2:boolean filterAnnotations(com.android.tools.r8.graph.DexAnnotation):46:46 -> filterAnnotations
-    1:15:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):118:132 -> filterParameterAnnotations
-    16:28:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):122:134 -> filterParameterAnnotations
-    1:5:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):147:151 -> hasGenericEnclosingClass
-    1:2:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):293:294 -> hasInnerClassesFromSet
-    1:2:boolean hasSignatureAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):159:160 -> hasSignatureAnnotation
+    1:15:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):123:137 -> filterParameterAnnotations
+    16:28:boolean filterParameterAnnotations(com.android.tools.r8.graph.DexAnnotation):127:139 -> filterParameterAnnotations
+    1:5:boolean hasGenericEnclosingClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.Set):152:156 -> hasGenericEnclosingClass
+    1:2:boolean hasInnerClassesFromSet(com.android.tools.r8.graph.DexProgramClass,java.util.Set):297:298 -> hasInnerClassesFromSet
+    1:2:boolean hasSignatureAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):164:165 -> hasSignatureAnnotation
     1:2:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):110:111 -> isAnnotationTypeLive
-    1:1:void processField(com.android.tools.r8.graph.DexEncodedField):245:245 -> processField
-    1:3:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):239:241 -> processMethod
-    1:5:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):250:254 -> rewriteAnnotation
-    1:1:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):273:273 -> rewriteAnnotationElement
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> isAnnotationTypeLive
+    3:3:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):111 -> isAnnotationTypeLive
+    4:7:boolean isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation):113:116 -> isAnnotationTypeLive
+    1:1:void processField(com.android.tools.r8.graph.DexEncodedField):250:250 -> processField
+    1:3:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):244:246 -> processMethod
+    1:5:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):255:259 -> rewriteAnnotation
+    6:13:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.rewrite(java.util.function.Function):403:410 -> rewriteAnnotation
+    6:13:com.android.tools.r8.graph.DexAnnotation rewriteAnnotation(com.android.tools.r8.graph.DexAnnotation):259 -> rewriteAnnotation
+    1:1:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):278:278 -> rewriteAnnotationElement
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> rewriteAnnotationElement
-    2:2:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):273 -> rewriteAnnotationElement
-    3:6:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):279:282 -> rewriteAnnotationElement
-    1:8:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):258:265 -> rewriteEncodedAnnotation
-    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> rewriteEncodedAnnotation
-    9:9:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):265 -> rewriteEncodedAnnotation
-    10:11:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):266:267 -> rewriteEncodedAnnotation
-    12:12:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):266:266 -> rewriteEncodedAnnotation
-    1:5:void run():230:234 -> run
+    2:2:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):278 -> rewriteAnnotationElement
+    3:6:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):283:286 -> rewriteAnnotationElement
+    1:4:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):263:266 -> rewriteEncodedAnnotation
+    5:11:com.android.tools.r8.graph.DexEncodedAnnotation com.android.tools.r8.graph.DexEncodedAnnotation.rewrite(java.util.function.Function,java.util.function.Function):81:87 -> rewriteEncodedAnnotation
+    5:11:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):267 -> rewriteEncodedAnnotation
+    12:13:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):269:270 -> rewriteEncodedAnnotation
+    14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> rewriteEncodedAnnotation
+    14:14:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):270 -> rewriteEncodedAnnotation
+    15:16:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):271:272 -> rewriteEncodedAnnotation
+    17:17:com.android.tools.r8.graph.DexEncodedAnnotation rewriteEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):271:271 -> rewriteEncodedAnnotation
+    1:5:void run():235:239 -> run
     1:9:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):56:64 -> shouldKeepAnnotation
     10:10:boolean com.android.tools.r8.graph.DexAnnotation.isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):137:137 -> shouldKeepAnnotation
     10:10:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):64 -> shouldKeepAnnotation
@@ -51548,89 +51429,88 @@
     30:30:boolean com.android.tools.r8.graph.DexAnnotation.isSynthesizedClassMapAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):399:399 -> shouldKeepAnnotation
     30:30:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):95 -> shouldKeepAnnotation
     31:31:boolean shouldKeepAnnotation(com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions):99:99 -> shouldKeepAnnotation
-    1:45:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):308:352 -> stripAttributes
-    46:55:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):320:329 -> stripAttributes
+    1:45:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):312:356 -> stripAttributes
+    46:55:void stripAttributes(com.android.tools.r8.graph.DexProgramClass):324:333 -> stripAttributes
 com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.AppInfoWithLiveness:
     1:1:void <clinit>():57:57 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):230:230 -> <init>
-    2:198:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):74:270 -> <init>
-    199:199:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):313:313 -> <init>
-    200:479:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):74:353 -> <init>
-    480:480:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):357:357 -> <init>
-    481:520:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):365:404 -> <init>
-    521:566:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):365:410 -> <init>
-    567:567:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):415:415 -> <init>
-    568:961:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):74:467 -> <init>
-    962:980:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):463:481 -> <init>
-    981:996:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):477:492 -> <init>
-    997:1004:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):488:495 -> <init>
-    1005:1005:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):502:502 -> <init>
-    1006:1475:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):74:543 -> <init>
-    1:6:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):622:627 -> a
-    7:7:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):787:787 -> a
-    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1226:1228 -> addEnumValueInfoMaps
-    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1219:1221 -> addSwitchMaps
-    1:12:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):660:671 -> assertNoItemRemoved
-    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):567:599 -> computeReachableInterfaces
-    1:3:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):639:641 -> filter
-    4:4:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):639:639 -> filter
-    1:40:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1055:1094 -> findSingleTargetFromSubtypes
-    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):645:646 -> getEnumValueInfoMapFor
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():656:656 -> getFieldAccessInfoCollection
-    1:2:java.lang.Iterable getPinnedItems():846:847 -> getPinnedItems
-    1:2:java.util.Set getPrunedTypes():878:879 -> getPrunedTypes
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):650:651 -> getSwitchMapFor
-    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):796:797 -> hasAnyInstantiatedLambdas
-    1:1:boolean hasLiveness():802:802 -> hasLiveness
-    1:10:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1110:1119 -> interfacesMayHaveDefaultFor
-    1:11:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):710:720 -> isFieldRead
-    1:2:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):724:725 -> isFieldWritten
-    1:12:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):729:740 -> isFieldWrittenByFieldPutInstruction
-    1:3:boolean isInstanceFieldWrittenOnlyInEnclosingInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):748:750 -> isInstanceFieldWrittenOnlyInEnclosingInstanceInitializers
-    1:6:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):677:682 -> isInstantiatedDirectly
-    1:3:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):704:706 -> isInstantiatedDirectlyOrIndirectly
-    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):686:700 -> isInstantiatedIndirectly
-    1:4:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):924:927 -> isInvalidSingleVirtualTarget
-    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):765:766 -> isLibraryOrClasspathField
-    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):547:547 -> isLiveProgramClass
-    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):551:552 -> isLiveProgramType
-    1:1:boolean isLockCandidate(com.android.tools.r8.graph.DexType):611:611 -> isLockCandidate
-    1:20:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):819:838 -> isMethodPinnedDirectlyOrInAncestor
-    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):556:563 -> isNonProgramTypeOrLiveProgramType
-    1:2:boolean isPinned(com.android.tools.r8.graph.DexReference):813:814 -> isPinned
-    1:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):754:756 -> isStaticFieldWrittenOnlyInEnclosingStaticInitializer
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1127:1128 -> lookupSingleInterfaceTarget
-    3:24:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1136:1157 -> lookupSingleInterfaceTarget
-    25:57:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1156:1188 -> lookupSingleInterfaceTarget
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):227:227 -> <init>
+    2:194:void <init>(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:266 -> <init>
+    195:195:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):308:308 -> <init>
+    196:469:void <init>(com.android.tools.r8.graph.AppInfoWithSubtyping,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Set,java.util.Set,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.SortedMap,java.util.Set,java.util.SortedSet,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,java.util.Map,java.util.Set):74:347 -> <init>
+    470:470:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):351:351 -> <init>
+    471:510:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):359:398 -> <init>
+    511:555:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):359:403 -> <init>
+    556:556:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):408:408 -> <init>
+    557:943:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):74:460 -> <init>
+    944:962:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):456:474 -> <init>
+    963:978:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):470:485 -> <init>
+    979:985:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):481:487 -> <init>
+    986:986:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):494:494 -> <init>
+    987:1447:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,java.util.Map):74:534 -> <init>
+    1:6:void lambda$withoutStaticFieldsWrites$0(java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):600:605 -> a
+    7:7:java.util.Set lambda$rewriteKeysConservativelyWhileMergingValues$1(com.android.tools.r8.graph.PresortedComparable):765:765 -> a
+    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addEnumValueInfoMaps(java.util.Map):1204:1206 -> addEnumValueInfoMaps
+    1:3:com.android.tools.r8.shaking.AppInfoWithLiveness addSwitchMaps(java.util.Map):1197:1199 -> addSwitchMaps
+    1:12:boolean assertNoItemRemoved(java.util.Collection,java.util.Collection):638:649 -> assertNoItemRemoved
+    1:33:java.util.Collection computeReachableInterfaces(java.util.Set):555:587 -> computeReachableInterfaces
+    1:3:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:619 -> filter
+    4:4:java.util.SortedSet filter(java.util.Set,java.util.function.Predicate):617:617 -> filter
+    1:40:com.android.tools.r8.graph.DexEncodedMethod findSingleTargetFromSubtypes(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):1033:1072 -> findSingleTargetFromSubtypes
+    1:2:java.util.Map getEnumValueInfoMapFor(com.android.tools.r8.graph.DexType):623:624 -> getEnumValueInfoMapFor
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():634:634 -> getFieldAccessInfoCollection
+    1:2:java.lang.Iterable getPinnedItems():824:825 -> getPinnedItems
+    1:2:java.util.Set getPrunedTypes():856:857 -> getPrunedTypes
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMapFor(com.android.tools.r8.graph.DexField):628:629 -> getSwitchMapFor
+    1:2:boolean hasAnyInstantiatedLambdas(com.android.tools.r8.graph.DexType):774:775 -> hasAnyInstantiatedLambdas
+    1:1:boolean hasLiveness():780:780 -> hasLiveness
+    1:10:boolean interfacesMayHaveDefaultFor(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexMethod):1088:1097 -> interfacesMayHaveDefaultFor
+    1:11:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):688:698 -> isFieldRead
+    1:2:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):702:703 -> isFieldWritten
+    1:12:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):707:718 -> isFieldWrittenByFieldPutInstruction
+    1:3:boolean isInstanceFieldWrittenOnlyInEnclosingInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):726:728 -> isInstanceFieldWrittenOnlyInEnclosingInstanceInitializers
+    1:6:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexType):655:660 -> isInstantiatedDirectly
+    1:3:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):682:684 -> isInstantiatedDirectlyOrIndirectly
+    1:15:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexType):664:678 -> isInstantiatedIndirectly
+    1:4:boolean isInvalidSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):902:905 -> isInvalidSingleVirtualTarget
+    1:2:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):743:744 -> isLibraryOrClasspathField
+    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> isLiveProgramClass
+    1:2:boolean isLiveProgramType(com.android.tools.r8.graph.DexType):542:543 -> isLiveProgramType
+    1:20:boolean isMethodPinnedDirectlyOrInAncestor(com.android.tools.r8.graph.DexMethod):797:816 -> isMethodPinnedDirectlyOrInAncestor
+    1:5:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):547:551 -> isNonProgramTypeOrLiveProgramType
+    1:2:boolean isPinned(com.android.tools.r8.graph.DexReference):791:792 -> isPinned
+    1:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):732:734 -> isStaticFieldWrittenOnlyInEnclosingStaticInitializer
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1105:1106 -> lookupSingleInterfaceTarget
+    3:24:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1114:1135 -> lookupSingleInterfaceTarget
+    25:57:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1134:1166 -> lookupSingleInterfaceTarget
     58:58:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> lookupSingleInterfaceTarget
-    58:58:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1187 -> lookupSingleInterfaceTarget
-    59:85:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1189:1215 -> lookupSingleInterfaceTarget
-    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):884:899 -> 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):897:897 -> 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):895:895 -> 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):893:893 -> 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):891:891 -> lookupSingleTarget
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):932:933 -> lookupSingleVirtualTarget
-    3:21:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):941:959 -> lookupSingleVirtualTarget
-    22:77:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):958:1013 -> lookupSingleVirtualTarget
-    78:84:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1009:1015 -> lookupSingleVirtualTarget
-    85:94:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1008:1017 -> lookupSingleVirtualTarget
-    95:95:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):995:995 -> lookupSingleVirtualTarget
-    1:2:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):760:761 -> mayPropagateValueFor
-    1:8:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1022:1029 -> nestAccessLookup
-    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):858:859 -> prunedCopyFrom
-    1:6:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):771:776 -> rewriteItems
-    1:10:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):782:791 -> rewriteKeysConservativelyWhileMergingValues
-    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):864:865 -> rewrittenWithLense
-    1:9:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):907:915 -> validateSingleVirtualTarget
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):873:874 -> wasPruned
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():808:808 -> withLiveness
-    1:19:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):615:633 -> withoutStaticFieldsWrites
-    20:20:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):631:631 -> withoutStaticFieldsWrites
+    58:58:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1165 -> lookupSingleInterfaceTarget
+    59:85:com.android.tools.r8.graph.DexEncodedMethod lookupSingleInterfaceTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):1167:1193 -> lookupSingleInterfaceTarget
+    1:16:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):862:877 -> 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):875:875 -> 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):873:873 -> 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):871:871 -> 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):869:869 -> lookupSingleTarget
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):910:911 -> lookupSingleVirtualTarget
+    3:21:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):919:937 -> lookupSingleVirtualTarget
+    22:77:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):936:991 -> lookupSingleVirtualTarget
+    78:84:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):987:993 -> lookupSingleVirtualTarget
+    85:94:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):986:995 -> lookupSingleVirtualTarget
+    95:95:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeLatticeElement):973:973 -> lookupSingleVirtualTarget
+    1:2:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):738:739 -> mayPropagateValueFor
+    1:8:com.android.tools.r8.graph.DexEncodedMethod nestAccessLookup(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1000:1007 -> nestAccessLookup
+    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DexApplication,java.util.Collection,java.util.Collection):836:837 -> prunedCopyFrom
+    1:6:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteItems(java.util.Set,java.util.function.Function):749:754 -> rewriteItems
+    1:10:java.util.SortedMap rewriteKeysConservativelyWhileMergingValues(java.util.Map,java.util.function.Function):760:769 -> rewriteKeysConservativelyWhileMergingValues
+    1:2:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLense(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLense):842:843 -> rewrittenWithLense
+    1:9:com.android.tools.r8.graph.DexEncodedMethod validateSingleVirtualTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):885:893 -> validateSingleVirtualTarget
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):851:852 -> wasPruned
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():786:786 -> withLiveness
+    1:19:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):593:611 -> withoutStaticFieldsWrites
+    20:20:com.android.tools.r8.shaking.AppInfoWithLiveness withoutStaticFieldsWrites(java.util.Set):609:609 -> withoutStaticFieldsWrites
 com.android.tools.r8.shaking.AppInfoWithLiveness$1 -> com.android.tools.r8.shaking.AppInfoWithLiveness$1:
-    1:1:void <clinit>():889:889 -> <clinit>
+    1:1:void <clinit>():867:867 -> <clinit>
 com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo -> com.android.tools.r8.shaking.AppInfoWithLiveness$EnumValueInfo:
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):181:183 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):179:181 -> <init>
 com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.ClassInlineRule:
     1:15:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ClassInlineRule$Type):72:86 -> <init>
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Builder builder():90:90 -> builder
@@ -51701,49 +51581,49 @@
     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>():103:103 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):303:303 -> <init>
-    2:195:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):131:324 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):293:293 -> <init>
+    2:185:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):131:314 -> <init>
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> a
-    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1755 -> a
+    1:1:void lambda$markInstanceFieldAsLive$21(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1713 -> a
     boolean lambda$markVirtualMethodAsReachable$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
     void lambda$newSetWithoutReasonReporter$1(java.lang.Object,com.android.tools.r8.shaking.KeepReason) -> a
     2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> a
-    2:2:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1608 -> a
-    3:3:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1609:1609 -> a
+    2:2:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1579 -> a
+    3:3:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1580:1580 -> a
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    4:4:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1609 -> a
-    5:12:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1610:1617 -> a
-    13:13:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1614:1614 -> a
-    14:19:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):384:389 -> a
+    4:4:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1580 -> a
+    5:12:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1581:1588 -> a
+    13:13:void lambda$markResolutionAsLive$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1585:1585 -> a
+    14:19:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):374:379 -> a
     20:20:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):158:158 -> a
-    20:20:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):389 -> a
-    21:27:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):391:397 -> a
-    28:28:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):532:532 -> a
-    29:29:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1214:1214 -> a
-    30:30:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$10(com.android.tools.r8.graph.DexType):1226:1226 -> a
-    31:31:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1457:1457 -> a
+    20:20:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):379 -> a
+    21:27:void lambda$getNonPinnedWrittenFields$0(java.util.function.Predicate,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoImpl):381:387 -> a
+    28:28:java.util.Set lambda$registerMethodWithTargetAndContext$3(com.android.tools.r8.graph.DexMethod):511:511 -> a
+    29:29:boolean lambda$markTypeAsLive$8(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1180:1180 -> a
+    30:30:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$10(com.android.tools.r8.graph.DexType):1192:1192 -> a
+    31:31:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1428:1428 -> a
     32:32:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexProgramClass.asProgramClass():0:0 -> a
-    32:32:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1457 -> a
-    33:33:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1698:1698 -> a
-    34:34:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1860:1860 -> a
-    35:35:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1881:1881 -> a
-    36:36:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2155:2155 -> a
-    37:37:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2207:2207 -> a
-    38:38:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2212:2212 -> a
-    39:39:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2311:2311 -> a
-    40:40:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2332:2332 -> a
-    41:41:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2337:2337 -> a
+    32:32:void lambda$processNewlyInstantiatedClass$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1428 -> a
+    33:33:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$16(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1656:1656 -> a
+    34:34:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$22(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1818:1818 -> a
+    35:35:com.android.tools.r8.shaking.Enqueuer$SetWithReason lambda$markInstanceFieldAsReachable$24(com.android.tools.r8.graph.DexProgramClass):1839:1839 -> a
+    36:36:java.util.Set lambda$markSuperMethodAsReachable$27(com.android.tools.r8.graph.DexEncodedMethod):2113:2113 -> a
+    37:37:void lambda$createAppInfo$28(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder,com.android.tools.r8.graph.DexAnnotation):2165:2165 -> a
+    38:38:boolean lambda$createAppInfo$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):2170:2170 -> a
+    39:39:java.util.Set lambda$trace$30(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):2268:2268 -> a
+    40:40:void lambda$trace$31(com.android.tools.r8.graph.DexReference,java.util.Map):2289:2289 -> a
+    41:41:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2294:2294 -> a
     42:42:boolean com.android.tools.r8.graph.DexType.isDexType():0:0 -> a
-    42:42:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2337 -> a
-    43:43:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2338:2338 -> a
+    42:42:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2294 -> a
+    43:43:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295:2295 -> a
     44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    44:44:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2338 -> a
-    45:45:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2339:2339 -> a
+    44:44:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295 -> a
+    45:45:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2296:2296 -> a
     46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> a
-    46:46:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2338 -> a
-    47:47:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2359:2359 -> a
-    48:48:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2515:2515 -> a
-    49:49:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2522:2522 -> a
+    46:46:void lambda$trace$32(com.android.tools.r8.graph.DexType,java.util.Set):2295 -> a
+    47:47:void lambda$trace$33(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2316:2316 -> a
+    48:48:void lambda$markMethodAsLive$34(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2480:2480 -> a
+    49:49:void lambda$markMethodAsLive$35(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2488:2488 -> a
     1:1:com.android.tools.r8.shaking.GraphReporter access$100(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$100
     1:1:java.util.Map access$1000(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$1000
     1:1:void access$1100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> access$1100
@@ -51762,344 +51642,333 @@
     1:1:boolean access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):103:103 -> access$2300
     1:1:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):103:103 -> access$2400
     1:1:java.util.Set access$2500(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$2500
-    1:1:java.util.Set access$2600(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$2600
-    1:1:void access$2700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> access$2700
-    1:1:java.util.Set access$2800(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$2800
-    1:1:void access$2900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> access$2900
+    1:1:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> access$2600
+    1:1:java.util.Set access$2700(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$2700
+    1:1:void access$2800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> access$2800
+    1:1:com.android.tools.r8.utils.InternalOptions access$2900(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$2900
     1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$300
-    1:1:com.android.tools.r8.utils.InternalOptions access$3000(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3000
+    1:1:java.util.Set access$3000(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3000
     1:1:java.util.Set access$3100(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3100
     1:1:java.util.Set access$3200(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3200
-    1:1:java.util.Set access$3300(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3300
-    1:1:void access$3400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):103:103 -> access$3400
-    1:1:boolean access$3500(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3500
-    1:1:void access$3600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> access$3600
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$3700(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3700
+    1:1:void access$3300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):103:103 -> access$3300
+    1:1:boolean access$3400(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3400
+    1:1:void access$3500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):103:103 -> access$3500
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$3600(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$3600
     1:1:java.util.Set access$400(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$400
-    1:1:void access$4300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):103:103 -> access$4300
-    1:1:void access$4400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):103:103 -> access$4400
-    1:1:void access$4500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> access$4500
-    1:1:void access$4600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> access$4600
-    1:1:void access$4700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):103:103 -> access$4700
+    1:1:void access$4100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):103:103 -> access$4100
+    1:1:void access$4200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> access$4200
+    1:1:void access$4300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> access$4300
+    1:1:void access$4400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):103:103 -> access$4400
     1:1:java.util.Map access$500(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$500
     1:1:boolean access$600(com.android.tools.r8.shaking.Enqueuer,java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):103:103 -> access$600
     1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$700(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$700
     1:1:java.util.Map access$800(com.android.tools.r8.shaking.Enqueuer):103:103 -> access$800
     1:1:void access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):103:103 -> access$900
     1:1:void com.android.tools.r8.graph.analysis.EnqueuerAnalysis.processNewlyLiveField(com.android.tools.r8.graph.DexEncodedField):0:0 -> b
-    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1737 -> b
-    2:2:void lambda$markTypeAsLive$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1215:1215 -> b
-    3:3:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$11(com.android.tools.r8.graph.DexProgramClass):1261:1261 -> b
-    4:4:java.util.Set lambda$handleAnnotation$12(com.android.tools.r8.graph.DexType):1291:1291 -> b
-    5:5:void lambda$markMethodAsTargeted$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1431:1431 -> b
-    6:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1699:1699 -> b
-    7:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1862:1862 -> b
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexType):1118:1118 -> c
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1706:1706 -> c
-    3:3:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1970:1970 -> c
-    4:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2534:2534 -> c
-    1:4:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):516:519 -> compatEnqueueHolderIfDependentNonStaticMember
-    1:16:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2205:2220 -> createAppInfo
-    17:57:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2219:2259 -> createAppInfo
-    58:61:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2258:2261 -> createAppInfo
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$5(com.android.tools.r8.graph.DexType):1137:1137 -> d
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1708:1708 -> d
-    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$38(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2538:2538 -> d
-    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$6(com.android.tools.r8.graph.DexType):1144:1144 -> e
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markReferencedTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2527:2527 -> e
-    1:1:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1269:1269 -> enqueueDependentItem
-    1:11:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):488:498 -> enqueueFirstNonSerializableClassInitializer
+    1:1:void lambda$markStaticFieldAsLive$20(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1695 -> b
+    2:2:void lambda$markTypeAsLive$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1181:1181 -> b
+    3:3:java.util.Set lambda$handleAnnotation$11(com.android.tools.r8.graph.DexType):1260:1260 -> b
+    4:4:void lambda$markMethodAsTargeted$13(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1402:1402 -> b
+    5:5:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$17(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1657:1657 -> b
+    6:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$23(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1820:1820 -> b
+    7:7:com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet lambda$markPossibleTargetsAsReachable$26(com.android.tools.r8.graph.DexProgramClass):1928:1928 -> b
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$4(com.android.tools.r8.graph.DexType):1088:1088 -> c
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markMethodAsTargeted$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):1398:1398 -> c
+    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1664:1664 -> c
+    1:4:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexClass,java.util.Set):495:498 -> compatEnqueueHolderIfDependentNonStaticMember
+    1:16:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2163:2178 -> createAppInfo
+    17:57:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2177:2217 -> createAppInfo
+    58:60:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithSubtyping):2216:2218 -> createAppInfo
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$5(com.android.tools.r8.graph.DexType):1107:1107 -> d
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$19(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):1666:1666 -> d
+    3:3:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$36(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2494:2494 -> d
+    1:1:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$6(com.android.tools.r8.graph.DexType):1114:1114 -> e
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$37(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2498:2498 -> e
+    1:1:void enqueueDependentItem(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexDefinition,java.util.Set):1238:1238 -> enqueueDependentItem
+    1:11:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):467:477 -> enqueueFirstNonSerializableClassInitializer
     12:12:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> enqueueFirstNonSerializableClassInitializer
-    12:12:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):499 -> enqueueFirstNonSerializableClassInitializer
-    13:13:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):499:499 -> enqueueFirstNonSerializableClassInitializer
-    1:3:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):506:508 -> enqueueMarkMethodLiveAction
-    1:1:void enqueueRootItem(java.util.Map$Entry):417:417 -> enqueueRootItem
+    12:12:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):478 -> enqueueFirstNonSerializableClassInitializer
+    13:13:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):478:478 -> enqueueFirstNonSerializableClassInitializer
+    1:3:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):485:487 -> enqueueMarkMethodLiveAction
+    1:1:void enqueueRootItem(java.util.Map$Entry):407:407 -> enqueueRootItem
     2:2:com.android.tools.r8.graph.DexDefinition com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexReference):153:153 -> enqueueRootItem
-    2:2:void enqueueRootItem(java.util.Map$Entry):417 -> enqueueRootItem
-    3:3:void enqueueRootItem(java.util.Map$Entry):419:419 -> enqueueRootItem
-    4:4:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):427:427 -> enqueueRootItem
-    1:1:void enqueueRootItems(java.util.Map):413:413 -> enqueueRootItems
-    1:13:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1374:1386 -> ensureFromLibraryOrThrow
+    2:2:void enqueueRootItem(java.util.Map$Entry):407 -> enqueueRootItem
+    3:3:void enqueueRootItem(java.util.Map$Entry):409:409 -> enqueueRootItem
+    4:4:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):417:417 -> enqueueRootItem
+    1:1:void enqueueRootItems(java.util.Map):403:403 -> enqueueRootItems
+    1:13:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1343:1355 -> ensureFromLibraryOrThrow
     14:14:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> ensureFromLibraryOrThrow
-    14:14:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1386 -> ensureFromLibraryOrThrow
-    15:26:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1387:1398 -> ensureFromLibraryOrThrow
-    1:4:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1224:1227 -> ensureMethodsContinueToWidenAccess
-    5:9:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1232:1236 -> ensureMethodsContinueToWidenAccess
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):531:531 -> f
-    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$7(com.android.tools.r8.graph.DexType):1167:1167 -> f
-    1:38:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2016:2053 -> findAndMarkResolutionTarget
-    39:50:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2052:2063 -> findAndMarkResolutionTarget
-    1:5:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2090:2094 -> generatedEnumValuesMethod
-    6:11:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2093:2098 -> generatedEnumValuesMethod
-    1:1:com.android.tools.r8.shaking.GraphReporter getGraphReporter():332:332 -> getGraphReporter
-    1:1:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1075:1075 -> getInvokeSuperTarget
+    14:14:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1355 -> ensureFromLibraryOrThrow
+    15:26:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1356:1367 -> ensureFromLibraryOrThrow
+    1:4:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1190:1193 -> ensureMethodsContinueToWidenAccess
+    5:9:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1198:1202 -> ensureMethodsContinueToWidenAccess
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):510:510 -> f
+    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$7(com.android.tools.r8.graph.DexType):1137:1137 -> f
+    1:38:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1974:2011 -> findAndMarkResolutionTarget
+    39:50:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget findAndMarkResolutionTarget(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):2010:2021 -> findAndMarkResolutionTarget
+    1:5:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2048:2052 -> generatedEnumValuesMethod
+    6:11:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2051:2056 -> generatedEnumValuesMethod
+    1:1:com.android.tools.r8.shaking.GraphReporter getGraphReporter():322:322 -> getGraphReporter
+    1:1:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1045:1045 -> getInvokeSuperTarget
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> getInvokeSuperTarget
-    2:2:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1075 -> getInvokeSuperTarget
-    3:6:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1076:1079 -> getInvokeSuperTarget
+    2:2:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1045 -> getInvokeSuperTarget
+    3:6:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1046:1049 -> getInvokeSuperTarget
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> getInvokeSuperTarget
-    7:7:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1079 -> getInvokeSuperTarget
-    8:13:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1080:1085 -> getInvokeSuperTarget
-    1:1:com.android.tools.r8.shaking.Enqueuer$Mode getMode():328:328 -> getMode
-    1:24:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):381:404 -> getNonPinnedWrittenFields
-    25:25:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):400:400 -> getNonPinnedWrittenFields
-    1:1:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):345:345 -> getProgramClassOrNull
+    7:7:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1049 -> getInvokeSuperTarget
+    8:13:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):1050:1055 -> getInvokeSuperTarget
+    1:1:com.android.tools.r8.shaking.Enqueuer$Mode getMode():318:318 -> getMode
+    1:24:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):371:394 -> getNonPinnedWrittenFields
+    25:25:java.util.Set getNonPinnedWrittenFields(java.util.function.Predicate):390:390 -> getNonPinnedWrittenFields
+    1:1:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):335:335 -> getProgramClassOrNull
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> getProgramClassOrNull
-    2:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):345 -> getProgramClassOrNull
-    3:11:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):347:355 -> getProgramClassOrNull
-    1:3:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1283:1285 -> handleAnnotation
+    2:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):335 -> getProgramClassOrNull
+    3:11:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):337:345 -> getProgramClassOrNull
+    1:3:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1252:1254 -> handleAnnotation
     4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> handleAnnotation
-    4:4:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1285 -> handleAnnotation
-    5:18:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1286:1299 -> handleAnnotation
-    1:29:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1341:1369 -> handleInvokeOfDirectTarget
-    1:23:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1303:1325 -> handleInvokeOfStaticTarget
-    1:8:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2675:2682 -> handleJavaLangClassNewInstance
-    9:17:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2681:2689 -> handleJavaLangClassNewInstance
+    4:4:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1254 -> handleAnnotation
+    5:18:void handleAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1255:1268 -> handleAnnotation
+    1:29:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1310:1338 -> handleInvokeOfDirectTarget
+    1:23:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1272:1294 -> handleInvokeOfStaticTarget
+    1:8:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2634:2641 -> handleJavaLangClassNewInstance
+    9:17:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2640:2648 -> handleJavaLangClassNewInstance
     18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> handleJavaLangClassNewInstance
-    18:18:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2693 -> handleJavaLangClassNewInstance
-    19:22:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2695:2698 -> handleJavaLangClassNewInstance
-    1:6:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2845:2850 -> handleJavaLangEnumValueOf
-    1:21:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2705:2725 -> handleJavaLangReflectConstructorNewInstance
-    22:48:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2724:2750 -> handleJavaLangReflectConstructorNewInstance
+    18:18:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2652 -> handleJavaLangClassNewInstance
+    19:22:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2654:2657 -> handleJavaLangClassNewInstance
+    1:6:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2804:2809 -> handleJavaLangEnumValueOf
+    1:21:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2664:2684 -> handleJavaLangReflectConstructorNewInstance
+    22:48:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2683:2709 -> handleJavaLangReflectConstructorNewInstance
     49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> handleJavaLangReflectConstructorNewInstance
-    49:49:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2752 -> handleJavaLangReflectConstructorNewInstance
-    50:94:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2754:2798 -> handleJavaLangReflectConstructorNewInstance
-    1:28:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2808:2835 -> handleJavaLangReflectProxyNewProxyInstance
-    1:7:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2568:2574 -> handleReflectiveBehavior
-    8:48:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2579:2619 -> handleReflectiveBehavior
+    49:49:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2711 -> handleJavaLangReflectConstructorNewInstance
+    50:94:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2713:2757 -> handleJavaLangReflectConstructorNewInstance
+    1:28:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2767:2794 -> handleJavaLangReflectProxyNewProxyInstance
+    1:7:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod):2528:2534 -> handleReflectiveBehavior
+    8:48:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2539:2579 -> handleReflectiveBehavior
     49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> handleReflectiveBehavior
-    49:49:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2620 -> handleReflectiveBehavior
-    50:61:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2621:2632 -> handleReflectiveBehavior
+    49:49:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2580 -> handleReflectiveBehavior
+    50:61:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2581:2592 -> handleReflectiveBehavior
     62:62:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):158:158 -> handleReflectiveBehavior
-    62:62:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2632 -> handleReflectiveBehavior
-    63:81:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2641:2659 -> handleReflectiveBehavior
+    62:62:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2592 -> handleReflectiveBehavior
+    63:81:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2601:2619 -> handleReflectiveBehavior
     82:82:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> handleReflectiveBehavior
-    82:82:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2659 -> handleReflectiveBehavior
-    83:88:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2663:2668 -> handleReflectiveBehavior
-    89:90:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2665:2666 -> handleReflectiveBehavior
-    1:13:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2889:2901 -> handleServiceInstantiation
-    1:19:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2856:2874 -> handleServiceLoaderInvocation
-    20:36:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2867:2883 -> handleServiceLoaderInvocation
-    1:2:java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers():369:370 -> instanceFieldsWrittenOnlyInEnclosingInstanceInitializers
-    1:8:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):432:439 -> internalEnqueueRootItem
+    82:82:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2619 -> handleReflectiveBehavior
+    83:87:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2623:2627 -> handleReflectiveBehavior
+    88:88:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2625:2625 -> handleReflectiveBehavior
+    89:89:void handleReflectiveBehavior(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.Instruction):2624:2624 -> handleReflectiveBehavior
+    1:13:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):2848:2860 -> handleServiceInstantiation
+    1:19:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2815:2833 -> handleServiceLoaderInvocation
+    20:36:void handleServiceLoaderInvocation(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.InvokeMethod):2826:2842 -> handleServiceLoaderInvocation
+    1:2:java.util.Set instanceFieldsWrittenOnlyInEnclosingInstanceInitializers():359:360 -> instanceFieldsWrittenOnlyInEnclosingInstanceInitializers
+    1:8:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):422:429 -> internalEnqueueRootItem
     9:9:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> internalEnqueueRootItem
-    9:9:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):440 -> internalEnqueueRootItem
-    10:14:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):441:445 -> internalEnqueueRootItem
-    15:20:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):442:447 -> internalEnqueueRootItem
-    21:21:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733:733 -> internalEnqueueRootItem
-    21:21:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):447 -> internalEnqueueRootItem
-    22:33:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):448:459 -> internalEnqueueRootItem
-    34:46:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):456:468 -> internalEnqueueRootItem
-    47:55:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):465:473 -> internalEnqueueRootItem
-    56:56:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):471:471 -> internalEnqueueRootItem
-    1:1:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1828:1828 -> isFieldLive
-    1:2:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1832:1833 -> isFieldRead
-    1:5:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1837:1841 -> isFieldWrittenOutsideDefaultConstructor
+    9:9:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):430 -> internalEnqueueRootItem
+    10:13:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):431:434 -> internalEnqueueRootItem
+    14:18:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):432:436 -> internalEnqueueRootItem
+    19:19:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):733:733 -> internalEnqueueRootItem
+    19:19:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):436 -> internalEnqueueRootItem
+    20:35:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):437:452 -> internalEnqueueRootItem
+    36:36:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):450:450 -> internalEnqueueRootItem
+    1:1:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):1786:1786 -> isFieldLive
+    1:2:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):1790:1791 -> isFieldRead
+    1:5:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1795:1799 -> isFieldWrittenOutsideDefaultConstructor
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> isFieldWrittenOutsideDefaultConstructor
-    6:6:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1841 -> isFieldWrittenOutsideDefaultConstructor
+    6:6:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1799 -> isFieldWrittenOutsideDefaultConstructor
     7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> isFieldWrittenOutsideDefaultConstructor
-    7:7:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1842 -> isFieldWrittenOutsideDefaultConstructor
-    8:9:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1844:1845 -> isFieldWrittenOutsideDefaultConstructor
+    7:7:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1800 -> isFieldWrittenOutsideDefaultConstructor
+    8:9:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1802:1803 -> isFieldWrittenOutsideDefaultConstructor
     10:10:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> isFieldWrittenOutsideDefaultConstructor
-    10:10:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1842 -> isFieldWrittenOutsideDefaultConstructor
-    1:1:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1849:1849 -> isInstantiatedOrHasInstantiatedSubtype
-    1:1:boolean isProgramClass(com.android.tools.r8.graph.DexType):341:341 -> isProgramClass
-    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2277:2282 -> joinIdentifierNameStrings
-    1:6:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2550:2555 -> markClassAsInstantiatedWithCompatRule
+    10:10:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.DexEncodedField):1800 -> isFieldWrittenOutsideDefaultConstructor
+    1:1:boolean isInstantiatedOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):1807:1807 -> isInstantiatedOrHasInstantiatedSubtype
+    1:1:boolean isProgramClass(com.android.tools.r8.graph.DexType):331:331 -> isProgramClass
+    1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):2234:2239 -> joinIdentifierNameStrings
+    1:6:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2510:2515 -> markClassAsInstantiatedWithCompatRule
     7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> markClassAsInstantiatedWithCompatRule
-    7:7:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2556 -> markClassAsInstantiatedWithCompatRule
-    8:10:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2557:2559 -> markClassAsInstantiatedWithCompatRule
-    11:11:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2557:2557 -> markClassAsInstantiatedWithCompatRule
-    1:3:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2542:2544 -> markClassAsInstantiatedWithReason
+    7:7:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2516 -> markClassAsInstantiatedWithCompatRule
+    8:10:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517:2519 -> markClassAsInstantiatedWithCompatRule
+    11:11:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517:2517 -> markClassAsInstantiatedWithCompatRule
+    1:3:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2502:2504 -> markClassAsInstantiatedWithReason
     4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():693:693 -> markClassAsInstantiatedWithReason
-    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2544 -> markClassAsInstantiatedWithReason
-    5:5:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2544:2544 -> markClassAsInstantiatedWithReason
-    1:13:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1797:1809 -> markDirectStaticOrConstructorMethodAsLive
+    4:4:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2504 -> markClassAsInstantiatedWithReason
+    5:5:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2504:2504 -> markClassAsInstantiatedWithReason
+    1:13:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1755:1767 -> markDirectStaticOrConstructorMethodAsLive
     14:14:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markDirectStaticOrConstructorMethodAsLive
-    14:14:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1808 -> markDirectStaticOrConstructorMethodAsLive
-    1:7:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2102:2108 -> markEnumValuesAsReachable
-    1:5:void markFieldAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2438:2442 -> markFieldAsKept
-    1:2:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1698:1699 -> markFieldAsTargeted
-    1:6:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1741:1746 -> markInstanceFieldAsLive
+    14:14:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1766 -> markDirectStaticOrConstructorMethodAsLive
+    1:7:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2060:2066 -> markEnumValuesAsReachable
+    1:8:void markFieldAsKept(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):2399:2406 -> markFieldAsKept
+    1:2:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):1656:1657 -> markFieldAsTargeted
+    1:6:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1699:1704 -> markInstanceFieldAsLive
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markInstanceFieldAsLive
-    7:7:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1746 -> markInstanceFieldAsLive
-    8:15:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1748:1755 -> markInstanceFieldAsLive
-    1:3:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1854:1856 -> markInstanceFieldAsReachable
+    7:7:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1704 -> markInstanceFieldAsLive
+    8:15:void markInstanceFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1706:1713 -> markInstanceFieldAsLive
+    1:3:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1812:1814 -> 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):1856 -> markInstanceFieldAsReachable
-    5:28:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1859:1882 -> markInstanceFieldAsReachable
-    1:2:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1760:1761 -> markInstantiated
+    4:4:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1814 -> markInstanceFieldAsReachable
+    5:28:void markInstanceFieldAsReachable(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1817:1840 -> markInstanceFieldAsReachable
+    1:2:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1718:1719 -> markInstantiated
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markInstantiated
-    3:3:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1761 -> markInstantiated
-    4:4:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1763:1763 -> markInstantiated
-    1:7:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):477:483 -> markInterfaceAsInstantiated
-    1:20:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1243:1262 -> markInterfaceTypeAsLiveViaInheritanceClause
-    21:21:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1249:1249 -> markInterfaceTypeAsLiveViaInheritanceClause
-    1:1:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1767:1767 -> markLambdaInstantiated
+    3:3:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1719 -> markInstantiated
+    4:4:void markInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1721:1721 -> markInstantiated
+    1:7:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):456:462 -> markInterfaceAsInstantiated
+    1:25:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1208:1232 -> markInterfaceTypeAsLiveViaInheritanceClause
+    1:1:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1725:1725 -> markLambdaInstantiated
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> markLambdaInstantiated
-    2:2:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1767 -> markLambdaInstantiated
-    3:24:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1769:1790 -> markLambdaInstantiated
-    1:22:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1578:1599 -> markLibraryAndClasspathMethodOverridesAsLive
-    1:25:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2402:2426 -> markMethodAsKept
-    26:35:void markMethodAsKept(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2423:2432 -> markMethodAsKept
-    1:12:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2489:2500 -> markMethodAsLive
+    2:2:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1725 -> markLambdaInstantiated
+    3:24:void markLambdaInstantiated(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod):1727:1748 -> markLambdaInstantiated
+    1:22:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):1549:1570 -> markLibraryAndClasspathMethodOverridesAsLive
+    1:29:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2359:2387 -> markMethodAsKept
+    30:39:void markMethodAsKept(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2384:2393 -> markMethodAsKept
+    1:12:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2453:2464 -> markMethodAsLive
     13:13:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsLive
-    13:13:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2500 -> markMethodAsLive
-    14:18:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2502:2506 -> markMethodAsLive
-    19:22:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2505:2508 -> markMethodAsLive
-    23:38:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2507:2522 -> markMethodAsLive
-    1:1:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2564:2564 -> markMethodAsLiveWithCompatRule
-    1:12:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1423:1434 -> markMethodAsTargeted
-    13:13:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsTargeted
-    13:13:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1434 -> markMethodAsTargeted
-    14:18:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1436:1440 -> markMethodAsTargeted
-    1:1:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1337:1337 -> markNonStaticDirectMethodAsReachable
-    1:5:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2532:2536 -> markParameterAndReturnTypesAsLive
-    1:1:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1959:1959 -> markPossibleTargetsAsReachable
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> markPossibleTargetsAsReachable
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1055 -> markPossibleTargetsAsReachable
-    2:2:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1959 -> markPossibleTargetsAsReachable
-    3:4:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1959:1960 -> markPossibleTargetsAsReachable
+    13:13:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2464 -> markMethodAsLive
+    14:18:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2466:2470 -> markMethodAsLive
+    19:22:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2469:2472 -> markMethodAsLive
+    23:29:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2471:2477 -> markMethodAsLive
+    30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> markMethodAsLive
+    30:30:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2477 -> markMethodAsLive
+    31:42:void markMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2477:2488 -> markMethodAsLive
+    1:1:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2524:2524 -> markMethodAsLiveWithCompatRule
+    1:14:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1392:1405 -> markMethodAsTargeted
+    15:15:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethodAsTargeted
+    15:15:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1405 -> markMethodAsTargeted
+    16:20:void markMethodAsTargeted(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1407:1411 -> markMethodAsTargeted
+    1:1:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1306:1306 -> markNonStaticDirectMethodAsReachable
+    1:5:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2492:2496 -> markParameterAndReturnTypesAsLive
+    1:1:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917:1917 -> markPossibleTargetsAsReachable
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> markPossibleTargetsAsReachable
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1050 -> markPossibleTargetsAsReachable
+    2:2:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917 -> markPossibleTargetsAsReachable
+    3:4:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1917:1918 -> markPossibleTargetsAsReachable
     5:5:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> markPossibleTargetsAsReachable
-    5:5:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1960 -> markPossibleTargetsAsReachable
-    6:52:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1960:2006 -> markPossibleTargetsAsReachable
-    53:59:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):2003:2009 -> markPossibleTargetsAsReachable
-    60:63:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1986:1989 -> markPossibleTargetsAsReachable
-    64:64:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1986:1986 -> markPossibleTargetsAsReachable
-    1:16:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2071:2086 -> markPossiblyValidTarget
-    17:20:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2072:2075 -> markPossiblyValidTarget
-    21:29:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2074:2082 -> markPossiblyValidTarget
-    1:3:void markReferencedTypesAsLive(com.android.tools.r8.graph.DexEncodedMethod):2526:2528 -> markReferencedTypesAsLive
-    1:2:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1605:1606 -> markResolutionAsLive
-    1:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1704:1722 -> markStaticFieldAsLive
+    5:5:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1918 -> markPossibleTargetsAsReachable
+    6:52:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1918:1964 -> markPossibleTargetsAsReachable
+    53:59:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1961:1967 -> markPossibleTargetsAsReachable
+    60:63:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1944:1947 -> markPossibleTargetsAsReachable
+    64:64:void markPossibleTargetsAsReachable(com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget,java.util.function.BiPredicate,com.android.tools.r8.graph.DexEncodedMethod):1944:1944 -> markPossibleTargetsAsReachable
+    1:16:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2029:2044 -> markPossiblyValidTarget
+    17:20:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2030:2033 -> markPossiblyValidTarget
+    21:29:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget markPossiblyValidTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):2032:2040 -> markPossiblyValidTarget
+    1:2:void markResolutionAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):1576:1577 -> markResolutionAsLive
+    1:19:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1662:1680 -> 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):1722 -> markStaticFieldAsLive
-    21:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1725:1726 -> markStaticFieldAsLive
+    20:20:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1680 -> markStaticFieldAsLive
+    21:22:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1683:1684 -> 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):1726 -> markStaticFieldAsLive
-    24:31:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1730:1737 -> markStaticFieldAsLive
-    1:15:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2119:2133 -> markSuperMethodAsReachable
-    16:35:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2132:2151 -> markSuperMethodAsReachable
+    23:23:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1684 -> markStaticFieldAsLive
+    24:31:void markStaticFieldAsLive(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):1688:1695 -> markStaticFieldAsLive
+    1:15:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2077:2091 -> markSuperMethodAsReachable
+    16:35:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2090:2109 -> markSuperMethodAsReachable
     36:36:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markSuperMethodAsReachable
-    36:36:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2151 -> markSuperMethodAsReachable
-    37:42:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2154:2159 -> markSuperMethodAsReachable
-    1:16:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1104:1119 -> markTypeAsLive
-    17:17:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1116:1116 -> markTypeAsLive
-    18:33:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1123:1138 -> markTypeAsLive
-    34:34:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1135:1135 -> markTypeAsLive
-    35:37:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1142:1144 -> markTypeAsLive
-    38:38:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1142:1142 -> markTypeAsLive
-    39:44:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1150:1155 -> markTypeAsLive
+    36:36:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2109 -> markSuperMethodAsReachable
+    37:42:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):2112:2117 -> markSuperMethodAsReachable
+    1:16:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1074:1089 -> markTypeAsLive
+    17:17:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1086:1086 -> markTypeAsLive
+    18:33:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1093:1108 -> markTypeAsLive
+    34:34:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1105:1105 -> markTypeAsLive
+    35:37:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1112:1114 -> markTypeAsLive
+    38:38:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1112:1112 -> markTypeAsLive
+    39:44:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1120:1125 -> markTypeAsLive
     45:45:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markTypeAsLive
-    45:45:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1155 -> markTypeAsLive
-    46:107:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1158:1219 -> markTypeAsLive
-    108:108:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> markTypeAsLive
-    108:108:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1220 -> markTypeAsLive
-    109:109:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1220:1220 -> markTypeAsLive
-    110:110:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1219:1219 -> markTypeAsLive
-    1:5:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1815:1819 -> markVirtualMethodAsLive
-    6:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1817:1822 -> markVirtualMethodAsLive
+    45:45:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1125 -> markTypeAsLive
+    46:103:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1128:1185 -> markTypeAsLive
+    104:104:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> markTypeAsLive
+    104:104:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1186 -> markTypeAsLive
+    105:105:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1186:1186 -> markTypeAsLive
+    106:106:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1185:1185 -> markTypeAsLive
+    1:5:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1773:1777 -> markVirtualMethodAsLive
+    6:11:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1775:1780 -> markVirtualMethodAsLive
     12:12:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markVirtualMethodAsLive
-    12:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1822 -> markVirtualMethodAsLive
-    1:1:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1889:1889 -> markVirtualMethodAsReachable
-    2:29:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1897:1924 -> markVirtualMethodAsReachable
+    12:12:void markVirtualMethodAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1780 -> markVirtualMethodAsLive
+    1:1:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason):1847:1847 -> markVirtualMethodAsReachable
+    2:29:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1855:1882 -> markVirtualMethodAsReachable
     30:30:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markVirtualMethodAsReachable
-    30:30:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1924 -> markVirtualMethodAsReachable
-    31:50:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1928:1947 -> markVirtualMethodAsReachable
+    30:30:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1882 -> markVirtualMethodAsReachable
+    31:50:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1886:1905 -> markVirtualMethodAsReachable
     51:51:boolean com.android.tools.r8.graph.DexEncodedMethod.isAbstract():248:248 -> markVirtualMethodAsReachable
-    51:51:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1948 -> markVirtualMethodAsReachable
-    52:52:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1951:1951 -> markVirtualMethodAsReachable
-    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():409:409 -> newSetWithoutReasonReporter
-    1:13:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1480:1492 -> populateInstantiatedTypesCache
-    1:1:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1279:1279 -> processAnnotation
-    1:2:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1273:1274 -> processAnnotations
-    1:15:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1452:1466 -> processNewlyInstantiatedClass
+    51:51:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1906 -> markVirtualMethodAsReachable
+    52:52:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.KeepReason,java.util.function.BiPredicate):1909:1909 -> markVirtualMethodAsReachable
+    1:1:com.android.tools.r8.shaking.Enqueuer$SetWithReason newSetWithoutReasonReporter():399:399 -> newSetWithoutReasonReporter
+    1:13:void populateInstantiatedTypesCache(com.android.tools.r8.graph.DexProgramClass):1451:1463 -> populateInstantiatedTypesCache
+    1:1:void processAnnotation(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1248:1248 -> processAnnotation
+    1:2:void processAnnotations(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1242:1243 -> processAnnotations
+    1:15:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1423:1437 -> processNewlyInstantiatedClass
     16:16:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> processNewlyInstantiatedClass
-    16:16:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1466 -> processNewlyInstantiatedClass
-    17:24:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1469:1476 -> processNewlyInstantiatedClass
-    1:1:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):336:336 -> registerAnalysis
-    1:2:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1330:1331 -> registerClassInitializer
-    1:2:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):546:547 -> registerFieldAccess
-    3:31:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):552:580 -> registerFieldAccess
-    1:1:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):538:538 -> registerFieldRead
-    1:1:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):542:542 -> registerFieldWrite
-    1:4:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):529:532 -> registerMethodWithTargetAndContext
-    1:2:void reportMissingClass(com.android.tools.r8.graph.DexType):1404:1405 -> reportMissingClass
+    16:16:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1437 -> processNewlyInstantiatedClass
+    17:24:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):1440:1447 -> processNewlyInstantiatedClass
+    1:1:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):326:326 -> registerAnalysis
+    1:2:void registerClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1299:1300 -> registerClassInitializer
+    1:2:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):525:526 -> registerFieldAccess
+    3:31:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod,boolean):531:559 -> registerFieldAccess
+    1:1:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):517:517 -> registerFieldRead
+    1:1:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedMethod):521:521 -> registerFieldWrite
+    1:4:boolean registerMethodWithTargetAndContext(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):508:511 -> registerMethodWithTargetAndContext
+    1:2:void reportMissingClass(com.android.tools.r8.graph.DexType):1373:1374 -> reportMissingClass
     3:3:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> reportMissingClass
-    3:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1405 -> reportMissingClass
-    1:2:void reportMissingField(com.android.tools.r8.graph.DexField):1416:1417 -> reportMissingField
+    3:3:void reportMissingClass(com.android.tools.r8.graph.DexType):1374 -> reportMissingClass
+    1:2:void reportMissingField(com.android.tools.r8.graph.DexField):1385:1386 -> 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):1417 -> reportMissingField
-    1:2:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1410:1411 -> reportMissingMethod
+    3:3:void reportMissingField(com.android.tools.r8.graph.DexField):1386 -> reportMissingField
+    1:2:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1379:1380 -> 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):1411 -> reportMissingMethod
-    1:15:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2448:2462 -> shouldMarkLibraryMethodOverrideAsReachable
+    3:3:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1380 -> reportMissingMethod
+    1:15:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2412:2426 -> shouldMarkLibraryMethodOverrideAsReachable
     16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> shouldMarkLibraryMethodOverrideAsReachable
-    16:16:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2462 -> shouldMarkLibraryMethodOverrideAsReachable
-    17:29:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2467:2479 -> shouldMarkLibraryMethodOverrideAsReachable
-    1:2:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():375:376 -> staticFieldsWrittenOnlyInEnclosingStaticInitializer
-    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2267:2272 -> toSortedDescriptorSet
-    1:92:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2288:2379 -> trace
-    93:104:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2378:2389 -> trace
-    105:105:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2387:2387 -> trace
-    1:9: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):2184:2192 -> traceApplication
-    1:8:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2168:2175 -> traceMainDex
-    1:8:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1627:1634 -> transitionDefaultMethodsForInstantiatedClass
-    1:4:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1675:1678 -> transitionDependentItemsForInstantiatedClass
+    16:16:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2426 -> shouldMarkLibraryMethodOverrideAsReachable
+    17:29:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2431:2443 -> shouldMarkLibraryMethodOverrideAsReachable
+    1:2:java.util.Set staticFieldsWrittenOnlyInEnclosingStaticInitializer():365:366 -> staticFieldsWrittenOnlyInEnclosingStaticInitializer
+    1:6:java.util.SortedSet toSortedDescriptorSet(java.util.Set):2224:2229 -> toSortedDescriptorSet
+    1:92:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2245:2336 -> trace
+    93:104:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2335:2346 -> trace
+    105:105:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2344:2344 -> trace
+    1:9: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):2142:2150 -> traceApplication
+    1:8:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2126:2133 -> traceMainDex
+    1:8:void transitionDefaultMethodsForInstantiatedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ScopedDexMethodSet):1598:1605 -> transitionDefaultMethodsForInstantiatedClass
+    1:4:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1646:1649 -> transitionDependentItemsForInstantiatedClass
     5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> transitionDependentItemsForInstantiatedClass
-    5:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1678 -> transitionDependentItemsForInstantiatedClass
-    6:7:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1680:1681 -> transitionDependentItemsForInstantiatedClass
-    1:9:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1660:1668 -> transitionFieldsForInstantiatedClass
-    1:22:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1513:1534 -> transitionMethodsForInstantiatedClass
+    5:5:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1649 -> transitionDependentItemsForInstantiatedClass
+    6:7:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexClass):1651:1652 -> transitionDependentItemsForInstantiatedClass
+    1:9:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1631:1639 -> transitionFieldsForInstantiatedClass
+    1:22:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1484:1505 -> transitionMethodsForInstantiatedClass
     23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> transitionMethodsForInstantiatedClass
-    23:23:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1534 -> transitionMethodsForInstantiatedClass
-    24:50:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1536:1562 -> transitionMethodsForInstantiatedClass
+    23:23:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1505 -> transitionMethodsForInstantiatedClass
+    24:50:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1507:1533 -> transitionMethodsForInstantiatedClass
     51:51:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> transitionMethodsForInstantiatedClass
-    51:51:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1562 -> transitionMethodsForInstantiatedClass
-    52:56:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1564:1568 -> transitionMethodsForInstantiatedClass
+    51:51:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1533 -> transitionMethodsForInstantiatedClass
+    52:56:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1535:1539 -> transitionMethodsForInstantiatedClass
     57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> transitionMethodsForInstantiatedClass
-    57:57:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1568 -> transitionMethodsForInstantiatedClass
-    58:58:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1570:1570 -> transitionMethodsForInstantiatedClass
-    1:9:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1640:1648 -> transitionNonAbstractMethodsToLiveAndShadow
-    10:10:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1647:1647 -> transitionNonAbstractMethodsToLiveAndShadow
-    11:11:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1644:1644 -> transitionNonAbstractMethodsToLiveAndShadow
-    1:3:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1068:1070 -> transitionReachableVirtualMethods
-    1:9:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):1685:1693 -> transitionUnusedInterfaceToLive
-    1:5:void unpinLambdaMethods():2393:2397 -> unpinLambdaMethods
-    1:3:boolean verifyKeptGraph():2196:2198 -> verifyKeptGraph
-    1:2:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1093:1094 -> verifyMethodIsTargeted
-    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1099:1099 -> verifyTypeIsLive
-    1:5:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):360:364 -> warnIfLibraryTypeInheritsFromProgramType
+    57:57:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1539 -> transitionMethodsForInstantiatedClass
+    58:58:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):1541:1541 -> transitionMethodsForInstantiatedClass
+    1:9:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1611:1619 -> transitionNonAbstractMethodsToLiveAndShadow
+    10:10:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1618:1618 -> transitionNonAbstractMethodsToLiveAndShadow
+    11:11:void transitionNonAbstractMethodsToLiveAndShadow(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet,com.android.tools.r8.shaking.ScopedDexMethodSet):1615:1615 -> transitionNonAbstractMethodsToLiveAndShadow
+    1:3:void transitionReachableVirtualMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet):1038:1040 -> transitionReachableVirtualMethods
+    1:5:void unpinLambdaMethods():2350:2354 -> unpinLambdaMethods
+    1:3:boolean verifyKeptGraph():2154:2156 -> verifyKeptGraph
+    1:2:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.DexEncodedMethod):1063:1064 -> verifyMethodIsTargeted
+    1:1:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1069:1069 -> verifyTypeIsLive
+    1:5:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):350:354 -> warnIfLibraryTypeInheritsFromProgramType
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.Enqueuer$1:
-    1:1:void <clinit>():1002:1002 -> <clinit>
+    1:1:void <clinit>():972:972 -> <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):3067:3067 -> <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):3074:3077 -> <init>
-    1:1:boolean addField(com.android.tools.r8.graph.DexField):3087:3087 -> addField
+    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):3001:3001 -> <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):3008:3011 -> <init>
+    1:1:boolean addField(com.android.tools.r8.graph.DexField):3021:3021 -> addField
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> addField
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):3087 -> addField
-    3:13:boolean addField(com.android.tools.r8.graph.DexField):3091:3101 -> addField
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> addField
-    14:14:boolean addField(com.android.tools.r8.graph.DexField):3101 -> addField
-    15:27:boolean addField(com.android.tools.r8.graph.DexField):3101:3113 -> addField
-    1:10:boolean addMethod(com.android.tools.r8.graph.DexMethod):3121:3130 -> addMethod
-    11:18:boolean addMethod(com.android.tools.r8.graph.DexMethod):3129:3136 -> addMethod
-    1:2:boolean addType(com.android.tools.r8.graph.DexType):3166:3167 -> addType
-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):2930:2930 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):2926:2931 -> <init>
-    1:1:java.util.Set access$4100(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):2924:2924 -> access$4100
-    1:3:boolean add(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):2935:2937 -> add
-    1:1:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):2941:2941 -> contains
-    1:1:java.util.Set getItems():2945:2945 -> getItems
+    2:2:boolean addField(com.android.tools.r8.graph.DexField):3021 -> addField
+    3:13:boolean addField(com.android.tools.r8.graph.DexField):3025:3035 -> addField
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> addField
+    14:14:boolean addField(com.android.tools.r8.graph.DexField):3035 -> addField
+    15:27:boolean addField(com.android.tools.r8.graph.DexField):3035:3047 -> addField
+    1:10:boolean addMethod(com.android.tools.r8.graph.DexMethod):3055:3064 -> addMethod
+    11:18:boolean addMethod(com.android.tools.r8.graph.DexMethod):3063:3070 -> addMethod
+    1:2:boolean addType(com.android.tools.r8.graph.DexType):3100:3101 -> addType
 com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget -> com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget:
-    1:3:void <clinit>():2973:2975 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):2984:2987 -> <init>
-    1:2:boolean equals(java.lang.Object):3003:3004 -> equals
-    1:1:int hashCode():2997:2997 -> hashCode
+    1:3:void <clinit>():2907:2909 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):2918:2921 -> <init>
+    1:2:boolean equals(java.lang.Object):2937:2938 -> equals
+    1:1:int hashCode():2931:2931 -> hashCode
     2:2:int com.android.tools.r8.graph.KeyedDexItem.hashCode():20:20 -> hashCode
-    2:2:int hashCode():2997 -> hashCode
-    1:1:boolean isUnresolved():2991:2991 -> isUnresolved
-    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2981:2981 -> unresolved
+    2:2:int hashCode():2931 -> hashCode
+    1:1:boolean isUnresolved():2925:2925 -> isUnresolved
+    1:1:com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget unresolved():2915:2915 -> unresolved
 com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.Enqueuer$Mode:
     1:4:void <clinit>():106:109 -> <clinit>
     5:5:void <clinit>():105:105 -> <clinit>
@@ -52111,101 +51980,101 @@
     1:1:com.android.tools.r8.shaking.Enqueuer$Mode valueOf(java.lang.String):105:105 -> valueOf
     1:1:com.android.tools.r8.shaking.Enqueuer$Mode[] values():105:105 -> values
 com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet -> com.android.tools.r8.shaking.Enqueuer$ReachableVirtualMethodsSet:
-    1:4:void <init>():3008:3011 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):3008:3008 -> <init>
-    1:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):3022:3029 -> add
-    1:1:java.util.Set getMethods():3014:3014 -> getMethods
-    1:1:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):3018:3018 -> getReasons
+    1:4:void <init>():2942:2945 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2942:2942 -> <init>
+    1:8:boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):2956:2963 -> add
+    1:1:java.util.Set getMethods():2948:2948 -> getMethods
+    1:1:java.util.Set getReasons(com.android.tools.r8.graph.DexEncodedMethod):2952:2952 -> getReasons
 com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.shaking.Enqueuer$SetWithReason:
-    1:1:void <init>(java.util.function.BiConsumer):2955:2955 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):2951:2956 -> <init>
-    1:1:java.util.Set access$3900(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2949:2949 -> access$3900
-    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2960:2961 -> add
-    1:1:boolean contains(java.lang.Object):2965:2965 -> contains
-    1:1:java.util.Set getItems():2969:2969 -> getItems
+    1:1:void <init>(java.util.function.BiConsumer):2889:2889 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):2885:2890 -> <init>
+    1:1:java.util.Set access$3800(com.android.tools.r8.shaking.Enqueuer$SetWithReason):2883:2883 -> access$3800
+    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):2894:2895 -> add
+    1:1:boolean contains(java.lang.Object):2899:2899 -> contains
+    1:1:java.util.Set getItems():2903:2903 -> getItems
 com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason:
-    1:1:void <clinit>():2906:2906 -> <clinit>
-    1:3:void <init>():2906:2908 -> <init>
-    4:4:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2906:2906 -> <init>
-    1:1:java.util.Set access$4000(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):2906:2906 -> access$4000
-    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2911:2912 -> add
-    1:1:boolean contains(java.lang.Object):2916:2916 -> contains
-    1:1:java.util.Set getItems():2920:2920 -> getItems
+    1:1:void <clinit>():2865:2865 -> <clinit>
+    1:3:void <init>():2865:2867 -> <init>
+    4:4:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2865:2865 -> <init>
+    1:1:java.util.Set access$3900(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):2865:2865 -> access$3900
+    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2870:2871 -> add
+    1:1:boolean contains(java.lang.Object):2875:2875 -> contains
+    1:1:java.util.Set getItems():2879:2879 -> getItems
 com.android.tools.r8.shaking.Enqueuer$TargetWithContext -> com.android.tools.r8.shaking.Enqueuer$TargetWithContext:
-    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):3039:3041 -> <init>
-    1:5:boolean equals(java.lang.Object):3059:3063 -> equals
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getContext():3049:3049 -> getContext
-    1:1:com.android.tools.r8.graph.Descriptor getTarget():3045:3045 -> getTarget
-    1:1:int hashCode():3054:3054 -> hashCode
+    1:3:void <init>(com.android.tools.r8.graph.Descriptor,com.android.tools.r8.graph.DexEncodedMethod):2973:2975 -> <init>
+    1:5:boolean equals(java.lang.Object):2993:2997 -> equals
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getContext():2983:2983 -> getContext
+    1:1:com.android.tools.r8.graph.Descriptor getTarget():2979:2979 -> getTarget
+    1:1:int hashCode():2988:2988 -> hashCode
     2:2:int com.android.tools.r8.graph.KeyedDexItem.hashCode():20:20 -> hashCode
-    2:2:int hashCode():3054 -> hashCode
+    2:2:int hashCode():2988 -> hashCode
 com.android.tools.r8.shaking.Enqueuer$UseRegistry -> com.android.tools.r8.shaking.Enqueuer$UseRegistry:
-    1:1:void <clinit>():583:583 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):583:583 -> <init>
-    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):588:592 -> <init>
-    1:1:java.lang.Boolean lambda$registerStaticFieldRead$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):836:836 -> a
-    1:1:java.lang.Boolean lambda$registerStaticFieldWrite$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):881:881 -> b
-    1:65:void registerCallSite(com.android.tools.r8.graph.DexCallSite):956:1020 -> registerCallSite
-    66:76:void registerCallSite(com.android.tools.r8.graph.DexCallSite):1007:1017 -> registerCallSite
-    77:77:void registerCallSite(com.android.tools.r8.graph.DexCallSite):1016:1016 -> registerCallSite
-    78:78:void registerCallSite(com.android.tools.r8.graph.DexCallSite):1010:1010 -> registerCallSite
-    79:119:void registerCallSite(com.android.tools.r8.graph.DexCallSite):1004:1044 -> registerCallSite
-    1:1:boolean registerCheckCast(com.android.tools.r8.graph.DexType):922:922 -> registerCheckCast
-    1:8:boolean registerConstClass(com.android.tools.r8.graph.DexType):910:917 -> registerConstClass
-    1:10:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1050:1059 -> registerConstClassOrCheckCast
-    11:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1058:1058 -> registerConstClassOrCheckCast
-    1:20:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):754:773 -> registerInstanceFieldRead
+    1:1:void <clinit>():562:562 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$1):562:562 -> <init>
+    2:6:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):567:571 -> <init>
+    1:1:java.lang.Boolean lambda$registerStaticFieldRead$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):815:815 -> a
+    1:1:java.lang.Boolean lambda$registerStaticFieldWrite$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):860:860 -> b
+    1:65:void registerCallSite(com.android.tools.r8.graph.DexCallSite):926:990 -> registerCallSite
+    66:76:void registerCallSite(com.android.tools.r8.graph.DexCallSite):977:987 -> registerCallSite
+    77:77:void registerCallSite(com.android.tools.r8.graph.DexCallSite):986:986 -> registerCallSite
+    78:78:void registerCallSite(com.android.tools.r8.graph.DexCallSite):980:980 -> registerCallSite
+    79:119:void registerCallSite(com.android.tools.r8.graph.DexCallSite):974:1014 -> registerCallSite
+    1:1:boolean registerCheckCast(com.android.tools.r8.graph.DexType):892:892 -> registerCheckCast
+    1:1:boolean registerConstClass(com.android.tools.r8.graph.DexType):887:887 -> registerConstClass
+    1:10:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1020:1029 -> registerConstClassOrCheckCast
+    11:11:boolean registerConstClassOrCheckCast(com.android.tools.r8.graph.DexType):1028:1028 -> registerConstClassOrCheckCast
+    1:20:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):733:752 -> registerInstanceFieldRead
     21:21:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerInstanceFieldRead
-    21:21:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):773 -> registerInstanceFieldRead
-    22:30:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):778:786 -> registerInstanceFieldRead
-    31:31:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):785:785 -> registerInstanceFieldRead
-    1:20:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):708:727 -> registerInstanceFieldWrite
+    21:21:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):752 -> registerInstanceFieldRead
+    22:30:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):757:765 -> registerInstanceFieldRead
+    31:31:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):764:764 -> registerInstanceFieldRead
+    1:20:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):687:706 -> registerInstanceFieldWrite
     21:21:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerInstanceFieldWrite
-    21:21:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):727 -> registerInstanceFieldWrite
-    22:39:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):731:748 -> registerInstanceFieldWrite
-    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):626:626 -> registerInvokeDirect
-    2:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):630:634 -> registerInvokeDirect
+    21:21:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):706 -> registerInstanceFieldWrite
+    22:39:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):710:727 -> registerInstanceFieldWrite
+    1:1:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):605:605 -> registerInvokeDirect
+    2:6:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):609:613 -> registerInvokeDirect
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerInvokeDirect
-    7:7:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):634 -> registerInvokeDirect
-    8:8:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):636:636 -> registerInvokeDirect
-    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):677:677 -> registerInvokeInterface
-    2:6:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):681:685 -> registerInvokeInterface
+    7:7:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):613 -> registerInvokeDirect
+    8:8:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):615:615 -> registerInvokeDirect
+    1:1:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):656:656 -> registerInvokeInterface
+    2:6:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):660:664 -> registerInvokeInterface
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerInvokeInterface
-    7:7:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):685 -> registerInvokeInterface
-    8:8:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):687:687 -> registerInvokeInterface
-    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):642:642 -> registerInvokeStatic
-    2:25:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):646:669 -> registerInvokeStatic
+    7:7:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):664 -> registerInvokeInterface
+    8:8:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):666:666 -> registerInvokeInterface
+    1:1:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):621:621 -> registerInvokeStatic
+    2:25:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):625:648 -> registerInvokeStatic
     26:26:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerInvokeStatic
-    26:26:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):669 -> registerInvokeStatic
-    27:27:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):671:671 -> registerInvokeStatic
-    1:6:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):695:700 -> registerInvokeSuper
+    26:26:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):648 -> registerInvokeStatic
+    27:27:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):650:650 -> registerInvokeStatic
+    1:6:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):674:679 -> registerInvokeSuper
     7:7:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerInvokeSuper
-    7:7:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):700 -> registerInvokeSuper
-    8:8:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):702:702 -> registerInvokeSuper
-    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):601:601 -> registerInvokeVirtual
-    2:9:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):605:612 -> registerInvokeVirtual
-    10:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):607:618 -> registerInvokeVirtual
+    7:7:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):679 -> registerInvokeSuper
+    8:8:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):681:681 -> registerInvokeSuper
+    1:1:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):580:580 -> registerInvokeVirtual
+    2:9:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):584:591 -> registerInvokeVirtual
+    10:21:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):586:597 -> registerInvokeVirtual
     22:22:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]) -> registerInvokeVirtual
-    22:22:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):618 -> registerInvokeVirtual
-    23:23:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):620:620 -> registerInvokeVirtual
-    1:1:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):933:933 -> registerMethodHandle
+    22:22:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):597 -> registerInvokeVirtual
+    23:23:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):599:599 -> registerInvokeVirtual
+    1:1:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):903:903 -> registerMethodHandle
     2:2:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():297:297 -> registerMethodHandle
-    2:2:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):940 -> registerMethodHandle
-    3:11:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):940:948 -> registerMethodHandle
-    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):792:792 -> registerNewInstance
-    2:7:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):797:802 -> registerNewInstance
-    1:19:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):810:828 -> registerStaticFieldRead
+    2:2:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):910 -> registerMethodHandle
+    3:11:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):910:918 -> registerMethodHandle
+    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):771:771 -> registerNewInstance
+    2:7:boolean registerNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):776:781 -> registerNewInstance
+    1:19:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):789:807 -> registerStaticFieldRead
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerStaticFieldRead
-    20:20:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):828 -> registerStaticFieldRead
-    21:27:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):831:837 -> registerStaticFieldRead
-    28:43:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):834:849 -> registerStaticFieldRead
-    1:19:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):855:873 -> registerStaticFieldWrite
+    20:20:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):807 -> registerStaticFieldRead
+    21:27:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):810:816 -> registerStaticFieldRead
+    28:43:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):813:828 -> registerStaticFieldRead
+    1:19:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):834:852 -> registerStaticFieldWrite
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> registerStaticFieldWrite
-    20:20:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):873 -> registerStaticFieldWrite
-    21:27:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):876:882 -> registerStaticFieldWrite
-    28:51:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):879:902 -> registerStaticFieldWrite
-    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):927:927 -> registerTypeReference
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):596:596 -> reportClassReferenced
+    20:20:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):852 -> registerStaticFieldWrite
+    21:27:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):855:861 -> registerStaticFieldWrite
+    28:51:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):858:881 -> registerStaticFieldWrite
+    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):897:897 -> registerTypeReference
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferenced(com.android.tools.r8.graph.DexProgramClass):575:575 -> reportClassReferenced
 com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.EnqueuerFactory:
     1:1:void <init>():12:12 -> <init>
     1:1:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.experimental.graphinfo.GraphConsumer):21:21 -> createForFinalTreeShaking
@@ -52217,50 +52086,50 @@
     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>():16:16 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):169:169 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppView):167:170 -> <init>
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):174:174 -> createWorklist
-    1:2:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):229:230 -> enqueueMarkFieldKeptAction
-    1:2:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):211:212 -> enqueueMarkInstantiatedAction
-    1:2:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):223:224 -> enqueueMarkMethodKeptAction
-    1:2:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):217:218 -> enqueueMarkMethodLiveAction
-    1:1:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):186:186 -> enqueueMarkReachableDirectAction
-    1:2:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):203:204 -> enqueueMarkReachableFieldAction
-    1:1:void enqueueMarkReachableInterfaceAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):194:194 -> enqueueMarkReachableInterfaceAction
-    1:1:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):198:198 -> enqueueMarkReachableSuperAction
-    1:1:void enqueueMarkReachableVirtualAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):190:190 -> enqueueMarkReachableVirtualAction
-    1:1:boolean isEmpty():178:178 -> isEmpty
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action poll():182:182 -> poll
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):162:162 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.AppView):160:163 -> <init>
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist createWorklist(com.android.tools.r8.graph.AppView):167:167 -> createWorklist
+    1:2:void enqueueMarkFieldKeptAction(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):220:221 -> enqueueMarkFieldKeptAction
+    1:2:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):204:205 -> enqueueMarkInstantiatedAction
+    1:2:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):215:216 -> enqueueMarkMethodKeptAction
+    1:2:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):210:211 -> enqueueMarkMethodLiveAction
+    1:1:void enqueueMarkReachableDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):179:179 -> enqueueMarkReachableDirectAction
+    1:2:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):196:197 -> enqueueMarkReachableFieldAction
+    1:1:void enqueueMarkReachableInterfaceAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):187:187 -> enqueueMarkReachableInterfaceAction
+    1:1:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):191:191 -> enqueueMarkReachableSuperAction
+    1:1:void enqueueMarkReachableVirtualAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):183:183 -> enqueueMarkReachableVirtualAction
+    1:1:boolean isEmpty():171:171 -> isEmpty
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist$Action poll():175:175 -> poll
 com.android.tools.r8.shaking.EnqueuerWorklist$Action -> com.android.tools.r8.shaking.EnqueuerWorklist$Action:
-    1:1:void <init>():18:18 -> <init>
+    1:1:void <init>():17:17 -> <init>
 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):154:157 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):162:162 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):148:150 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):155:155 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction:
-    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):103:106 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):111:111 -> run
+    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):102:105 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):110:110 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction:
-    1:4:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):136:139 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):144:144 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):133:135 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):140:140 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):119:121 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):126:126 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):118:120 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):125:125 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):26:28 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):33:33 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):25:27 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):32:32 -> 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):86:88 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):93:93 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):85:87 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):92:92 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableInterfaceAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableInterfaceAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):56:58 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):63:63 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):55:57 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):62:62 -> 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.DexEncodedMethod):71:73 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):78:78 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):70:72 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):77:77 -> run
 com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableVirtualAction -> com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableVirtualAction:
-    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):41:43 -> <init>
-    1:1:void run(com.android.tools.r8.shaking.Enqueuer):48:48 -> run
+    1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):40:42 -> <init>
+    1:1:void run(com.android.tools.r8.shaking.Enqueuer):47:47 -> 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>
@@ -52277,50 +52146,49 @@
     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.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$0(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):393:393 -> a
-    2:6:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):400:404 -> a
-    7:7:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):412:412 -> a
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo lambda$getEdgeInfo$0(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):383:383 -> a
+    2:6:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):390:394 -> a
+    7:7:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):402:402 -> a
     8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    8:8:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):412 -> a
-    9:11:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):413:415 -> a
-    12:12:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):423:423 -> a
+    8:8:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):402 -> a
+    9:11:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$2(com.android.tools.r8.graph.DexType):403:405 -> a
+    12:12:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):413:413 -> a
     13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    13:13:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):423 -> a
-    14:26:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):424:436 -> a
-    27:27:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):430:430 -> a
-    28:28:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):444:444 -> a
+    13:13:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):413 -> a
+    14:26:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):414:426 -> a
+    27:27:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):420:420 -> a
+    28:28:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):434:434 -> a
     29:29:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    29:29:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):444 -> a
-    30:35:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):445:450 -> a
-    36:36:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):447:447 -> a
-    37:37: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):468:468 -> a
-    38:42:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):476:480 -> a
-    1:1:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):397:397 -> getAnnotationGraphNode
-    1:1:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):409:409 -> getClassGraphNode
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):389:389 -> getEdgeInfo
-    2:2:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):393:393 -> getEdgeInfo
-    1:1:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):441:441 -> getFieldGraphNode
-    1:10:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):376:385 -> getGraphNode
-    1:21:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):463:483 -> getKeepRuleGraphNode
-    1:1:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):420:420 -> getMethodGraphNode
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):372:372 -> getSourceNode
-    1:1:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):367:367 -> isNonProgramClass
+    29:29:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):434 -> a
+    30:35:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):435:440 -> a
+    36:36:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):437:437 -> a
+    37:37: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):458:458 -> a
+    38:42:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):466:470 -> a
+    1:1:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):387:387 -> getAnnotationGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.ClassGraphNode getClassGraphNode(com.android.tools.r8.graph.DexType):399:399 -> getClassGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):379:379 -> getEdgeInfo
+    2:2:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):383:383 -> getEdgeInfo
+    1:1:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):431:431 -> getFieldGraphNode
+    1:10:com.android.tools.r8.experimental.graphinfo.GraphNode getGraphNode(com.android.tools.r8.graph.DexReference):366:375 -> getGraphNode
+    1:21:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):453:473 -> getKeepRuleGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):410:410 -> getMethodGraphNode
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):362:362 -> getSourceNode
+    1:1:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):357:357 -> isNonProgramClass
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> isNonProgramClass
-    2:2:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):367 -> isNonProgramClass
-    3:3:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):368:368 -> isNonProgramClass
-    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):330:333 -> registerAnnotation
-    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):323:326 -> registerClass
-    1:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):356:363 -> registerEdge
-    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):349:352 -> registerField
-    1:5:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):315:319 -> registerInterface
-    1:9:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):337:345 -> registerMethod
-    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):203:208 -> reportClassReferencedFrom
-    7:12:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):213:218 -> reportClassReferencedFrom
-    13:18:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):222:227 -> reportClassReferencedFrom
-    1:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):254:260 -> reportCompanionClass
-    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):259:259 -> reportCompanionClass
-    1:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):265:271 -> reportCompanionMethod
-    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):269:269 -> reportCompanionMethod
+    2:2:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):357 -> isNonProgramClass
+    3:3:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):358:358 -> isNonProgramClass
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):320:323 -> registerAnnotation
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):313:316 -> registerClass
+    1:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):346:353 -> registerEdge
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):339:342 -> registerField
+    1:5:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):305:309 -> registerInterface
+    1:9:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):327:335 -> registerMethod
+    1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):203:208 -> reportClassReferencedFrom
+    7:12:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):212:217 -> reportClassReferencedFrom
+    1:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):244:250 -> reportCompanionClass
+    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):249:249 -> reportCompanionClass
+    1:7:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):255:261 -> reportCompanionMethod
+    8:8:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):259:259 -> reportCompanionMethod
     1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):192:195 -> reportCompatInstantiated
     5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):193:198 -> reportCompatInstantiated
     1:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):170:171 -> reportCompatKeepDefaultInitializer
@@ -52332,7 +52200,7 @@
     6:9:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):172:175 -> reportCompatKeepDefaultInitializer
     10:15:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):173:178 -> reportCompatKeepDefaultInitializer
     1:6:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:187 -> 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):276:278 -> reportEdge
+    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):266:268 -> 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):107:112 -> 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):117:123 -> 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):149:154 -> reportKeepField
@@ -52340,17 +52208,17 @@
     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):128:133 -> 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):138:144 -> reportKeepMethod
     1:7:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind reportPrecondition(com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode):96:102 -> reportPrecondition
-    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):232:235 -> reportReachableMethodAsLive
-    5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):233:238 -> reportReachableMethodAsLive
-    11:18:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):243:250 -> reportReachableMethodAsLive
-    1:6:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):306:311 -> skipReporting
+    1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):222:225 -> reportReachableMethodAsLive
+    5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.Enqueuer$MarkedResolutionTarget):223:228 -> reportReachableMethodAsLive
+    11:18:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set):233:240 -> reportReachableMethodAsLive
+    1:6:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):296:301 -> skipReporting
     1:21:boolean verifyRootedPath(com.android.tools.r8.graph.DexProgramClass):71:91 -> verifyRootedPath
 com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness:
-    1:1:void <clinit>():288:288 -> <clinit>
-    1:1:void <init>():290:290 -> <init>
-    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():286:286 -> access$000
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():296:296 -> edgeKind
-    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):301:301 -> getSourceNode
+    1:1:void <clinit>():278:278 -> <clinit>
+    1:1:void <init>():280:280 -> <init>
+    1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():276:276 -> access$000
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():286:286 -> edgeKind
+    1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):291:291 -> 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
@@ -53785,10 +53653,10 @@
     13:23:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithSubtyping,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):454:464 -> 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):489:497 -> markMatchingVisibleFields
     1:24:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):405:428 -> markMatchingVisibleMethods
-    1:7:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):758:764 -> markMethod
-    8:8:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethod
-    8:8:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):765 -> markMethod
-    9:11:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):769:771 -> markMethod
+    1:8:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):758:765 -> markMethod
+    9:9:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> markMethod
+    9:9:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):765 -> markMethod
+    10:12:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):769:771 -> markMethod
     1:59:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):114:172 -> process
     60:79:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):149:168 -> process
     80:158:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):142:220 -> process
@@ -53892,47 +53760,48 @@
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult[] values():16:16 -> values
 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:boolean lambda$mayMergeAcrossPackageBoundaries$2(com.android.tools.r8.graph.DexEncodedMethod):431:431 -> a
-    2:2:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedField):435:435 -> a
-    3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeMethods$5(com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexEncodedMethod):496:496 -> a
-    4:4:boolean lambda$mergeMethods$6(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):500:500 -> a
-    5:5:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeFields$7(com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexEncodedField):533:533 -> a
-    6:6:boolean lambda$mergeFields$8(java.util.Set,com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexField):537:537 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):210:210 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses):200:219 -> <init>
+    1:1:boolean lambda$mayMergeAcrossPackageBoundaries$2(com.android.tools.r8.graph.DexEncodedMethod):461:461 -> a
+    2:2:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedField):465:465 -> a
+    3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeMethods$5(com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexEncodedMethod):526:526 -> a
+    4:4:boolean lambda$mergeMethods$6(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):530:530 -> a
+    5:5:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeFields$7(com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexEncodedField):563:563 -> a
+    6:6:boolean lambda$mergeFields$8(java.util.Set,com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexField):567:567 -> a
     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:1:boolean lambda$satisfiesMergeCriteria$0(com.android.tools.r8.graph.DexEncodedField):278:278 -> b
-    2:2:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedMethod):443:443 -> b
-    1:13:com.android.tools.r8.graph.GraphLense buildGraphLense():246:258 -> buildGraphLense
-    14:23:com.android.tools.r8.graph.GraphLense buildGraphLense():247:256 -> buildGraphLense
-    1:6:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):294:299 -> c
-    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:25:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):426:450 -> mayMergeAcrossPackageBoundaries
-    1:8:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):328:335 -> merge
-    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):521:551 -> mergeFields
-    1:20:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):493:512 -> mergeMethods
-    1:6:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):459:464 -> moveMembersFromSourceToTarget
-    7:23:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):460:476 -> moveMembersFromSourceToTarget
-    24:27:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):475:478 -> moveMembersFromSourceToTarget
-    28:31:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):477:480 -> moveMembersFromSourceToTarget
-    32:38:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):479:485 -> 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):579:591 -> 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):559:572 -> renameMethodIfNeeded
-    1:12:com.android.tools.r8.graph.GraphLense run():229:240 -> run
-    13:19:com.android.tools.r8.graph.GraphLense run():236:242 -> run
-    1:41:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):262:302 -> satisfiesMergeCriteria
+    1:1:boolean lambda$satisfiesMergeCriteria$0(com.android.tools.r8.graph.DexEncodedField):272:272 -> b
+    2:2:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedMethod):473:473 -> b
+    1:13:com.android.tools.r8.graph.GraphLense buildGraphLense():240:252 -> buildGraphLense
+    14:23:com.android.tools.r8.graph.GraphLense buildGraphLense():241:250 -> buildGraphLense
+    1:6:boolean lambda$satisfiesMergeCriteria$1(com.android.tools.r8.graph.DexEncodedMethod):288:293 -> c
+    1:6:void clearRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):442:447 -> clearRepresentative
+    7:11:void clearRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key):446:450 -> 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):409:417 -> getOrCreateRepresentative
+    1:1:boolean isValidRepresentative(com.android.tools.r8.graph.DexProgramClass):318:318 -> isValidRepresentative
+    1:25:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):456:480 -> mayMergeAcrossPackageBoundaries
+    1:7:boolean merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):322:328 -> merge
+    1:31:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):551:581 -> mergeFields
+    1:30:boolean mergeGlobally(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):332:361 -> mergeGlobally
+    1:8:boolean mergeInsidePackage(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):368:375 -> mergeInsidePackage
+    9:40:boolean mergeInsidePackage(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):372:403 -> mergeInsidePackage
+    1:20:java.util.List mergeMethods(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):523:542 -> mergeMethods
+    1:6:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):489:494 -> moveMembersFromSourceToTarget
+    7:23:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):490:506 -> moveMembersFromSourceToTarget
+    24:27:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505:508 -> moveMembersFromSourceToTarget
+    28:31:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):507:510 -> moveMembersFromSourceToTarget
+    32:38:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):509:515 -> 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):609:621 -> 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):589:602 -> renameMethodIfNeeded
+    1:12:com.android.tools.r8.graph.GraphLense run():223:234 -> run
+    13:19:com.android.tools.r8.graph.GraphLense run():230:236 -> run
+    1:41:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):256:296 -> satisfiesMergeCriteria
     42:42:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> satisfiesMergeCriteria
-    42:42:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):302 -> satisfiesMergeCriteria
-    43:53:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):309:319 -> satisfiesMergeCriteria
-    1:8:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):391:398 -> setRepresentative
-    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
+    42:42:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):296 -> satisfiesMergeCriteria
+    43:53:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup satisfiesMergeCriteria(com.android.tools.r8.graph.DexProgramClass):303:313 -> satisfiesMergeCriteria
+    1:8:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):421:428 -> setRepresentative
+    9:20:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):424:435 -> setRepresentative
+    21:29:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeGroup$Key,com.android.tools.r8.shaking.StaticClassMerger$Representative):430:438 -> setRepresentative
 com.android.tools.r8.shaking.StaticClassMerger$1 -> com.android.tools.r8.shaking.StaticClassMerger$1:
     1:1:void <clinit>():113:113 -> <clinit>
 com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.shaking.StaticClassMerger$MergeGroup:
@@ -53948,67 +53817,63 @@
     1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup[] values():61:61 -> 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
 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 <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):160:160 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.StaticClassMerger,com.android.tools.r8.graph.DexProgramClass):157:162 -> <init>
+    1:1:com.android.tools.r8.graph.DexProgramClass access$200(com.android.tools.r8.shaking.StaticClassMerger$Representative):151:151 -> access$200
+    1:7:void include(com.android.tools.r8.graph.DexProgramClass):167:173 -> include
+    1:5:boolean isFull():183:187 -> isFull
 com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.shaking.TreePruner:
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):41:41 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):38:51 -> <init>
-    1:1:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):49:49 -> a
-    2:2:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):198:198 -> a
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):40:40 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView):37:50 -> <init>
+    1:1:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):48:48 -> a
+    2:2:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):188:188 -> a
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> a
-    3:3:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):198 -> a
-    4:4:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):199:199 -> a
-    5:5:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):254:254 -> a
-    6:6:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):312:312 -> a
-    1:1:void claimNestOwnership(com.android.tools.r8.graph.DexClass):203:203 -> claimNestOwnership
+    3:3:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):188 -> a
+    4:4:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):189:189 -> a
+    5:5:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):244:244 -> a
+    6:6:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):302:302 -> a
+    1:1:void claimNestOwnership(com.android.tools.r8.graph.DexClass):193:193 -> claimNestOwnership
     2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> claimNestOwnership
-    2:2:void claimNestOwnership(com.android.tools.r8.graph.DexClass):203 -> claimNestOwnership
-    3:6:void claimNestOwnership(com.android.tools.r8.graph.DexClass):208:211 -> claimNestOwnership
+    2:2:void claimNestOwnership(com.android.tools.r8.graph.DexClass):193 -> claimNestOwnership
+    3:6:void claimNestOwnership(com.android.tools.r8.graph.DexClass):198:201 -> claimNestOwnership
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> claimNestOwnership
-    7:7:void claimNestOwnership(com.android.tools.r8.graph.DexClass):211 -> claimNestOwnership
-    8:14:void claimNestOwnership(com.android.tools.r8.graph.DexClass):213:219 -> claimNestOwnership
-    1:2:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):195:196 -> clearDeadNestMembers
-    1:2:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):242:243 -> firstUnreachableIndex
-    1:1:java.util.Collection getMethodsToKeepForConfigurationDebugging():347:347 -> getMethodsToKeepForConfigurationDebugging
-    1:35:java.util.List getNewProgramClasses(java.util.List):71:105 -> getNewProgramClasses
-    1:1:java.util.Collection getRemovedClasses():343:343 -> getRemovedClasses
-    1:4:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):225:228 -> isAttributeReferencingPrunedItem
-    1:6:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):232:237 -> isAttributeReferencingPrunedType
-    1:1:boolean isTypeLive(com.android.tools.r8.graph.DexType):189:189 -> isTypeLive
-    1:22:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):150:171 -> pruneMembersAndAttributes
-    1:20:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):113:132 -> pruneUnusedInterfaces
-    1:30:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):310:339 -> reachableFields
-    1:15:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):251:265 -> reachableMethods
+    7:7:void claimNestOwnership(com.android.tools.r8.graph.DexClass):201 -> claimNestOwnership
+    8:14:void claimNestOwnership(com.android.tools.r8.graph.DexClass):203:209 -> claimNestOwnership
+    1:2:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):185:186 -> clearDeadNestMembers
+    1:2:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):232:233 -> firstUnreachableIndex
+    1:1:java.util.Collection getMethodsToKeepForConfigurationDebugging():337:337 -> getMethodsToKeepForConfigurationDebugging
+    1:35:java.util.List getNewProgramClasses(java.util.List):70:104 -> getNewProgramClasses
+    1:1:java.util.Collection getRemovedClasses():333:333 -> getRemovedClasses
+    1:4:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):215:218 -> isAttributeReferencingPrunedItem
+    1:6:boolean isAttributeReferencingPrunedType(com.android.tools.r8.graph.InnerClassAttribute):222:227 -> isAttributeReferencingPrunedType
+    1:1:boolean isTypeLive(com.android.tools.r8.graph.DexType):179:179 -> isTypeLive
+    1:22:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):140:161 -> pruneMembersAndAttributes
+    1:25:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):112:136 -> pruneUnusedInterfaces
+    1:30:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):300:329 -> reachableFields
+    1:15:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):241:255 -> reachableMethods
     16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> reachableMethods
-    16:16:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):265 -> reachableMethods
-    17:24:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):265:272 -> reachableMethods
-    25:30:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):269:274 -> reachableMethods
+    16:16:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255 -> reachableMethods
+    17:24:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):255:262 -> reachableMethods
+    25:30:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):259:264 -> reachableMethods
     31:31:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexEncodedMethod.getKey():1058:1058 -> reachableMethods
-    31:31:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):274 -> reachableMethods
-    32:54:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):274:296 -> reachableMethods
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> reachableMethods
+    31:31:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264 -> reachableMethods
+    32:54:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):264:286 -> reachableMethods
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> reachableMethods
     55:55:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> reachableMethods
-    55:55:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):296 -> reachableMethods
+    55:55:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> reachableMethods
     56:57:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> reachableMethods
-    56:57:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):296 -> reachableMethods
-    58:69:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):295:306 -> reachableMethods
-    1:2:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):66:67 -> removeUnused
-    1:8:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):137:144 -> retainReachableInterfacesFrom
-    1:9:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):175:183 -> rewriteNestAttributes
-    1:6:com.android.tools.r8.graph.DexApplication run():55:60 -> run
+    56:57:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):286 -> reachableMethods
+    58:69:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):285:296 -> reachableMethods
+    1:2:com.android.tools.r8.graph.DexApplication$Builder removeUnused(com.android.tools.r8.graph.DexApplication):65:66 -> removeUnused
+    1:9:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):165:173 -> rewriteNestAttributes
+    1:6:com.android.tools.r8.graph.DexApplication run():54:59 -> run
 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>
@@ -54033,216 +53898,211 @@
 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>():89:89 -> <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):258:258 -> <init>
-    2:41:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):231:270 -> <init>
-    1:1:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):475:475 -> a
-    1:1:java.util.Set access$100(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$100
-    1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1000
-    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1100(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1100
-    1:1:void access$1200(com.android.tools.r8.graph.DexEncodedMethod):89:89 -> access$1200
-    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1300(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1300
-    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1400
-    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1500
-    1:1:com.android.tools.r8.graph.DexApplication access$1600(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1600
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1700(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1700
-    1:1:java.util.List access$1800(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1800
-    1:1:java.util.Collection access$1900(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$1900
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$200
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$300
-    1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):89:89 -> access$900
-    1:17:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1679:1695 -> disallowInlining
-    18:26:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1694:1702 -> disallowInlining
-    1:18:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):333:350 -> extractPinnedItems
-    1:18:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):887:904 -> fieldResolutionMayChange
-    1:4:java.util.Collection getInvokes():571:574 -> getInvokes
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses getMergedClasses():274:274 -> getMergedClasses
-    1:1:java.util.Collection getRemovedClasses():2001:2001 -> getRemovedClasses
-    1:3:void initializeMergeCandidates(java.lang.Iterable):278:280 -> initializeMergeCandidates
-    1:39:void initializePinnedTypes(java.lang.Iterable):290:328 -> initializePinnedTypes
-    1:9:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):379:387 -> isMergeCandidate
-    10:10:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> isMergeCandidate
-    10:10:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387 -> isMergeCandidate
-    11:13:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387:389 -> isMergeCandidate
-    14:71:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):387:444 -> isMergeCandidate
-    72:72:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> isMergeCandidate
-    72:72:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):444 -> isMergeCandidate
-    73:75:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):447:449 -> isMergeCandidate
-    76:77:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):439:440 -> isMergeCandidate
-    1:17:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):460:476 -> isStillMergeCandidate
+    1:1:void <clinit>():88:88 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):249:249 -> <init>
+    2:41:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexClasses):222:261 -> <init>
+    1:1:boolean lambda$isStillMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):464:464 -> a
+    1:1:java.util.Set access$100(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$100
+    1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1000
+    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1100(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1100
+    1:1:void access$1200(com.android.tools.r8.graph.DexEncodedMethod):88:88 -> access$1200
+    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1300(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1300
+    1:1:java.util.Map access$1400(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1400
+    1:1:java.util.Map access$1500(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1500
+    1:1:com.android.tools.r8.graph.DexApplication access$1600(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1600
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder access$1700(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1700
+    1:1:java.util.List access$1800(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1800
+    1:1:java.util.Collection access$1900(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$1900
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$200
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$300
+    1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):88:88 -> access$900
+    1:10:boolean disallowInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):1655:1664 -> disallowInlining
+    1:18:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):324:341 -> 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():549:552 -> getInvokes
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses getMergedClasses():265:265 -> getMergedClasses
+    1:1:java.util.Collection getRemovedClasses():1967:1967 -> getRemovedClasses
+    1:3:void initializeMergeCandidates(java.lang.Iterable):269:271 -> initializeMergeCandidates
+    1:39:void initializePinnedTypes(java.lang.Iterable):281:319 -> initializePinnedTypes
+    1:64:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):370:433 -> isMergeCandidate
+    65:65:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> isMergeCandidate
+    65:65:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):433 -> isMergeCandidate
+    66:68:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):436:438 -> isMergeCandidate
+    69:70:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,java.util.Set):428:429 -> isMergeCandidate
+    1:17:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):449:465 -> isStillMergeCandidate
     18:18:boolean com.android.tools.r8.graph.DexClass.classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):737:737 -> isStillMergeCandidate
-    18:18:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):476 -> isStillMergeCandidate
-    19:53:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):483:517 -> isStillMergeCandidate
-    54:55:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):496:497 -> isStillMergeCandidate
-    56:57:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):478:479 -> isStillMergeCandidate
-    1:4:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1461:1464 -> makePrivate
-    1:14:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):357:370 -> markTypeAsPinned
-    1:66:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):810:875 -> mergeClassIfPossible
-    67:77:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):871:881 -> mergeClassIfPossible
-    78:78:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):877:877 -> mergeClassIfPossible
-    79:79:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):862:862 -> mergeClassIfPossible
-    1:38:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):525:562 -> mergeMayLeadToIllegalAccesses
-    1:46:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):753:798 -> methodResolutionMayChange
-    1:16:com.android.tools.r8.graph.GraphLense run():669:684 -> run
-    17:22:com.android.tools.r8.graph.GraphLense run():680:685 -> run
-    1:57:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):690:746 -> verifyGraphLense
+    18:18:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):465 -> isStillMergeCandidate
+    19:42:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):472:495 -> isStillMergeCandidate
+    43:44:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):474:475 -> isStillMergeCandidate
+    45:46:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass):467:468 -> isStillMergeCandidate
+    1:4:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1439:1442 -> makePrivate
+    1:14:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):348:361 -> markTypeAsPinned
+    1:66:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):788:853 -> mergeClassIfPossible
+    67:77:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):849:859 -> mergeClassIfPossible
+    78:78:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):855:855 -> mergeClassIfPossible
+    79:79:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):840:840 -> mergeClassIfPossible
+    1:38:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):503:540 -> mergeMayLeadToIllegalAccesses
+    1:46:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):731:776 -> methodResolutionMayChange
+    1:16:com.android.tools.r8.graph.GraphLense run():647:662 -> run
+    17:22:com.android.tools.r8.graph.GraphLense run():658:663 -> run
+    1:57:boolean verifyGraphLense(com.android.tools.r8.graph.GraphLense):668:724 -> verifyGraphLense
 com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.shaking.VerticalClassMerger$1:
-    1:1:void <clinit>():1984:1984 -> <clinit>
-    2:2:void <clinit>():1401:1401 -> <clinit>
-    3:3:void <clinit>():155:155 -> <clinit>
+    1:1:void <clinit>():1950:1950 -> <clinit>
+    2:2:void <clinit>():1379:1379 -> <clinit>
+    3:3:void <clinit>():152:152 -> <clinit>
 com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.shaking.VerticalClassMerger$AbortReason:
-    1:19:void <clinit>():129:147 -> <clinit>
-    20:20:void <clinit>():129:129 -> <clinit>
-    1:1:void <init>(java.lang.String,int):129:129 -> <init>
-    1:59:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):155:213 -> getMessageForClass
-    60:60:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):211:211 -> getMessageForClass
-    1:1:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):150:150 -> printLogMessageForClass
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason valueOf(java.lang.String):129:129 -> valueOf
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():129:129 -> values
+    1:17:void <clinit>():128:144 -> <clinit>
+    18:18:void <clinit>():128:128 -> <clinit>
+    1:1:void <init>(java.lang.String,int):128:128 -> <init>
+    1:53:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):152:204 -> getMessageForClass
+    54:54:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):202:202 -> getMessageForClass
+    1:1:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):147:147 -> printLogMessageForClass
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason valueOf(java.lang.String):128:128 -> valueOf
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason[] values():128:128 -> values
 com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger:
-    1:1:void <clinit>():915:915 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):915:915 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):927:927 -> <init>
-    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):921:929 -> <init>
-    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):944:947 -> a
-    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1021:1023 -> a
-    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1022:1022 -> a
-    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1084:1084 -> a
-    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1128:1128 -> a
-    11:12:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1136:1137 -> a
-    1:1:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1309:1309 -> add
-    1:2:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1314:1315 -> addAll
-    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1141:1142 -> b
-    1:1:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1235:1235 -> blockRedirectionOfSuperCalls
-    1:34:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1240:1273 -> buildBridgeMethod
-    1:1:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1146:1146 -> c
-    1:21:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1280:1300 -> findMethodInTarget
-    22:22:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1295:1295 -> findMethodInTarget
-    1:5:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1352:1356 -> getFreshName
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1151:1151 -> getRenamings
-    1:1:java.util.List getSynthesizedBridges():1155:1155 -> getSynthesizedBridges
-    1:5:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1451:1455 -> makeStatic
-    1:20:boolean merge():936:955 -> merge
-    21:30:boolean merge():952:961 -> merge
-    31:57:boolean merge():958:984 -> merge
-    58:70:boolean merge():983:995 -> merge
+    1:1:void <clinit>():893:893 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.VerticalClassMerger$1):893:893 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):905:905 -> <init>
+    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):899:907 -> <init>
+    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):922:925 -> a
+    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):999:1001 -> a
+    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1000:1000 -> a
+    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1062:1062 -> a
+    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1106:1106 -> a
+    11:12:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1114:1115 -> a
+    1:1:void add(java.util.Map,com.android.tools.r8.graph.KeyedDexItem,com.android.tools.r8.com.google.common.base.Equivalence):1287:1287 -> add
+    1:2:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1292:1293 -> addAll
+    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1119:1120 -> b
+    1:1:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1213:1213 -> blockRedirectionOfSuperCalls
+    1:34:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1218:1251 -> buildBridgeMethod
+    1:1:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1124:1124 -> c
+    1:21:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1258:1278 -> findMethodInTarget
+    22:22:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1273:1273 -> findMethodInTarget
+    1:5:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1330:1334 -> getFreshName
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLense$Builder getRenamings():1129:1129 -> getRenamings
+    1:1:java.util.List getSynthesizedBridges():1133:1133 -> getSynthesizedBridges
+    1:5:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1429:1433 -> makeStatic
+    1:20:boolean merge():914:933 -> merge
+    21:30:boolean merge():930:939 -> merge
+    31:57:boolean merge():936:962 -> merge
+    58:70:boolean merge():961:973 -> merge
     71:71:boolean com.android.tools.r8.graph.DexClass.isAbstract():589:589 -> merge
-    71:71:boolean merge():996 -> merge
-    72:74:boolean merge():997:999 -> merge
-    75:75:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():335:335 -> merge
+    71:71:boolean merge():974 -> merge
+    72:74:boolean merge():975:977 -> merge
+    75:75:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():332:332 -> merge
     75:75:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):666 -> merge
-    75:75:boolean merge():999 -> merge
+    75:75:boolean merge():977 -> merge
     76:77:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):667:668 -> merge
-    76:77:boolean merge():999 -> merge
-    78:104:boolean merge():1001:1027 -> merge
-    105:152:boolean merge():1018:1065 -> merge
-    153:178:boolean merge():1064:1089 -> merge
-    179:188:boolean merge():1087:1096 -> merge
-    189:224:boolean merge():1094:1129 -> merge
-    1:3:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1320:1322 -> mergeArrays
-    1:13:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1331:1343 -> mergeFields
-    1:55:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1159:1213 -> redirectSuperCallsInTarget
-    1:20:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1361:1380 -> renameConstructor
-    1:16:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1432:1447 -> 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):1386:1386 -> 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):1396:1424 -> 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):1403:1427 -> renameMethod
-    1:13:boolean restoreDebuggingState(java.util.stream.Stream):1134:1146 -> restoreDebuggingState
-    14:14:boolean restoreDebuggingState(java.util.stream.Stream):1145:1145 -> restoreDebuggingState
+    76:77:boolean merge():977 -> merge
+    78:104:boolean merge():979:1005 -> merge
+    105:152:boolean merge():996:1043 -> merge
+    153:178:boolean merge():1042:1067 -> merge
+    179:188:boolean merge():1065:1074 -> merge
+    189:224:boolean merge():1072:1107 -> merge
+    1:3:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1298:1300 -> mergeArrays
+    1:13:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1309:1321 -> mergeFields
+    1:55:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1137:1191 -> redirectSuperCallsInTarget
+    1:20:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1339:1358 -> renameConstructor
+    1:16:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1410:1425 -> 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):1364:1364 -> 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):1374:1402 -> 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):1381:1405 -> renameMethod
+    1:13:boolean restoreDebuggingState(java.util.stream.Stream):1112:1124 -> restoreDebuggingState
+    14:14:boolean restoreDebuggingState(java.util.stream.Stream):1123:1123 -> restoreDebuggingState
 com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector:
-    1:1:void <clinit>():1568:1568 -> <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):1568:1568 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1579:1579 -> <init>
-    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1573:1585 -> <init>
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1622:1623 -> a
-    1:32:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1642:1673 -> computePositionsFor
-    1:18:void fillSeenPositions():1615:1632 -> fillSeenPositions
-    1:22:boolean mayCollide():1589:1610 -> mayCollide
+    1:1:void <clinit>():1544:1544 -> <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):1544:1544 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1555:1555 -> <init>
+    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1549:1561 -> <init>
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1598:1599 -> a
+    1:32:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1618:1649 -> computePositionsFor
+    1:18:void fillSeenPositions():1591:1608 -> fillSeenPositions
+    1:22:boolean mayCollide():1565:1586 -> mayCollide
 com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector:
-    1:1:void <clinit>():1787:1787 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1796:1796 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1789:1798 -> <init>
-    1:8:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1810:1817 -> checkFieldReference
+    1:1:void <clinit>():1753:1753 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1762:1762 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1755:1764 -> <init>
+    1:8:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1776:1783 -> checkFieldReference
     9:9:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexField):158:158 -> checkFieldReference
-    9:9:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1817 -> checkFieldReference
-    10:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1818:1819 -> checkFieldReference
-    1:10:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1827:1836 -> checkMethodReference
+    9:9:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1783 -> checkFieldReference
+    10:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):1784:1785 -> checkFieldReference
+    1:10:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1793:1802 -> checkMethodReference
     11:11:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexMethod):163:163 -> checkMethodReference
-    11:11:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1836 -> checkMethodReference
-    12:13:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1837:1838 -> checkMethodReference
-    1:5:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1846:1850 -> checkTypeReference
+    11:11:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1802 -> checkMethodReference
+    12:13:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod):1803:1804 -> checkMethodReference
+    1:5:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1812:1816 -> checkTypeReference
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> checkTypeReference
-    6:6:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1850 -> checkTypeReference
-    7:8:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1851:1852 -> checkTypeReference
-    1:1:boolean foundIllegalAccess():1802:1802 -> foundIllegalAccess
-    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1906:1906 -> registerInstanceFieldRead
-    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1901:1901 -> registerInstanceFieldWrite
-    1:4:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1869:1872 -> registerInvokeDirect
-    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1885:1888 -> registerInvokeInterface
-    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1877:1880 -> registerInvokeStatic
-    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1893:1896 -> registerInvokeSuper
-    1:4:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1861:1864 -> registerInvokeVirtual
-    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1911:1911 -> registerNewInstance
-    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1916:1916 -> registerStaticFieldRead
-    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1921:1921 -> registerStaticFieldWrite
-    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1926:1926 -> registerTypeReference
-    1:1:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1806:1806 -> setContext
+    6:6:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1816 -> checkTypeReference
+    7:8:boolean checkTypeReference(com.android.tools.r8.graph.DexType):1817:1818 -> checkTypeReference
+    1:1:boolean foundIllegalAccess():1768:1768 -> foundIllegalAccess
+    1:1:boolean registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1872:1872 -> registerInstanceFieldRead
+    1:1:boolean registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1867:1867 -> registerInstanceFieldWrite
+    1:4:boolean registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1835:1838 -> registerInvokeDirect
+    1:4:boolean registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1851:1854 -> registerInvokeInterface
+    1:4:boolean registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1843:1846 -> registerInvokeStatic
+    1:4:boolean registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1859:1862 -> registerInvokeSuper
+    1:4:boolean registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1827:1830 -> registerInvokeVirtual
+    1:1:boolean registerNewInstance(com.android.tools.r8.graph.DexType):1877:1877 -> registerNewInstance
+    1:1:boolean registerStaticFieldRead(com.android.tools.r8.graph.DexField):1882:1882 -> registerStaticFieldRead
+    1:1:boolean registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1887:1887 -> registerStaticFieldWrite
+    1:1:boolean registerTypeReference(com.android.tools.r8.graph.DexType):1892:1892 -> registerTypeReference
+    1:1:void setContext(com.android.tools.r8.graph.DexEncodedMethod):1772:1772 -> setContext
 com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever:
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):585:585 -> <init>
-    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):580:587 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):610:610 -> a
-    1:35:java.util.Collection get():592:626 -> get
-    1:15:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):634:648 -> protoMayReferenceMergedSourceOrTarget
-    1:8:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):654:661 -> typeMayReferenceMergedSourceOrTarget
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):563:563 -> <init>
+    2:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):558:565 -> <init>
+    1:1:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):588:588 -> a
+    1:35:java.util.Collection get():570:604 -> get
+    1:15:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):612:626 -> protoMayReferenceMergedSourceOrTarget
+    1:8:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):632:639 -> typeMayReferenceMergedSourceOrTarget
 com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.shaking.VerticalClassMerger$Rename:
-    1:3:void <clinit>():218:220 -> <clinit>
-    4:4:void <clinit>():217:217 -> <clinit>
-    1:1:void <init>(java.lang.String,int):217:217 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename valueOf(java.lang.String):217:217 -> valueOf
-    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():217:217 -> values
+    1:3:void <clinit>():209:211 -> <clinit>
+    4:4:void <clinit>():208:208 -> <clinit>
+    1:1:void <init>(java.lang.String,int):208:208 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename valueOf(java.lang.String):208:208 -> valueOf
+    1:1:com.android.tools.r8.shaking.VerticalClassMerger$Rename[] values():208:208 -> values
 com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense -> com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLense:
-    1:1:void <clinit>():1705:1705 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1710:1712 -> <init>
-    1:1:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1722:1722 -> getOriginalFieldSignature
-    1:1:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1727:1727 -> getOriginalMethodSignature
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1717:1717 -> getOriginalType
-    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1732:1732 -> getRenamedFieldSignature
-    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1737:1737 -> getRenamedMethodSignature
-    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1776:1776 -> 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):1749:1766 -> lookupMethod
-    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1771:1771 -> lookupPrototypeChanges
-    1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1742:1742 -> lookupType
+    1:1:void <clinit>():1671:1671 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1676:1678 -> <init>
+    1:1:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1688:1688 -> getOriginalFieldSignature
+    1:1:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1693:1693 -> getOriginalMethodSignature
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1683:1683 -> getOriginalType
+    1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1698:1698 -> getRenamedFieldSignature
+    1:1:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):1703:1703 -> getRenamedMethodSignature
+    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1742:1742 -> lookupField
+    1:18:com.android.tools.r8.graph.GraphLense$GraphLenseLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1715:1732 -> lookupMethod
+    1:1:com.android.tools.r8.graph.GraphLense$RewrittenPrototypeDescription lookupPrototypeChanges(com.android.tools.r8.graph.DexMethod):1737:1737 -> lookupPrototypeChanges
+    1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):1708:1708 -> lookupType
 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):1943:1948 -> <init>
-    1:11:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1984:1994 -> a
-    12:12:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1986:1986 -> a
-    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1930:1930 -> access$600
-    1:1:java.util.function.Consumer getRegistryCallback():1983:1983 -> getRegistryCallback
-    1:10:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1969:1978 -> getSourceCodeProvider
-    1:2:void updateMethodSignatures(java.util.function.Function):1963:1964 -> updateMethodSignatures
+    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):1909:1914 -> <init>
+    1:11:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1950:1960 -> a
+    12:12:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):1952:1952 -> a
+    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1896:1896 -> access$600
+    1:1:java.util.function.Consumer getRegistryCallback():1949:1949 -> getRegistryCallback
+    1:10:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():1935:1944 -> getSourceCodeProvider
+    1:2:void updateMethodSignatures(java.util.function.Function):1929:1930 -> updateMethodSignatures
 com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer:
-    1:5:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1467:1471 -> <init>
-    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1470:1472 -> <init>
-    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1467:1467 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLense access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1467:1467 -> access$500
-    1:11:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1511:1521 -> fixupFields
-    1:2:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1527:1528 -> fixupMethod
-    3:3:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1527:1527 -> fixupMethod
-    1:9:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1494:1502 -> fixupMethods
-    1:6:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1532:1537 -> fixupProto
-    1:11:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1543:1553 -> fixupType
-    1:11:com.android.tools.r8.graph.GraphLense fixupTypeReferences():1476:1486 -> fixupTypeReferences
-    1:3:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1560:1562 -> fixupTypes
+    1:5:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1445:1449 -> <init>
+    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1448:1450 -> <init>
+    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1445:1445 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLense access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1445:1445 -> access$500
+    1:11:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1487:1497 -> fixupFields
+    1:2:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1503:1504 -> fixupMethod
+    3:3:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1503:1503 -> fixupMethod
+    1:9:void fixupMethods(java.util.List,com.android.tools.r8.graph.DexClass$MethodSetter):1470:1478 -> fixupMethods
+    1:6:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1508:1513 -> fixupProto
+    1:11:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1519:1529 -> fixupType
+    1:10:com.android.tools.r8.graph.GraphLense fixupTypeReferences():1454:1463 -> fixupTypeReferences
+    1:3:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1536:1538 -> fixupTypes
 com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses -> com.android.tools.r8.shaking.VerticalClassMerger$VerticallyMergedClasses:
-    1:1:void <clinit>():91:91 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.shaking.VerticalClassMerger$1):91:91 -> <init>
-    2:8:void <init>(java.util.Map):96:102 -> <init>
-    1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):100:100 -> a
-    2:2:void lambda$new$1(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):100:100 -> a
-    1:1:java.util.List getSourcesFor(com.android.tools.r8.graph.DexType):106:106 -> getSourcesFor
-    1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):110:111 -> getTargetFor
-    1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):115:115 -> hasBeenMergedIntoSubtype
-    1:4:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):119:122 -> verifyAllSourcesPruned
+    1:1:void <clinit>():90:90 -> <clinit>
+    1:1:void <init>(java.util.Map,com.android.tools.r8.shaking.VerticalClassMerger$1):90:90 -> <init>
+    2:8:void <init>(java.util.Map):95:101 -> <init>
+    1:1:java.util.List lambda$new$0(com.android.tools.r8.graph.DexType):99:99 -> a
+    2:2:void lambda$new$1(java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):99:99 -> a
+    1:1:java.util.List getSourcesFor(com.android.tools.r8.graph.DexType):105:105 -> getSourcesFor
+    1:2:com.android.tools.r8.graph.DexType getTargetFor(com.android.tools.r8.graph.DexType):109:110 -> getTargetFor
+    1:1:boolean hasBeenMergedIntoSubtype(com.android.tools.r8.graph.DexType):114:114 -> hasBeenMergedIntoSubtype
+    1:4:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):118:121 -> verifyAllSourcesPruned
 com.android.tools.r8.shaking.VerticalClassMergerGraphLense -> com.android.tools.r8.shaking.VerticalClassMergerGraphLense:
     1:1:void <clinit>():47:47 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.GraphLense,com.android.tools.r8.shaking.VerticalClassMergerGraphLense$1):47:47 -> <init>
@@ -54547,7 +54407,7 @@
     2:12:com.android.tools.r8.utils.AndroidApp$Builder addFilteredProgramArchives(java.util.Collection):442:452 -> c
     13:13:com.android.tools.r8.utils.AndroidApp$Builder addFilteredProgramArchives(java.util.Collection):448:448 -> c
     14:22:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):724:732 -> c
-    23:24:boolean com.android.tools.r8.utils.FileUtils.isAarFile(java.nio.file.Path):71:72 -> c
+    23:24:boolean com.android.tools.r8.utils.FileUtils.isAarFile(java.nio.file.Path):66:67 -> c
     23:24:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):733 -> c
     25:25:com.android.tools.r8.utils.AarArchiveResourceProvider com.android.tools.r8.utils.AarArchiveResourceProvider.fromArchive(java.nio.file.Path):38:38 -> c
     25:25:com.android.tools.r8.utils.AndroidApp$Builder addProgramFile(java.nio.file.Path):734 -> c
@@ -54727,28 +54587,28 @@
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():35:35 -> <clinit>
     1:5:void <init>(com.android.tools.r8.shaking.FilteredClassPath,boolean):46:50 -> <init>
-    1:16:java.util.List readArchive():54:69 -> a
-    17:28:java.util.List readArchive():68:79 -> a
-    29:37:java.util.List readArchive():75:83 -> a
-    38:67:java.util.List readArchive():61:90 -> a
-    68:68:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    68:68:java.util.List readArchive():90 -> a
-    69:73:java.util.List readArchive():90:94 -> a
-    74:105:java.util.List readArchive():56:87 -> a
-    106:106:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):85:85 -> a
-    1:7:void accept(com.android.tools.r8.DataResourceProvider$Visitor):113:119 -> accept
-    8:8:boolean isProgramResourceName(java.lang.String):137:137 -> accept
-    8:8:void accept(com.android.tools.r8.DataResourceProvider$Visitor):119 -> accept
-    9:10:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> accept
-    9:10:boolean isProgramResourceName(java.lang.String):137 -> accept
-    9:10:void accept(com.android.tools.r8.DataResourceProvider$Visitor):119 -> accept
-    11:11:boolean isProgramResourceName(java.lang.String):137:137 -> accept
-    11:11:void accept(com.android.tools.r8.DataResourceProvider$Visitor):119 -> accept
-    12:19:void accept(com.android.tools.r8.DataResourceProvider$Visitor):120:127 -> accept
-    20:39:void accept(com.android.tools.r8.DataResourceProvider$Visitor):113:132 -> accept
-    40:41:void accept(com.android.tools.r8.DataResourceProvider$Visitor):128:129 -> accept
+    1:15:java.util.List readArchive():54:68 -> a
+    16:27:java.util.List readArchive():67:78 -> a
+    28:36:java.util.List readArchive():74:82 -> a
+    37:66:java.util.List readArchive():60:89 -> a
+    67:67:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    67:67:java.util.List readArchive():89 -> a
+    68:72:java.util.List readArchive():89:93 -> a
+    73:103:java.util.List readArchive():56:86 -> a
+    104:104:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):84:84 -> a
+    1:6:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:117 -> accept
+    7:7:boolean isProgramResourceName(java.lang.String):135:135 -> accept
+    7:7:void accept(com.android.tools.r8.DataResourceProvider$Visitor):117 -> accept
+    8:9:boolean com.android.tools.r8.utils.ZipUtils.isDexFile(java.lang.String):99:100 -> accept
+    8:9:boolean isProgramResourceName(java.lang.String):135 -> accept
+    8:9:void accept(com.android.tools.r8.DataResourceProvider$Visitor):117 -> accept
+    10:10:boolean isProgramResourceName(java.lang.String):135:135 -> accept
+    10:10:void accept(com.android.tools.r8.DataResourceProvider$Visitor):117 -> accept
+    11:18:void accept(com.android.tools.r8.DataResourceProvider$Visitor):118:125 -> accept
+    19:37:void accept(com.android.tools.r8.DataResourceProvider$Visitor):112:130 -> accept
+    38:39:void accept(com.android.tools.r8.DataResourceProvider$Visitor):126:127 -> accept
     1:1:com.android.tools.r8.utils.ArchiveResourceProvider fromArchive(java.nio.file.Path,boolean):43:43 -> fromArchive
-    1:3:java.util.Collection getProgramResources():100:102 -> getProgramResources
+    1:3:java.util.Collection getProgramResources():99:101 -> getProgramResources
 com.android.tools.r8.utils.ArrayUtils -> com.android.tools.r8.utils.o:
     1:10:java.lang.Object[] copyWithSparseChanges(java.lang.Class,java.lang.Object[],java.util.Map):25:34 -> a
     11:30:java.lang.Object[] filter(java.lang.Class,java.lang.Object[],java.util.function.Predicate):50:69 -> a
@@ -54801,12 +54661,12 @@
     1:2:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):49:50 -> d
     1:1:java.lang.String toString():82:82 -> toString
 com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.utils.w:
-    java.util.Map classes -> a
+    java.util.concurrent.ConcurrentHashMap classes -> a
     java.util.concurrent.atomic.AtomicReference classProvider -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():34:34 -> <clinit>
-    1:1:void <init>(java.util.Map,com.android.tools.r8.utils.ClassProvider):58:58 -> <init>
-    2:7:void <init>(java.util.Map,com.android.tools.r8.utils.ClassProvider):56:61 -> <init>
+    1:1:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.utils.ClassProvider):58:58 -> <init>
+    2:7:void <init>(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.utils.ClassProvider):56:61 -> <init>
     java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass) -> a
     com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass) -> a
     1:28:com.android.tools.r8.graph.DexClass get(com.android.tools.r8.graph.DexType):89:116 -> a
@@ -55148,29 +55008,27 @@
     2:5:int doHash(com.android.tools.r8.graph.DexField):45:48 -> doHash
     2:5:int doHash(java.lang.Object):14 -> doHash
 com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.utils.M:
-    boolean isAndroid -> a
-    boolean $assertionsDisabled -> b
-    1:14:void <clinit>():21:34 -> <clinit>
-    1:5:boolean isArchive(java.nio.file.Path):76:80 -> a
-    6:6:java.lang.String readTextFile(java.nio.file.Path,java.nio.charset.Charset):84:84 -> a
-    7:7:void writeTextFile(java.nio.file.Path,java.util.List):92:92 -> a
-    8:8:void writeTextFile(java.nio.file.Path,java.lang.String[]):96:96 -> a
-    9:11:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):101:103 -> a
-    12:12:void writeToFile(java.nio.file.Path,java.io.OutputStream,byte[]):165:165 -> a
-    13:14:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):170:171 -> a
-    15:19:java.io.OutputStream openPathWithDefault(com.android.tools.r8.com.google.common.io.Closer,java.nio.file.Path,java.io.OutputStream,java.nio.file.OpenOption[]):129:133 -> a
-    15:19:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):172 -> a
-    20:21:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):179:180 -> a
-    22:32:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):170:180 -> a
-    33:38:java.lang.String withNativeFileSeparators(java.lang.String):184:189 -> a
-    39:52:java.util.zip.ZipFile createZipFile(java.io.File,java.nio.charset.Charset):194:207 -> a
-    1:6:boolean isClassFile(java.nio.file.Path):47:52 -> b
-    1:17:boolean isClassesDexFile(java.nio.file.Path):139:155 -> c
-    1:2:boolean isDexFile(java.nio.file.Path):37:38 -> d
-    1:2:boolean isJarFile(java.nio.file.Path):56:57 -> e
-    1:2:boolean isVDexFile(java.nio.file.Path):42:43 -> f
-    1:2:boolean isZipFile(java.nio.file.Path):61:62 -> g
-    1:1:java.util.List readAllLines(java.nio.file.Path):88:88 -> h
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():19:19 -> <clinit>
+    1:5:boolean isArchive(java.nio.file.Path):71:75 -> a
+    6:6:java.lang.String readTextFile(java.nio.file.Path,java.nio.charset.Charset):79:79 -> a
+    7:7:void writeTextFile(java.nio.file.Path,java.util.List):87:87 -> a
+    8:8:void writeTextFile(java.nio.file.Path,java.lang.String[]):91:91 -> a
+    9:11:java.nio.file.Path validateOutputFile(java.nio.file.Path,com.android.tools.r8.utils.Reporter):96:98 -> a
+    12:12:void writeToFile(java.nio.file.Path,java.io.OutputStream,byte[]):160:160 -> a
+    13:14:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):165:166 -> a
+    15:19:java.io.OutputStream openPathWithDefault(com.android.tools.r8.com.google.common.io.Closer,java.nio.file.Path,java.io.OutputStream,java.nio.file.OpenOption[]):124:128 -> a
+    15:19:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):167 -> a
+    20:21:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):174:175 -> a
+    22:32:void writeToFile(java.nio.file.Path,java.io.OutputStream,com.android.tools.r8.ByteDataView):165:175 -> a
+    33:38:java.lang.String withNativeFileSeparators(java.lang.String):179:184 -> a
+    1:6:boolean isClassFile(java.nio.file.Path):42:47 -> b
+    1:17:boolean isClassesDexFile(java.nio.file.Path):134:150 -> c
+    1:2:boolean isDexFile(java.nio.file.Path):32:33 -> d
+    1:2:boolean isJarFile(java.nio.file.Path):51:52 -> e
+    1:2:boolean isVDexFile(java.nio.file.Path):37:38 -> f
+    1:2:boolean isZipFile(java.nio.file.Path):56:57 -> g
+    1:1:java.util.List readAllLines(java.nio.file.Path):83:83 -> h
 com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.N:
     1:1:void <init>(com.android.tools.r8.shaking.FilteredClassPath):13:13 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.shaking.FilteredClassPath,java.lang.String):13:13 -> a
@@ -55224,294 +55082,292 @@
     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.T:
-    boolean invalidDebugInfoFatal -> f0
+    int SUPPORTED_DEX_VERSION -> e1
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> S0
+    boolean hasMarker -> f0
     boolean passthroughDexCode -> i
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> W0
-    java.lang.String printCfgFile -> E0
+    com.android.tools.r8.StringConsumer configurationConsumer -> W0
+    int callGraphCycleEliminatorMaxDepthThreshold -> K
+    boolean verbose -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
-    boolean enableRedundantFieldLoadElimination -> X
+    boolean enableUninstantiatedTypeOptimization -> X
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> a1
     boolean enableArgumentRemoval -> q
-    com.android.tools.r8.dex.Marker marker -> i0
-    boolean enableInliningOfInvokesWithNullableReceivers -> y
-    boolean enableNameReflectionOptimization -> G
-    boolean minimalMainDex -> N0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> J0
+    boolean enableClassInlining -> y
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> i0
+    boolean skipReadingDexCode -> R0
+    boolean enableTreeShakingOfLibraryMethodOverrides -> G
     boolean printMemory -> h
     java.util.Set neverMergePrefixes -> k
-    boolean skipIR -> J0
-    boolean enableTreeShakingOfLibraryMethodOverrides -> I
+    boolean $assertionsDisabled -> f1
+    boolean forceProguardCompatibility -> E0
+    int callGraphLikelySpuriousCallEdgeThreshold -> L
+    boolean encodeChecksums -> I
     boolean enableNeverMergePrefixes -> j
-    boolean enableMainDexListCheck -> A0
+    boolean enableMinification -> A0
     boolean enableUnusedArgumentRemoval -> r
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> x0
-    boolean lookupLibraryBeforeProgram -> z0
-    boolean enableNestReduction -> v0
-    boolean enableValuePropagation -> Y
-    boolean disableInliningOfLibraryMethodOverrides -> z
-    boolean enableDesugaring -> r0
-    boolean enableStringConcatenationOptimization -> H
-    boolean intermediate -> n0
+    boolean enableTreeShaking -> z0
+    java.util.Map warningInvalidParameterAnnotations -> P0
+    boolean enableRedundantConstNumberOptimization -> Y
+    boolean enableClassStaticizer -> z
+    boolean enableGeneratedMessageLiteShrinking -> r0
+    boolean enableCallSiteOptimizationInfoPropagation -> H
     boolean enableHorizontalClassMerging -> o
-    int callGraphCycleEliminatorMaxDepthThreshold -> M
-    boolean ignoreMainDexMissingClasses -> g0
-    boolean useSmaliSyntax -> c0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> b1
-    boolean applyInliningToInlinee -> w
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> X0
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> a1
-    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> H0
-    boolean enableDeterminismAnalysis -> E
-    boolean enableInheritanceClassInDexDistributor -> O0
+    int classInliningInstructionLimit -> M
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> T0
+    boolean quiet -> c0
+    boolean enableRedundantFieldLoadElimination -> V
+    boolean enableInliningOfInvokesWithNullableReceivers -> w
+    java.util.List mainDexKeepRules -> K0
+    java.util.Set extensiveLoggingFilter -> h0
+    boolean enableNameReflectionOptimization -> E
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    boolean debug -> K0
-    int callGraphLikelySpuriousCallEdgeThreshold -> N
-    boolean ignoreMissingClasses -> F0
+    int inliningInstructionLimit -> N
     boolean enableVerticalClassMerging -> p
-    boolean enableTreeShaking -> B0
-    boolean enableInitializedClassesInInstanceMethodsAnalysis -> W
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> w0
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> N0
+    java.util.function.Consumer syntheticProguardRulesConsumer -> c1
+    boolean printCfg -> B0
+    int minApiLevel -> k0
+    boolean enableValuePropagation -> W
+    boolean disableInliningOfLibraryMethodOverrides -> x
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> X0
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    java.util.List logArgumentsFilter -> p0
-    java.util.Map warningInvalidDebugInfo -> S0
-    int applyInliningToInlineeMaxDepth -> x
-    boolean enableGeneratedExtensionRegistryShrinking -> s0
-    java.util.List methodsFilter -> l0
-    boolean enableServiceLoaderRewriting -> F
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> b1
+    boolean processCovariantReturnTypeAnnotations -> w0
+    boolean enableNestBasedAccessDesugaring -> s0
+    java.util.Map missingEnclosingMembers -> O0
+    java.util.Set reportedMissingForDesugaring -> d1
+    boolean enableStringConcatenationOptimization -> F
     boolean printTimes -> g
-    boolean readCompileTimeAnnotations -> o0
+    boolean enableLambdaMerging -> o0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean enableDynamicTypeOptimization -> m
-    boolean verbose -> d0
-    int classInliningInstructionLimit -> O
-    java.util.function.BiPredicate dexClassChecksumFilter -> L
-    int SUPPORTED_DEX_VERSION -> g1
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> U0
+    boolean invalidDebugInfoFatal -> d0
+    int inliningInstructionAllowance -> O
+    java.lang.String printCfgFile -> C0
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> U0
     boolean enableNonNullTracking -> u
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> c1
-    com.android.tools.r8.StringConsumer configurationConsumer -> Y0
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> L0
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> Y0
+    com.android.tools.r8.dex.Marker marker -> g0
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean enableStringSwitchConversion -> T
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> k0
-    boolean skipReadingDexCode -> T0
-    boolean enableInitializedClassesAnalysis -> C
-    int inliningInstructionLimit -> P
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> Z0
+    boolean minimalMainDex -> L0
+    boolean skipIR -> H0
+    boolean enableDeterminismAnalysis -> C
+    int inliningMonitorEnterValuesAllowance -> P
     boolean enableFieldBitAccessAnalysis -> n
-    int numberOfThreads -> b0
-    boolean $assertionsDisabled -> h1
-    boolean forceProguardCompatibility -> G0
-    boolean enableMinification -> C0
-    boolean enableEnumValueOptimization -> U
+    boolean configurationDebugging -> G0
+    boolean enableInitializedClassesInInstanceMethodsAnalysis -> U
     boolean enableInlining -> v
-    boolean enableGeneratedMessageLiteShrinking -> t0
-    java.util.Map warningInvalidParameterAnnotations -> R0
-    boolean hasMarker -> h0
-    boolean enableSideEffectAnalysis -> D
-    int inliningInstructionAllowance -> Q
-    boolean quiet -> e0
-    boolean enableCallSiteOptimizationInfoPropagation -> J
-    boolean enableRedundantConstNumberOptimization -> a0
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> V0
+    boolean lookupLibraryBeforeProgram -> x0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> v0
+    boolean enableNestReduction -> t0
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> T
+    boolean enableDesugaring -> p0
+    boolean intermediate -> l0
+    boolean enableServiceLoaderRewriting -> D
+    int inliningControlFlowResolutionBlocksThreshold -> Q
+    boolean ignoreMainDexMissingClasses -> e0
+    boolean useSmaliSyntax -> a0
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> V0
+    boolean enableStringSwitchConversion -> R
     boolean enableUnusedInterfaceRemoval -> s
-    java.util.Set extensiveLoggingFilter -> j0
-    boolean enableUninstantiatedTypeOptimization -> Z
-    java.util.List mainDexKeepRules -> M0
-    boolean enableClassInlining -> A
-    int inliningMonitorEnterValuesAllowance -> R
-    boolean configurationDebugging -> I0
-    java.util.function.Consumer syntheticProguardRulesConsumer -> e1
-    boolean printCfg -> D0
+    com.android.tools.r8.utils.InternalOptions$AssertionProcessing assertionProcessing -> F0
+    int numberOfThreads -> Z
+    boolean enableInheritanceClassInDexDistributor -> M0
+    java.util.function.BiPredicate dexClassChecksumFilter -> J
+    boolean enableInitializedClassesAnalysis -> A
+    boolean debug -> I0
+    boolean ignoreMissingClasses -> D0
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> P0
-    boolean encodeChecksums -> K
     boolean libraryInterfacesMayHaveStaticInitialization -> l
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> Z0
-    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> V
-    boolean processCovariantReturnTypeAnnotations -> y0
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> d1
+    boolean enableMainDexListCheck -> y0
+    boolean enableEnumValueOptimization -> S
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> u0
     boolean enableDevirtualization -> t
-    int minApiLevel -> m0
-    boolean enableNestBasedAccessDesugaring -> u0
-    java.util.Map missingEnclosingMembers -> Q0
-    boolean enableLambdaMerging -> q0
-    java.util.Set reportedMissingForDesugaring -> f1
-    boolean enableClassStaticizer -> B
-    int inliningControlFlowResolutionBlocksThreshold -> S
+    java.util.List logArgumentsFilter -> n0
+    java.util.Map warningInvalidDebugInfo -> Q0
+    boolean enableGeneratedExtensionRegistryShrinking -> q0
+    java.util.List methodsFilter -> j0
+    boolean readCompileTimeAnnotations -> m0
+    boolean enableSideEffectAnalysis -> B
     1:23:void <clinit>():66:88 -> <clinit>
     1:1:void <init>():112:112 -> <init>
-    2:525:void <init>():106:629 -> <init>
-    526:530:void <init>():113:117 -> <init>
-    531:531:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
-    532:1055:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:629 -> <init>
-    1056:1063:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
-    1064:1064:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
-    1065:1588:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:629 -> <init>
-    1589:1600:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
+    2:522:void <init>():106:626 -> <init>
+    523:527:void <init>():113:117 -> <init>
+    528:528:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
+    529:1049:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):106:626 -> <init>
+    1050:1057:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):122:129 -> <init>
+    1058:1058:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):133:133 -> <init>
+    1059:1579:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):106:626 -> <init>
+    1580:1591:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):134:145 -> <init>
     1:1:boolean hasProguardConfiguration():95:95 -> A
-    1:1:boolean hasUsageInformationConsumer():586:586 -> B
-    1:1:boolean isDesugaredLibraryCompilation():314:314 -> C
-    1:1:boolean isGeneratingClassFiles():335:335 -> D
-    1:1:boolean isGeneratingDexIndexed():327:327 -> E
-    1:1:boolean isGeneratingDex():323 -> E
-    2:2:boolean isGeneratingDexFilePerClassFile():331:331 -> E
-    2:2:boolean isGeneratingDex():323 -> E
-    1:1:boolean hasConsumer():298:298 -> F
-    1:1:boolean isInterfaceMethodDesugaringEnabled():1072 -> F
-    2:4:boolean isInterfaceMethodDesugaringEnabled():1075:1077 -> F
-    1:1:boolean isMinifying():430:430 -> G
-    1:1:boolean isProtoShrinkingEnabled():1085:1085 -> H
-    1:1:boolean isShrinking():426:426 -> I
-    1:1:boolean isStringSwitchConversionEnabled():1081:1081 -> J
-    1:32:boolean printWarnings():804:835 -> K
-    33:72:boolean printWarnings():831:870 -> K
-    1:4:boolean shouldDesugarNests():370:373 -> L
-    5:5:boolean isGeneratingClassFiles():335:335 -> L
-    5:5:boolean canUseNestBasedAccess():1055 -> L
-    5:5:boolean shouldDesugarNests():373 -> L
-    1:13:void signalFinishedToConsumers():351:363 -> M
-    1:1:boolean assertionsEnabled():624:624 -> N
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():491:499 -> O
-    1:9:java.util.Set getExtensiveLoggingFilter():465:473 -> P
-    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():461:461 -> Q
+    1:1:boolean hasUsageInformationConsumer():583:583 -> B
+    1:1:boolean isDesugaredLibraryCompilation():311:311 -> C
+    1:1:boolean isGeneratingClassFiles():332:332 -> D
+    1:1:boolean isGeneratingDexIndexed():324:324 -> E
+    1:1:boolean isGeneratingDex():320 -> E
+    2:2:boolean isGeneratingDexFilePerClassFile():328:328 -> E
+    2:2:boolean isGeneratingDex():320 -> E
+    1:1:boolean hasConsumer():295:295 -> F
+    1:1:boolean isInterfaceMethodDesugaringEnabled():1067 -> F
+    2:4:boolean isInterfaceMethodDesugaringEnabled():1070:1072 -> F
+    1:1:boolean isMinifying():427:427 -> G
+    1:1:boolean isProtoShrinkingEnabled():1080:1080 -> H
+    1:1:boolean isShrinking():423:423 -> I
+    1:1:boolean isStringSwitchConversionEnabled():1076:1076 -> J
+    1:32:boolean printWarnings():801:832 -> K
+    33:72:boolean printWarnings():828:867 -> K
+    1:4:boolean shouldDesugarNests():367:370 -> L
+    5:5:boolean isGeneratingClassFiles():332:332 -> L
+    5:5:boolean canUseNestBasedAccess():1050 -> L
+    5:5:boolean shouldDesugarNests():370 -> L
+    1:13:void signalFinishedToConsumers():348:360 -> M
+    1:1:boolean assertionsEnabled():621:621 -> N
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():488:496 -> O
+    1:9:java.util.Set getExtensiveLoggingFilter():462:470 -> P
+    1:1:boolean shouldEnableKeepRuleSynthesisForRecompilation():458:458 -> Q
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:2:void setMarker(com.android.tools.r8.dex.Marker):268:269 -> a
-    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273:274 -> a
-    5:11:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):281:287 -> a
-    5:11:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):276 -> a
-    12:12:boolean isGeneratingClassFiles():335:335 -> a
-    12:12:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):288 -> a
-    12:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):276 -> a
-    13:16:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):289:292 -> a
-    13:16:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):276 -> a
-    17:17:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632:632 -> a
-    18:18:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):654:654 -> a
-    19:25: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):748:754 -> a
-    26:26:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):749:749 -> a
-    27:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761:762 -> a
+    1:2:void setMarker(com.android.tools.r8.dex.Marker):265:266 -> a
+    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):270:271 -> a
+    5:11:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):278:284 -> a
+    5:11:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    12:12:boolean isGeneratingClassFiles():332:332 -> a
+    12:12:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):285 -> a
+    12:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    13:16:com.android.tools.r8.dex.Marker createMarker(com.android.tools.r8.dex.Marker$Tool):286:289 -> a
+    13:16:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):273 -> a
+    17:17:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> a
+    18:18:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> a
+    19:25: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):745:751 -> a
+    26:26:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):746:746 -> a
+    27:28:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):758:759 -> a
     29:29:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> a
-    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764 -> a
-    30:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764:766 -> a
+    29:29:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761 -> a
+    30:32:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761:763 -> a
     33:33:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
-    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767:767 -> a
+    33:33:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764 -> a
+    34:34:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):764:764 -> a
     35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getType():671:671 -> a
-    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):770 -> a
-    36:36:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):770:770 -> a
-    37:37:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):762:762 -> a
-    38:41:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):775:778 -> a
-    42:46:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):783:787 -> a
-    47:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):792:798 -> a
-    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):793:793 -> a
-    55:55:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):797:797 -> a
-    56:61:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):884:889 -> a
-    62:63:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1026:1027 -> a
-    64:64:boolean canHaveArtCheckCastVerifierBug():1406:1406 -> a
-    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643:646 -> b
+    35:35:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767 -> a
+    36:36:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767:767 -> a
+    37:37:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):759:759 -> a
+    38:41:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,int):772:775 -> a
+    42:46:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):780:784 -> a
+    47:53:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):789:795 -> a
+    54:54:void warningInvalidDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):790:790 -> a
+    55:55:java.util.List lambda$warningInvalidDebugInfo$3(com.android.tools.r8.origin.Origin):794:794 -> a
+    56:61:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):881:886 -> a
+    62:63:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1021:1022 -> a
+    64:64:boolean canHaveArtCheckCastVerifierBug():1401:1401 -> a
+    1:4:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):640:643 -> b
     5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):648 -> b
-    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):648:650 -> b
-    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):646:646 -> b
-    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632:632 -> b
-    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):644 -> b
-    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):670:670 -> b
+    5:5:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):645 -> b
+    6:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):645:647 -> b
+    9:9:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):643:643 -> b
+    10:10:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> b
+    10:10:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):641 -> b
+    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):667:667 -> b
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> b
-    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):671 -> b
-    13:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):672:674 -> b
-    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):654:654 -> b
-    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):675 -> b
-    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:680 -> b
+    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):668 -> b
+    13:15:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):669:671 -> b
+    16:16:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> b
+    16:16:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):672 -> b
+    17:18:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):676:677 -> b
     19:19:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():667:667 -> b
-    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):682 -> b
-    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):682:682 -> b
-    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):742:742 -> b
-    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):684 -> b
-    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):684:684 -> b
-    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):680:680 -> b
-    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):786:786 -> b
-    25:26:boolean canHaveArtInstanceOfVerifierBug():1361:1362 -> b
-    1:4:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):636:639 -> c
-    5:5:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):632:632 -> c
-    5:5:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):637 -> c
-    6:6:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):658:658 -> c
+    19:19:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679 -> b
+    20:20:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):679:679 -> b
+    21:21:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):739:739 -> b
+    21:21:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681 -> b
+    22:22:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):681:681 -> b
+    23:23:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):677:677 -> b
+    24:24:java.util.List lambda$warningInvalidParameterAnnotations$2(com.android.tools.r8.origin.Origin):783:783 -> b
+    25:26:boolean canHaveArtInstanceOfVerifierBug():1356:1357 -> b
+    1:4:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):633:636 -> c
+    5:5:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):629:629 -> c
+    5:5:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):634 -> c
+    6:6:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):655:655 -> c
     7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> c
-    7:7:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):659 -> c
-    8:8:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):660:660 -> c
-    9:9:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):654:654 -> c
-    9:9:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):661 -> c
-    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:665 -> c
-    11:11:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):742:742 -> c
-    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665 -> c
-    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):665:665 -> c
-    13:13:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):777:777 -> c
-    14:14:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1438:1438 -> c
-    1:1:boolean isGeneratingClassFiles():335:335 -> d
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1452 -> d
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1452:1452 -> d
-    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):688:690 -> d
-    6:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):704:709 -> d
+    7:7:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):656 -> c
+    8:8:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):657:657 -> c
+    9:9:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):651:651 -> c
+    9:9:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):658 -> c
+    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662:662 -> c
+    11:11:java.lang.String messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):739:739 -> c
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662 -> c
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):662:662 -> c
+    13:13:java.util.List lambda$warningMissingEnclosingMember$1(com.android.tools.r8.origin.Origin):774:774 -> c
+    14:14:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1433:1433 -> c
+    1:1:boolean isGeneratingClassFiles():332:332 -> d
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1447 -> d
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1447:1447 -> d
+    3:5:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):685:687 -> d
+    6:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):701:706 -> d
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):168:168 -> d
-    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):709 -> d
-    13:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):711:738 -> d
-    1:1:boolean isGeneratingClassFiles():335:335 -> e
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1108 -> e
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1108:1108 -> e
-    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):697:699 -> e
-    1:1:boolean isGeneratingClassFiles():335:335 -> f
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1059 -> f
-    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1059:1059 -> f
-    1:1:boolean isGeneratingClassFiles():335:335 -> g
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1098 -> g
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1098:1098 -> g
-    1:1:boolean isGeneratingClassFiles():335:335 -> h
-    1:1:boolean canUseConstantMethodHandle():1039 -> h
-    2:2:boolean canUseConstantMethodHandle():1039:1039 -> h
-    1:1:boolean isGeneratingClassFiles():335:335 -> i
-    1:1:boolean canUseConstantMethodType():1043 -> i
-    2:2:boolean canUseConstantMethodType():1043:1043 -> i
-    1:1:boolean isGeneratingClassFiles():335:335 -> j
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1051 -> j
-    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1051:1051 -> j
-    1:2:boolean canUseFilledNewArrayOfObjects():1120:1121 -> k
-    1:1:boolean isGeneratingClassFiles():335:335 -> l
-    1:1:boolean canUseInvokeCustom():1047 -> l
-    2:2:boolean canUseInvokeCustom():1047:1047 -> l
-    1:1:boolean isGeneratingClassFiles():335:335 -> m
-    1:1:boolean canUseInvokePolymorphic():1035 -> m
-    2:2:boolean canUseInvokePolymorphic():1035:1035 -> m
-    1:1:boolean isGeneratingClassFiles():335:335 -> n
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1031 -> n
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():1031:1031 -> n
-    1:2:boolean canUseMultidex():1089:1090 -> o
-    1:1:boolean isGeneratingClassFiles():335:335 -> p
-    1:1:boolean canUseNotInstruction():1156 -> p
-    2:2:boolean canUseNotInstruction():1156:1156 -> p
-    1:1:boolean isGeneratingClassFiles():335:335 -> q
-    1:1:boolean canUsePrivateInterfaceMethods():1067 -> q
-    2:2:boolean canUsePrivateInterfaceMethods():1067:1067 -> q
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1129:1130 -> r
-    1:1:boolean isGeneratingClassFiles():335:335 -> s
-    1:1:boolean canUseSuppressedExceptions():1094 -> s
-    2:2:boolean canUseSuppressedExceptions():1094:1094 -> s
-    1:1:boolean isGeneratingClassFiles():335:335 -> t
-    1:1:boolean canUseTwrCloseResourceMethod():1063 -> t
-    2:2:boolean canUseTwrCloseResourceMethod():1063:1063 -> t
+    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):706 -> d
+    13:40:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):708:735 -> d
+    1:1:boolean isGeneratingClassFiles():332:332 -> e
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1103 -> e
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1103:1103 -> e
+    3:5:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):694:696 -> e
+    1:1:boolean isGeneratingClassFiles():332:332 -> f
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1054 -> f
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1054:1054 -> f
+    1:1:boolean isGeneratingClassFiles():332:332 -> g
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1093 -> g
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1093:1093 -> g
+    1:1:boolean isGeneratingClassFiles():332:332 -> h
+    1:1:boolean canUseConstantMethodHandle():1034 -> h
+    2:2:boolean canUseConstantMethodHandle():1034:1034 -> h
+    1:1:boolean isGeneratingClassFiles():332:332 -> i
+    1:1:boolean canUseConstantMethodType():1038 -> i
+    2:2:boolean canUseConstantMethodType():1038:1038 -> i
+    1:1:boolean isGeneratingClassFiles():332:332 -> j
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1046 -> j
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1046:1046 -> j
+    1:2:boolean canUseFilledNewArrayOfObjects():1115:1116 -> k
+    1:1:boolean isGeneratingClassFiles():332:332 -> l
+    1:1:boolean canUseInvokeCustom():1042 -> l
+    2:2:boolean canUseInvokeCustom():1042:1042 -> l
+    1:1:boolean isGeneratingClassFiles():332:332 -> m
+    1:1:boolean canUseInvokePolymorphic():1030 -> m
+    2:2:boolean canUseInvokePolymorphic():1030:1030 -> m
+    1:1:boolean isGeneratingClassFiles():332:332 -> n
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1026 -> n
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1026:1026 -> n
+    1:2:boolean canUseMultidex():1084:1085 -> o
+    1:1:boolean isGeneratingClassFiles():332:332 -> p
+    1:1:boolean canUseNotInstruction():1151 -> p
+    2:2:boolean canUseNotInstruction():1151:1151 -> p
+    1:1:boolean isGeneratingClassFiles():332:332 -> q
+    1:1:boolean canUsePrivateInterfaceMethods():1062 -> q
+    2:2:boolean canUsePrivateInterfaceMethods():1062:1062 -> q
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1124:1125 -> r
+    1:1:boolean isGeneratingClassFiles():332:332 -> s
+    1:1:boolean canUseSuppressedExceptions():1089 -> s
+    2:2:boolean canUseSuppressedExceptions():1089:1089 -> s
+    1:1:boolean isGeneratingClassFiles():332:332 -> t
+    1:1:boolean canUseTwrCloseResourceMethod():1058 -> t
+    2:2:boolean canUseTwrCloseResourceMethod():1058:1058 -> t
     1:4:void disableAllOptimizations():149:152 -> u
     1:17:void disableGlobalOptimizations():156:172 -> v
-    1:1:void disableNameReflectionOptimization():1022:1022 -> w
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302:302 -> x
-    2:2:boolean hasConsumer():298:298 -> x
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302 -> x
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302:302 -> x
-    4:4:boolean isGeneratingDexIndexed():327:327 -> x
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():303 -> x
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304:304 -> x
-    6:6:boolean isGeneratingDexFilePerClassFile():331:331 -> x
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():305 -> x
-    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():306:306 -> x
-    8:8:boolean isGeneratingClassFiles():335:335 -> x
-    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():307 -> x
-    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():308:310 -> x
+    1:1:void disableNameReflectionOptimization():1017:1017 -> w
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299:299 -> x
+    2:2:boolean hasConsumer():295:295 -> x
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299 -> x
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():299:299 -> x
+    4:4:boolean isGeneratingDexIndexed():324:324 -> x
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():300 -> x
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():301:301 -> x
+    6:6:boolean isGeneratingDexFilePerClassFile():328:328 -> x
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():302 -> x
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():303:303 -> x
+    8:8:boolean isGeneratingClassFiles():332:332 -> x
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():304 -> x
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():305:307 -> x
     1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():99:99 -> y
-    1:1:boolean hasMethodsFilter():879:879 -> z
+    1:1:boolean hasMethodsFilter():876:876 -> z
 com.android.tools.r8.utils.InternalOptions$AssertionProcessing -> com.android.tools.r8.utils.T$a:
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing LEAVE -> a
     com.android.tools.r8.utils.InternalOptions$AssertionProcessing REMOVE -> b
@@ -55522,7 +55378,7 @@
     int expectedParameterCount -> b
     int actualParameterCount -> c
     com.android.tools.r8.graph.DexMethod method -> a
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):543:546 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):540:543 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.utils.T$c:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
@@ -55533,21 +55389,21 @@
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():911:919 -> <init>
+    1:9:void <init>():908:916 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.utils.T$e:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] $VALUES -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> b
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
-    1:5:void <clinit>():904:908 -> <clinit>
-    6:6:void <clinit>():902:902 -> <clinit>
-    1:1:void <init>(java.lang.String,int):902:902 -> <init>
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():902:902 -> a
+    1:5:void <clinit>():901:905 -> <clinit>
+    6:6:void <clinit>():899:899 -> <clinit>
+    1:1:void <init>(java.lang.String,int):899:899 -> <init>
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode[] values():899:899 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.utils.T$f:
     boolean invertConditionals -> m
     boolean dontCreateMarkerInD8 -> o
     boolean enableDeadSwitchCaseElimination -> i
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> J
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> G
     boolean forceRedundantConstNumberRemoval -> k
     boolean disallowLoadStoreOptimization -> u
     java.util.function.Consumer irModifier -> w
@@ -55555,18 +55411,16 @@
     com.android.tools.r8.utils.IROrdering irOrdering -> b
     boolean noLocalsTableOnInput -> s
     int basicBlockMuncherIterationLimit -> y
-    boolean verifyKeptGraphInfo -> E
+    boolean readInputStackMaps -> E
     boolean allowUnusedProguardConfigurationRules -> f
-    boolean allowOutlinerInterfaceArrayArguments -> G
     boolean alwaysUsePessimisticRegisterAllocation -> h
     boolean deterministicSortingBasedOnDexType -> A
-    boolean trackDesugaredAPIConversions -> C
+    boolean enableForceNestBasedAccessDesugaringForTest -> C
     boolean allowTypeErrors -> d
     boolean placeExceptionalBlocksLast -> n
     boolean forceJumboStringProcessing -> p
-    com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> H
-    boolean measureProguardIfRuleEvaluations -> I
     boolean enableSwitchToIfRewriting -> j
+    com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData proguardIfRuleEvaluationData -> I
     boolean forceAssumeNoneInsertion -> l
     boolean enableNarrowingChecksInD8 -> v
     boolean enableStatefulLambdaCreateInstanceMethod -> x
@@ -55574,26 +55428,27 @@
     byte[] forceDexVersionBytes -> a
     boolean dontReportFailingCheckDiscarded -> z
     boolean disableL8AnnotationRemoval -> e
-    boolean readInputStackMaps -> F
+    boolean allowOutlinerInterfaceArrayArguments -> F
     boolean reportUnusedProguardConfigurationRules -> g
     java.util.Set validInliningReasons -> r
+    boolean measureProguardIfRuleEvaluations -> H
     boolean addCallEdgesForLibraryInvokes -> c
     java.io.PrintStream whyAreYouNotInliningConsumer -> B
-    boolean enableForceNestBasedAccessDesugaringForTest -> D
-    1:87:void <init>():922:1008 -> <init>
+    boolean verifyKeptGraphInfo -> D
+    1:85:void <init>():919:1003 -> <init>
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.utils.T$f$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():994:996 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1000:1001 -> 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):1001:1001 -> a
+    1:3:void <init>():989:991 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):995:996 -> 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):996:996 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.utils.T$f$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1011:1014 -> <init>
+    1:4:void <init>():1006:1009 -> <init>
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.utils.T$g:
     com.android.tools.r8.graph.DexType type -> b
     int version -> a
-    1:3:void <init>(int,com.android.tools.r8.graph.DexType):555:557 -> <init>
+    1:3:void <init>(int,com.android.tools.r8.graph.DexType):552:554 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.utils.U:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
@@ -55604,21 +55459,21 @@
     1:1:boolean isGeneratingDex():17:17 -> b
 com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.utils.W:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):20:20 -> a
-    2:5:java.lang.Object peekNext(java.util.ListIterator):60:63 -> a
-    6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):103:115 -> a
-    1:3:java.lang.Object peekPrevious(java.util.ListIterator):53:55 -> b
-    4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):80:83 -> b
+    1:1:void <clinit>():16:16 -> <clinit>
+    1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):19:19 -> a
+    2:5:java.lang.Object peekNext(java.util.ListIterator):59:62 -> a
+    6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):92:104 -> a
+    1:3:java.lang.Object peekPrevious(java.util.ListIterator):52:54 -> b
+    4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):69:72 -> b
 com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.utils.V:
     java.util.Iterator val$iterator -> b
     java.util.function.Predicate val$predicate -> c
     java.lang.Object next -> a
-    1:3:void <init>(java.util.Iterator,java.util.function.Predicate):20:22 -> <init>
-    1:3:java.lang.Object advance():26:28 -> f
-    1:1:boolean hasNext():37:37 -> hasNext
-    1:5:java.lang.Object next():42:46 -> next
-    6:6:java.lang.Object next():44:44 -> next
+    1:3:void <init>(java.util.Iterator,java.util.function.Predicate):19:21 -> <init>
+    1:3:java.lang.Object advance():25:27 -> f
+    1:1:boolean hasNext():36:36 -> hasNext
+    1:5:java.lang.Object next():41:45 -> next
+    6:6:java.lang.Object next():43:43 -> next
 com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.utils.Y:
     int columnCapacity -> b
     int rowCapacity -> a
@@ -55764,8 +55619,11 @@
 com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.utils.g0:
     com.android.tools.r8.ir.code.Position createRemappedPosition(int,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position) -> a
 com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.utils.i0:
-    1:2:int lastIndexMatching(java.util.List,java.util.function.Predicate):24:25 -> a
-    3:5:java.util.List map(java.util.Collection,java.util.function.Function):33:35 -> a
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:1:java.lang.Object first(java.util.List):16:16 -> a
+    2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):25:26 -> a
+    4:6:java.util.List map(java.util.Collection,java.util.function.Function):34:36 -> a
+    1:2:boolean verifyListIsOrdered(java.util.List):42:43 -> b
 com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.utils.j0:
     long max -> b
     long min -> a